Author: gonzalo
Date: 2006-06-21 11:18:20 -0400 (Wed, 21 Jun 2006)
New Revision: 61908

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs
Log:
2006-06-21 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>

        * ColorDialog.cs: when the mouse button is pressed inside the color
        matrix, don't let the cursor move out of it until the button is
        released, which is the behavior on windows. Changed 'colours' by
        'colors' to use the same word consistently.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-06-21 14:32:43 UTC (rev 61907)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-06-21 15:18:20 UTC (rev 61908)
@@ -1,3 +1,10 @@
+2006-06-21 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * ColorDialog.cs: when the mouse button is pressed inside the color
+       matrix, don't let the cursor move out of it until the button is
+       released, which is the behavior on windows. Changed 'colours' by
+       'colors' to use the same word consistently.
+
 2006-06-21  Chris Toshok  <[EMAIL PROTECTED]>
 
        * DataGrid.cs: add in some basic navigation stuff (navigating to a

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs   
2006-06-21 14:32:43 UTC (rev 61907)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs   
2006-06-21 15:18:20 UTC (rev 61908)
@@ -196,7 +196,7 @@
                        defineColoursButton.Location = new Point (5, 244);
                        defineColoursButton.Size = new Size (210, 22);
                        defineColoursButton.TabIndex = 6;
-                       defineColoursButton.Text = Locale.GetText ("Define 
Colours >>");
+                       defineColoursButton.Text = Locale.GetText ("Define 
Colors >>");
                        // okButton
                        okButton.FlatStyle = FlatStyle.System;
                        okButton.Location = new Point (5, 271);
@@ -222,7 +222,7 @@
                        addColoursButton.Location = new Point (227, 271);
                        addColoursButton.Size = new Size (213, 22);
                        addColoursButton.TabIndex = 7;
-                       addColoursButton.Text =  Locale.GetText ("Add Colours");
+                       addColoursButton.Text =  Locale.GetText ("Add Colors");
                        
                        // baseColorControl
                        baseColorControl.Location = new Point (3, 6);
@@ -1277,7 +1277,7 @@
                                baseColorLabel.Location = new Point (2, 0);
                                baseColorLabel.Size = new Size (200, 12);
                                baseColorLabel.TabIndex = 5;
-                               baseColorLabel.Text = Locale.GetText ("Base 
Colours") + ":";
+                               baseColorLabel.Text = Locale.GetText ("Base 
Colors") + ":";
                                // userColorLabel
                                userColorLabel.FlatStyle = FlatStyle.System;
                                userColorLabel.Location = new Point (2, 164);
@@ -1608,6 +1608,7 @@
                                }
                                
                                UpdateControls ();
+                               XplatUI.GrabWindow (Handle, Handle);
                                
                                base.OnMouseDown (e);
                        }
@@ -1626,6 +1627,7 @@
                        
                        protected override void OnMouseUp (MouseEventArgs e)
                        {
+                               XplatUI.UngrabWindow (Handle);
                                mouseButtonDown = false;
                                drawCross = true;
                                Invalidate ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to