diff --git a/src/common/config.cpp b/src/common/config.cpp index 2e8372db93..7e4173e4e2 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -352,7 +352,7 @@ wxString wxExpandEnvVars(const wxString& str) // check the closing bracket if ( bracket != Bracket_None ) { - if ( m == str.Len() || str[m] != (char)bracket ) { + if ( m == str.Len() || str[m] != (wxChar)bracket ) { // under MSW it's common to have '%' characters in the registry // and it's annoying to have warnings about them each time, so // ignroe them silently if they are not used for env vars diff --git a/src/msw/window.cpp b/src/msw/window.cpp index f935180fc5..a68f7b7dfd 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -4720,7 +4720,7 @@ int wxWindowMSW::HandleMenuChar(int chAccel, WXLPARAM lParam) // FIXME-UNICODE: this comparison doesn't risk to work // for non ASCII accelerator characters I'm afraid, but // what can we do? - if ( wxToupper(*p) == chAccel ) + if ( wxToupper(*p) == (wchar_t)chAccel ) { return i; }