X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44353523d85ba44f62bad4ab7b27a14001d4b1ae..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/classic/app.cpp?ds=sidebyside diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index c2aaf86cd0..38d66723aa 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -389,7 +389,7 @@ MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) // due to the rather low-level event API of wxWidgets, we cannot use RunApplicationEventLoop // but have to use ReceiveNextEvent dealing with events manually, therefore we also have -// deal with clicks in the menu bar explicitely +// to deal with clicks in the menu bar explicitly pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ; @@ -1856,14 +1856,9 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); -#if __WXMAC_CARBON__ -//TODO: Low get map... - return !!(GetCurrentKeyModifiers() & wxKeyCodeToMacModifier(key)); -#else - KeyMap keymap; - GetKeys(keymap); - return !!(BitTst(keymap, (sizeof(KeyMap)*8) - key)); -#endif + KeyMap keymap; + GetKeys(keymap); + return !!(BitTst(keymap, (sizeof(KeyMap)*8) - key)); } #if !TARGET_CARBON