Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEveraldo Canuto <everaldo@mono-cvs.ximian.com>2007-12-11 10:59:04 +0300
committerEveraldo Canuto <everaldo@mono-cvs.ximian.com>2007-12-11 10:59:04 +0300
commitbe80bc51a075e8b3dc7f3299f9770cd3f6f2e938 (patch)
tree05d7a127b04d27db0012fd322b6272ee5458e802
parent5a1169caf47e70c4a5e5d06eddbaed8805f3303f (diff)
2007-12-10 Everaldo Canuto <ecanuto@novell.com>
[Backport to 1.2.6] * MenuAPI.cs: When process menu keys return true by default only if menu is active. Fixes bug #342892. svn path=/branches/mono-1-2-6/mcs/; revision=91074
-rw-r--r--mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog6
-rw-r--r--mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs2
2 files changed, 7 insertions, 1 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index c4b6a3e50eb..16260f08dea 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-10 Everaldo Canuto <ecanuto@novell.com>
+
+ [Backport to 1.2.6]
+ * MenuAPI.cs: When process menu keys return true by default only if menu is
+ active. Fixes bug #342892.
+
2007-12-09 Andreia Gaita <avidigal@novell.com>
[Backport to 1.2.6]
* Control.cs: check if windows are actually mapped before
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
index 62ec619ae19..12597929be1 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
@@ -744,7 +744,7 @@ namespace System.Windows.Forms {
break;
}
- return true;
+ return active;
}
}