From ba950d4418679af6832b2ace1c60046d8682e376 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 2 Mar 2011 16:21:24 +0000 Subject: [PATCH] move accel handling in front of the normal keyDown handling git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/window_osx.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 63ea791e8c..a7f6a93160 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -2496,9 +2496,9 @@ bool wxWindowMac::IsShownOnScreen() const bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event ) { - bool handled = HandleWindowEvent( event ) ; - if ( handled && event.GetSkipped() ) - handled = false ; + bool handled = false; + + // moved the ordinary key event sending AFTER the accel evaluation #if wxUSE_ACCEL if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN) @@ -2531,6 +2531,13 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event ) } } #endif // wxUSE_ACCEL + + if ( !handled ) + { + handled = HandleWindowEvent( event ) ; + if ( handled && event.GetSkipped() ) + handled = false ; + } return handled ; }