- Replaced direct XplatUI calls with their Control counterpart

svn path=/trunk/mcs/; revision=32633

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
index 30289a47323c716429530f239d2f9b39bca37c82..02007efde7509a79ff639662d0d2f766ee3c1aef 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
@@ -26,9 +26,12 @@
 //     Jordi Mas i Hernandez   jordi@ximian.com\r
 //\r
 //\r
-// $Revision: 1.9 $\r
+// $Revision: 1.10 $\r
 // $Modtime: $\r
 // $Log: ScrollBar.cs,v $
+// Revision 1.10  2004/08/21 20:22:21  pbartok
+// - Replaced direct XplatUI calls with their Control counterpart
+//
 // Revision 1.9  2004/08/20 19:35:33  jackson
 // Use the SWF timer so callbacks are run in the correct thread
 //
@@ -339,7 +342,7 @@ namespace System.Windows.Forms
                        CalcThumbArea ();\r
                        UpdatePos (position, true);\r
                }\r
-               \r
+                                                    \r
 \r
                /*\r
                        Called when the control is created\r
@@ -518,7 +521,7 @@ namespace System.Windows.Forms
                        \r
                        if (thumb_pos.Contains (point)) {                                                               \r
                                thumb_pressed = true;\r
-                               XplatUI.GrabWindow (Handle);\r
+                               this.Capture = true;\r
                                Refresh ();\r
                                if (vert)\r
                                        thumb_pixel_click_move = e.Y;\r
@@ -608,7 +611,7 @@ namespace System.Windows.Forms
                        if (thumb_pressed == true) {                            \r
                                fire_Scroll (new ScrollEventArgs (ScrollEventType.ThumbPosition, position));\r
                                fire_Scroll (new ScrollEventArgs (ScrollEventType.EndScroll, position));\r
-                               XplatUI.ReleaseWindow (Handle);\r
+                               this.Capture = false;\r
                                thumb_pressed = false;                          \r
                                Refresh ();\r
                        }\r

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
index da3dc02025d9701c3bdb1f00660c9a83611a2284..d12756ade89ecfa0634752c864561060fa76bf9f 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
@@ -30,9 +30,12 @@
 // Copyright (C) Novell Inc., 2004
 //
 //
-// $Revision: 1.11 $
+// $Revision: 1.12 $
 // $Modtime: $
 // $Log: TrackBar.cs,v $
+// Revision 1.12  2004/08/21 20:21:48  pbartok
+// - Replaced direct XplatUI calls with their Control counterpart
+//
 // Revision 1.11  2004/08/20 19:45:50  jordi
 // fixes timer, new properties and methods
 //
@@ -514,7 +517,7 @@ namespace System.Windows.Forms
                        if (thumb_pressed == true || mouse_clickmove == true) { 
                                thumb_pressed = false;
                                holdclick_timer.Enabled = false;
-                               XplatUI.ReleaseWindow (Handle);
+                               this.Capture = false;
                                Refresh ();
                        }
                }
@@ -530,7 +533,7 @@ namespace System.Windows.Forms
                        if (orientation == Orientation.Horizontal) {
                                
                                if (thumb_pos.Contains (point)) {
-                                       XplatUI.GrabWindow (Handle);
+                                       this.Capture = true;
                                        thumb_pressed = true;
                                        thumb_mouseclick = e.X;
                                        Refresh ();                                     
@@ -550,7 +553,7 @@ namespace System.Windows.Forms
                        }
                        else {
                                if (thumb_pos.Contains (point)) {
-                                       XplatUI.GrabWindow (Handle);
+                                       this.Capture = true;
                                        thumb_pressed = true;
                                        thumb_mouseclick = e.Y;
                                        Refresh ();