diff options
| author | Dick Porter <dick@acm.org> | 2010-07-05 14:38:29 +0400 |
|---|---|---|
| committer | Dick Porter <dick@acm.org> | 2010-07-05 14:38:29 +0400 |
| commit | c0df7617c0f6b68db4fb22cb844ee06129116fa3 (patch) | |
| tree | b6625f6c9f95c547af78d95bcccb1afee45c3243 /mcs/class | |
| parent | f79db26b02512d9b2fe071ace4de21a7cfd2cb94 (diff) | |
2010-07-05 Dick Porter <dporter@codicesoftware.com>
* MenuAPI.cs: Only handle mnemonic key shortcuts when the context
menu is visible. Fixes bug 616739.
svn path=/branches/mono-2-6/mcs/; revision=159884
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs | 2 |
2 files changed, 6 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 0a7b7653adc..d9614b3588d 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,8 @@ +2010-07-05 Dick Porter <dporter@codicesoftware.com> + + * MenuAPI.cs: Only handle mnemonic key shortcuts when the context + menu is visible. Fixes bug 616739. + 2010-06-24 Dick Porter <dporter@codicesoftware.com> * Fix NullReferenceException when keyboard shortcut activates 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 b2e0c75485c..d73bce699be 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs @@ -629,7 +629,7 @@ namespace System.Windows.Forms { { keynav_state = KeyNavState.Navigating; MenuItem item = FindItemByKey (CurrentMenu, msg.WParam); - if ((item == null) || (GrabControl == null)) + if ((item == null) || (GrabControl == null) || (GrabControl.ActiveTracker == null)) return false; active = true; |