Warning fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-04 18:58:04 +00:00
parent a12f001e3f
commit 846978d727

View File

@@ -117,7 +117,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
{ {
wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!")); wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
return CharToHex(*s) * 0x10 + CharToHex(*++s); return (wxChar)( CharToHex(*s) * 0x10 + CharToHex(*++s) );
} }
wxString wxURI::Unescape(const wxString& uri) wxString wxURI::Unescape(const wxString& uri)
@@ -141,7 +141,7 @@ void wxURI::Escape(wxString& s, const wxChar& c)
const wxChar* hdig = wxT("0123456789abcdef"); const wxChar* hdig = wxT("0123456789abcdef");
s += wxT('%'); s += wxT('%');
s += hdig[(c >> 4) & 15]; s += hdig[(c >> 4) & 15];
s += hdig[c & 15]; s += hdig[c & 15];
} }
bool wxURI::IsEscape(const wxChar*& uri) bool wxURI::IsEscape(const wxChar*& uri)
@@ -1152,11 +1152,11 @@ bool wxURI::ParseIPvFuture(const wxChar*& uri)
//static //static
wxInt32 wxURI::CharToHex(const wxChar& c) wxInt32 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;
if ((c >= wxT('a')) && (c <= wxT('z'))) return c - wxT('a') + 0x0a; if ((c >= wxT('a')) && (c <= wxT('z'))) return c - wxT('a') + 0x0a;
if ((c >= wxT('0')) && (c <= wxT('9'))) return c - wxT('0') + 0x00; if ((c >= wxT('0')) && (c <= wxT('9'))) return c - wxT('0') + 0x00;
return 0; return 0;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------