Fix [ 1574240 ] wx.RadioButton doesn't navigate correctly

[wxWidgets.git] / src / common / uri.cpp

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 30a0004bc12838d153f83bad286c592fa16b22e7..ccc0149a4b33e20eb297aaaff2c6401a8667eb9b 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -113,7 +113,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
 {
     wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!"));
 
 {
     wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!"));
 

-    return (wxChar)( CharToHex(s[0]) << 4 ) | CharToHex(s[1]);
+    return wx_truncate_cast(wxChar, (CharToHex(s[0]) << 4 ) | CharToHex(s[1]));

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


@@ -432,11 +432,18 @@ const wxChar* wxURI::ParseAuthority(const wxChar* uri)
     // authority     = [ userinfo "@" ] host [ ":" port ]
     if (*uri == wxT('/') && *(uri+1) == wxT('/'))
     {
     // authority     = [ userinfo "@" ] host [ ":" port ]
     if (*uri == wxT('/') && *(uri+1) == wxT('/'))
     {

+        //skip past the two slashes

         uri += 2;
 
         uri += 2;
 

+        // ############# DEVIATION FROM RFC #########################
+        // Don't parse the server component for file URIs
+        if(m_scheme != wxT("file"))
+        {
+            //normal way

         uri = ParseUserInfo(uri);
         uri = ParseServer(uri);
         return ParsePort(uri);
         uri = ParseUserInfo(uri);
         uri = ParseServer(uri);
         return ParsePort(uri);

+        }

     }
 
     return uri;
     }
 
     return uri;