Unfortunatelly compiler does not know which bits play here and still warns about...

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 6f1ce18020852ef5637cc8322ad991797812bd3d..50571277e74f536f153cef1b21b928c5e0516b72 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -436,7 +436,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
                 d += cc;
                 for (l += 6; l >= 8; lsb = !lsb)
                 {
                 d += cc;
                 for (l += 6; l >= 8; lsb = !lsb)
                 {

-                    c = (d >> (l -= 8)) % 256;
+                    c = (unsigned char)((d >> (l -= 8)) % 256);

                     if (lsb)
                     {
                         if (buf)
                     if (lsb)
                     {
                         if (buf)


@@ -445,7 +445,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
                     }
                     else
                         if (buf)
                     }
                     else
                         if (buf)

-                            *buf = c << 8;
+                            *buf = (wchar_t)(c << 8);

                 }
             }
             if (*psz == '-')
                 }
             }
             if (*psz == '-')

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 584eaf37e1c9bdf581ce6219498268010dee548e..e6475f93fba60f9480d5aa26cbe807799a8e8ea8 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -118,7 +118,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
     wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
 
     //<<4 == 16
     wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
 
     //<<4 == 16

-    return ( CharToHex(*s) << 4 ) | CharToHex(*++s);
+    return (wxChar)( CharToHex(*s) << 4 ) | CharToHex(*++s);

 }
 
 wxString wxURI::Unescape(const wxString& uri)
 }
 
 wxString wxURI::Unescape(const wxString& uri)