X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a06eecfb2c325b1844b9a7b004ba07d93219806..e2d313d19d6f8a7f29fc73cfef8c1dc1433cdf5b:/src/osx/window_osx.cpp diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 00115ba251..b5254d12d9 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -58,15 +58,15 @@ #endif #if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" + #include "wx/dnd.h" #endif #include "wx/graphics.h" #if wxOSX_USE_CARBON -#include "wx/osx/uma.h" + #include "wx/osx/uma.h" #else -#include "wx/osx/private.h" + #include "wx/osx/private.h" #endif #define MAC_SCROLLBAR_SIZE 15 @@ -2667,9 +2667,9 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode) mac_modifiers |= optionKey; if ( modifiers & wxMOD_SHIFT ) mac_modifiers |= shiftKey; - if ( modifiers & wxMOD_CONTROL ) + if ( modifiers & wxMOD_RAW_CONTROL ) mac_modifiers |= controlKey; - if ( modifiers & wxMOD_META ) + if ( modifiers & wxMOD_CONTROL ) mac_modifiers |= cmdKey; EventHotKeyRef hotKeyRef;