X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687706f5e722ac8a39172024f794ae0ffbd190e2..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/classic/app.cpp diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index d1267be385..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 ) ; @@ -1853,14 +1853,12 @@ int wxKeyCodeToMacModifier(wxKeyCode key) bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below { -#if __WXMAC_CARBON__ -//TODO: Low get map... - return !!(GetCurrentKeyModifiers() & wxKeyCodeToMacModifier(key)); -#else - KeyMap keymap; - GetKeys(keymap); - return !!(BitTst(keymap, (sizeof(KeyMap)*8) - key)); -#endif + wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != + WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); + + KeyMap keymap; + GetKeys(keymap); + return !!(BitTst(keymap, (sizeof(KeyMap)*8) - key)); } #if !TARGET_CARBON