From 0ba28d4196ee0dab58c3c48097e71c186e6cbe68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 May 2013 11:21:37 +0000 Subject: [PATCH 1/1] Fix wrong wxUSE_ACCEL around wxUSE_HOTKEY-related code in wxMSW. Closes #15193. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/window.h | 2 +- src/msw/window.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 564f78f2d7..9126006eda 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -351,7 +351,7 @@ public: bool HandleChar(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam); -#if wxUSE_ACCEL +#if wxUSE_HOTKEY bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam); #endif #ifdef __WIN32__ diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 2404c9ae77..908424749e 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -7306,8 +7306,6 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId) return true; } -#if wxUSE_ACCEL - bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam) { int win_modifiers = LOWORD(lParam); @@ -7322,8 +7320,6 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam) return HandleWindowEvent(event); } -#endif // wxUSE_ACCEL - #endif // wxUSE_HOTKEY // Not tested under WinCE -- 2.45.2