Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong wxUSE_ACCEL around wxUSE_HOTKEY-related code in wxMSW.

Browse Source 
Closes #15193.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-05-08 11:21:37 +00:00
parent f7ef20685f
commit 0ba28d4196
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/window.h
View File

@@ -351,7 +351,7 @@ public:
bool HandleChar(WXWPARAM wParam, WXLPARAM lParam); bool HandleChar(WXWPARAM wParam, WXLPARAM lParam);
bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam);
bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam);
#if wxUSE_ACCEL #if wxUSE_HOTKEY
bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam); bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
#endif #endif
#ifdef __WIN32__ #ifdef __WIN32__

4
src/msw/window.cpp
View File

@@ -7306,8 +7306,6 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
return true; return true;
} }
#if wxUSE_ACCEL
bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam) bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
{ {
int win_modifiers = LOWORD(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 #endif // wxUSE_HOTKEY
// Not tested under WinCE // Not tested under WinCE