[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] pnetlib ./ChangeLog System.Windows.Forms/Scroll...
From: |
Heiko Weiss |
Subject: |
[dotgnu-pnet-commits] pnetlib ./ChangeLog System.Windows.Forms/Scroll... |
Date: |
Thu, 16 Mar 2006 07:22:48 +0000 |
CVSROOT: /sources/dotgnu-pnet
Module name: pnetlib
Branch:
Changes by: Heiko Weiss <address@hidden> 06/03/16 07:22:48
Modified files:
. : ChangeLog
System.Windows.Forms: ScrollableControl.cs Control.cs
Log message:
System.Windows.Form/ScrollableControl.cs : replaced setting
EventHandler HandleCreated with OnHandleCreated
System.Windows.Form/Control.cs : call base.Dispose(...) if
CONFIG_COMPONENT_MODEL
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/ChangeLog.diff?tr1=1.2369&tr2=1.2370&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Windows.Forms/ScrollableControl.cs.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Windows.Forms/Control.cs.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
Patches:
Index: pnetlib/ChangeLog
diff -u pnetlib/ChangeLog:1.2369 pnetlib/ChangeLog:1.2370
--- pnetlib/ChangeLog:1.2369 Tue Mar 14 18:43:29 2006
+++ pnetlib/ChangeLog Thu Mar 16 07:22:48 2006
@@ -1,3 +1,8 @@
+2006-03-16 Heiko Weiss <address@hidden>
+
+ * System.Windows.Form/ScrollableControl.cs : replaced setting
EventHandler HandleCreated with OnHandleCreated
+ * System.Windows.Form/Control.cs : call base.Dispose(...) if
CONFIG_COMPONENT_MODEL
+
2006-03-14 Heiko Weiss <address@hidden>
* System.Window.Forms/Form.cs: Fixed closing dialog stopping
Application.InnerMessageLoop if Form was shown with ShowDialog
Index: pnetlib/System.Windows.Forms/Control.cs
diff -u pnetlib/System.Windows.Forms/Control.cs:1.111
pnetlib/System.Windows.Forms/Control.cs:1.112
--- pnetlib/System.Windows.Forms/Control.cs:1.111 Wed Mar 8 06:52:06 2006
+++ pnetlib/System.Windows.Forms/Control.cs Thu Mar 16 07:22:48 2006
@@ -2268,6 +2268,9 @@
{
SetControlFlag(ControlFlags.Disposing,
false);
}
+#if CONFIG_COMPONENT_MODEL
+ base.Dispose(disposing);
+#endif
}
// Find the form that this control is a member of.
Index: pnetlib/System.Windows.Forms/ScrollableControl.cs
diff -u pnetlib/System.Windows.Forms/ScrollableControl.cs:1.12
pnetlib/System.Windows.Forms/ScrollableControl.cs:1.13
--- pnetlib/System.Windows.Forms/ScrollableControl.cs:1.12 Wed Nov 9
11:45:37 2005
+++ pnetlib/System.Windows.Forms/ScrollableControl.cs Thu Mar 16 07:22:48 2006
@@ -44,13 +44,13 @@
private Point autoScrollPosition=new Point(0,0);
private DockPaddingEdges dockPadding;
private ScrollBar vScrollBar;
- private ScrollBar hScrollBar;
+ private ScrollBar hScrollBar;
// Constructor.
public ScrollableControl()
{
base.SetStyle(ControlStyles.ContainerControl,
true);
- HandleCreated+=new
EventHandler(ScrollableControl_HandleCreated);
+ // HandleCreated+=new
EventHandler(ScrollableControl_HandleCreated);
}
protected virtual void AdjustFormScrollbars(bool displayScrollbars)
@@ -515,12 +515,21 @@
}
}
+ protected override void OnHandleCreated(EventArgs e)
+ {
+ if (autoScroll)
+ CreateScrollBars();
+ base.OnHandleCreated(e);
+ }
+
+#if false
private void ScrollableControl_HandleCreated(object sender, EventArgs e)
{
// We now have a handle, so create the
scrollbars if needed.
if (autoScroll)
CreateScrollBars();
}
+#endif
// Create the scrollBars but dont add them to the control, just parent
them using the toolkit.
private void CreateScrollBars()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] pnetlib ./ChangeLog System.Windows.Forms/Scroll...,
Heiko Weiss <=