Show the failing string when conversion fails in MBConvTestCase.

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0f6daf25d20517a6d96fdb83b16d38dfe81bd6ff..7d957ea588517fd0761647e1bdb9f55959f19d42 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4925,7 +4925,8 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
 
 bool wxWindowMSW::MSWHasEraseBgHook() const
 {
-    return gs_eraseBgHooks.find(this) != gs_eraseBgHooks.end();
+    return gs_eraseBgHooks.find(const_cast<wxWindowMSW *>(this))
+                != gs_eraseBgHooks.end();
 }
 
 void wxWindowMSW::MSWSetEraseBgHook(wxWindow *child)
@@ -6602,7 +6603,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
                 )
         {