2006-06-21 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* 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.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index ab375cae24400a438b98b4687d8fa62c0cb50e68..ab47dd34cd25e74496c4dac8f1ee9e365d6a617f 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-21 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * 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  <toshok@ximian.com>
 
        * DataGrid.cs: add in some basic navigation stuff (navigating to a

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs
index 6986811229b9e793e7b74d3a5ab443a7623e01e2..2bd8104edec638ed1ea2d32ed527ff58952184ab 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColorDialog.cs
@@ -196,7 +196,7 @@ namespace System.Windows.Forms {
                        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 @@ namespace System.Windows.Forms {
                        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 @@ namespace System.Windows.Forms {
                                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 @@ namespace System.Windows.Forms {
                                }
                                
                                UpdateControls ();
+                               XplatUI.GrabWindow (Handle, Handle);
                                
                                base.OnMouseDown (e);
                        }
@@ -1626,6 +1627,7 @@ namespace System.Windows.Forms {
                        
                        protected override void OnMouseUp (MouseEventArgs e)
                        {
+                               XplatUI.UngrabWindow (Handle);
                                mouseButtonDown = false;
                                drawCross = true;
                                Invalidate ();