From 4d5d3cb924ccbad1b3f340cfbfe4b5c83d699612 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 26 Sep 2010 22:11:27 +0000 Subject: [PATCH] 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 --- src/msw/window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 0f6daf25d2..48147c007d 100644 --- 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(uc) != WXK_NONE #endif // wxUSE_UNICODE ) { -- 2.45.2