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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 564f78f2d74aea725c39e19af7a6a61083f788de..9126006eda75ede07cd48f7048c89eda0dde2c84 100644 (file)
--- 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);
     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__
     bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
 #endif
 #ifdef __WIN32__

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2404c9ae77587ca8dbbbea805fc6895f43f311e6..908424749ec180319fd72f39af0058dfc38227e5 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -7306,8 +7306,6 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
     return true;
 }
 
     return true;
 }
 

-#if wxUSE_ACCEL
-

 bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 {
     int win_modifiers = LOWORD(lParam);
 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);
 }
 
     return HandleWindowEvent(event);
 }
 

-#endif // wxUSE_ACCEL
-

 #endif // wxUSE_HOTKEY
 
 // Not tested under WinCE
 #endif // wxUSE_HOTKEY
 
 // Not tested under WinCE