[dotgnu-pnet-commits] pnetlib ChangeLog System.Windows.Forms/Scrollab...

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Changes by:     Heiko Weiss <brubbel>   07/11/30 11:59:02

Modified files:
        .              : ChangeLog 
        System.Windows.Forms: ScrollableControl.cs 

Log message:
        fixed some exception with autoscrolling and reordering window handles.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2522&r2=1.2523
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Windows.Forms/ScrollableControl.cs?cvsroot=dotgnu-pnet&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2522
retrieving revision 1.2523
diff -u -b -r1.2522 -r1.2523
--- ChangeLog   27 Nov 2007 13:08:04 -0000      1.2522
+++ ChangeLog   30 Nov 2007 11:59:02 -0000      1.2523
@@ -1,3 +1,7 @@
+2007-11-30  Heiko Weiss <address@hidden>
+       * System.Windows.Forms/ScrollableControl.cs: fixed autoscrolling, 
+       memory leaks, exception when updaing scrollbars if reordering handles.
+
 2007-11-27  Heiko Weiss <address@hidden>
        * runtime/System/Resources/ResourceManager.cs: avoid calling the same 
        methods twice.

Index: System.Windows.Forms/ScrollableControl.cs
===================================================================
RCS file: 
/sources/dotgnu-pnet/pnetlib/System.Windows.Forms/ScrollableControl.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- System.Windows.Forms/ScrollableControl.cs   18 May 2006 11:03:09 -0000      
1.15
+++ System.Windows.Forms/ScrollableControl.cs   30 Nov 2007 11:59:02 -0000      
1.16
@@ -83,6 +83,8 @@
                                        }
                                        else
                                        {
+                                               // set position to initial state
+                                               autoScrollPosition=new 
Point(0,0);      
                                                DestroyScrollBars();
                                        }
                                }
@@ -268,11 +270,9 @@
                                        {
                                                vScrollBar.LargeChange = 
DisplayRectangle.Height;
                                                vScrollBar.SmallChange = 
(DisplayRectangle.Height + 9 )/ 10;
-                                               vScrollBar.Value = 
-(autoScrollPosition.Y);
-                                       /* note: I don't exactly remember how I 
got this , but
-                                       * it seemed to work sometime near 8 Pm 
... so I left it
-                                       * in */
+                                               // set Maximum before setting 
the value, or we get an exception
                                                vScrollBar.Maximum = 
ScrollArea.Height - 1;
+                                               vScrollBar.Value = 
-(autoScrollPosition.Y);
                                                vScrollBar.Visible = vscroll;   
                                
                                        }       
                                }
@@ -287,8 +287,9 @@
                                        {
                                                hScrollBar.LargeChange = 
DisplayRectangle.Width;                        
                                                hScrollBar.SmallChange = 
(DisplayRectangle.Width + 9) / 10;
-                                               hScrollBar.Value = 
-(autoScrollPosition.X);
+                                               // set Maximum before setting 
the value, or we get an exception
                                                hScrollBar.Maximum = 
ScrollArea.Width - 1;
+                                               hScrollBar.Value = 
-(autoScrollPosition.X);
                                                hScrollBar.Visible = hscroll;
                                        }
                                }
@@ -557,6 +558,8 @@
        // Create the scrollBars but dont add them to the control, just parent 
them using the toolkit.
        private void CreateScrollBars()
                        {
+                               DestroyScrollBars(); // delete the "old" if we 
had some.
+                               
                                hScrollBar=new HScrollBar();    
                                hScrollBar.Scroll+=new 
ScrollEventHandler(HandleScroll);
                                hScrollBar.CreateControl();
@@ -568,6 +571,7 @@
                                vScrollBar.CreateControl();
                                
vScrollBar.toolkitWindow.Reparent(toolkitWindow, 0, 0);
                                vScrollBar.toolkitWindow.Raise();
+                               
                                UpdateScrollBars();
                        }