Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move accel handling in front of the normal keyDown handling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-02 16:21:24 +00:00
parent 9c89493228
commit ba950d4418
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osx/window_osx.cpp
View File

@@ -2496,9 +2496,9 @@ bool wxWindowMac::IsShownOnScreen() const
bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event ) bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
{ {
bool handled = HandleWindowEvent( event ) ; bool handled = false;
if ( handled && event.GetSkipped() )
handled = false ; // moved the ordinary key event sending AFTER the accel evaluation
#if wxUSE_ACCEL #if wxUSE_ACCEL
if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN) if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
@@ -2532,6 +2532,13 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
} }
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
if ( !handled )
{
handled = HandleWindowEvent( event ) ;
if ( handled && event.GetSkipped() )
handled = false ;
}
return handled ; return handled ;
} }