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

Compilation fix for MinGW 4.x in new keyboard code.

Browse Source 
Explicitly choose the comparison operator to use when comparing wchar_t and
int values, otherwise MinGW (correctly) complains about ambiguity between
(int, int) and (wchar_t, const wxUniChar&) overloads.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-09-26 22:11:27 +00:00
parent 5ed8879eaf
commit 4d5d3cb924
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/window.cpp
View File

@@ -6602,7 +6602,7 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
int id = wxMSWKeyboard::VKToWX(wParam, lParam, &uc); int id = wxMSWKeyboard::VKToWX(wParam, lParam, &uc);
if ( id != WXK_NONE if ( id != WXK_NONE
#if wxUSE_UNICODE #if wxUSE_UNICODE
|| uc != WXK_NONE || static_cast<int>(uc) != WXK_NONE
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
) )
{ {