slightly nicer workaround for pickier compiler warning

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

diff --git a/include/wx/uri.h b/include/wx/uri.h
index 378ab2645d9287839c2f32c385f33a8404071edc..a2a1ac498dadd445311cf6cf5f08efcf021b39e2 100644 (file)
--- a/include/wx/uri.h
+++ b/include/wx/uri.h
@@ -122,7 +122,7 @@ protected:
     static void Escape  (wxString& s, const wxChar& c);
     static bool IsEscape(const wxChar*& uri);
 
-    static wxInt32 CharToHex(const wxChar& c);
+    static wxChar CharToHex(const wxChar& c);
 
     static bool IsUnreserved (const wxChar& c);
     static bool IsReserved (const wxChar& c);

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index d58c572fb9f8aa36182c4af427a901525e571948..0d181449c16d612ac9d0e43f377dab65d62a0096 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -117,7 +117,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
 {
     wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
 
-    return (wxChar)( CharToHex(*s) * 0x10 + CharToHex(*++s) );
+    return CharToHex(*s) * 0x10 + CharToHex(*++s);
 }
 
 wxString wxURI::Unescape(const wxString& uri)
@@ -1150,7 +1150,7 @@ bool wxURI::ParseIPvFuture(const wxChar*& uri)
 // ---------------------------------------------------------------------------
 
 //static
-wxInt32 wxURI::CharToHex(const wxChar& c)
+wxChar wxURI::CharToHex(const wxChar& c)
 {
     if ((c >= wxT('A')) && (c <= wxT('Z')))    return c - wxT('A') + 0x0A;
     if ((c >= wxT('a')) && (c <= wxT('z')))    return c - wxT('a') + 0x0a;