Ignore right mouse clicks in toolbar

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

diff --git a/mcs/class/Managed.Windows.Forms/SWF.csproj b/mcs/class/Managed.Windows.Forms/SWF.csproj
index aefbfab06bb0baedba061dacbe2dfc336f6d8103..0915f85f3b46dd3f0bc6bd370dd5f22460314f2a 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/SWF.csproj
+++ b/mcs/class/Managed.Windows.Forms/SWF.csproj
@@ -4038,6 +4038,46 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\X11Atoms.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\X11Display.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\X11Exception.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\X11Hwnd.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\X11RootHwnd.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\X11ThreadQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\Xlib.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "System.Windows.Forms.X11Internal\XplatUIX11-new.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "resources\System.Windows.Forms.resources"
                     BuildAction = "EmbeddedResource"

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 0151d236dd3d216d5a127a4719711c245281e05c..c92ecc6657e8bd7668b3b9292ce3be658ec4db39 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,7 @@
+2006-11-20  Everaldo Canuto  <everaldo@simios.org>
+
+       * Toolbar.cs: Ignore right mouse clicks in toolbar. Fixes #79855. 
+
 2006-11-17  Alexander Olk  <alex.olk@googlemail.com>
 
        * MimeIcon.cs: Seems that DllImports that were fine in 1.2 are not

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
index f7d3d047399491d6a237717b3a25dc734431783e..fc202a2446e6bf186fa3e568ea13cac0ecc0c455 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
@@ -591,7 +591,7 @@ namespace System.Windows.Forms
 
                private void ToolBar_MouseDown (object sender, MouseEventArgs me)
                {
-                       if (!Enabled) 
+                       if ((!Enabled) || ((me.Button & MouseButtons.Left) == 0))
                                return;
 
                        Point loc = new Point (me.X, me.Y);
@@ -633,7 +633,7 @@ namespace System.Windows.Forms
 
                private void ToolBar_MouseUp (object sender, MouseEventArgs me)
                {
-                       if (!Enabled) 
+                       if ((!Enabled) || ((me.Button & MouseButtons.Left) == 0))
                                return;
 
                        Point loc = new Point (me.X, me.Y);