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

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0f6daf25d20517a6d96fdb83b16d38dfe81bd6ff..48147c007dc1537932821f5ec92e569f2ef6dfa9 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -6602,7 +6602,7 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
         int id = wxMSWKeyboard::VKToWX(wParam, lParam, &uc);
         if ( id != WXK_NONE
 #if wxUSE_UNICODE
-                || uc != WXK_NONE
+                || static_cast<int>(uc) != WXK_NONE
 #endif // wxUSE_UNICODE
                 )
         {