X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5048c832bb3c2f41ecd29ac079d74e39e304aec8..a82b8141373e1da66c018fbad4e608a4065801b0:/include/wx/msw/window.h diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 0e0f8317df..b6a76b4544 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "window.h" #endif @@ -177,11 +177,11 @@ public: wxWindow* GetWindowChild(wxWindowID id); #endif // __WXUNIVERSAL__ -#if wxUSE_ACCEL +#if wxUSE_HOTKEY // install and deinstall a system wide hotkey - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int virtualKeyCode); + virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); virtual bool UnregisterHotKey(int hotkeyId); -#endif +#endif // wxUSE_HOTKEY // implementation from now on // --------------------------