fixes for harmless mingw32 warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 2e8372db9366eb0ae3cbfdee29a6ae899d9e60ff..7e4173e4e237006b1c536fb82570a5696b18a554 100644 (file)
--- 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 ) {
 
           // 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
               // 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 f935180fc5bb139413db3d59bbf9202ab11930b7..a68f7b7dfdf2e53430ddd42792ba7ce6cb105619 100644 (file)
--- 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?
                         // 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;
                         }
                         {
                             return i;
                         }