X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a2c6ef8d186df490df28a694820a5e8afc4b5e8..c17bcb844883451b564446bf7843e7b3f862fe48:/src/common/url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index f2d58e5dbb..89b1f889cc 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -64,6 +66,7 @@ wxURL::wxURL(const wxString& url)
   }
   m_url = url;
   m_error = wxURL_NOERR;
+  ParseURL();
 }
 
 bool wxURL::ParseURL()
@@ -106,7 +109,7 @@ bool wxURL::ParseURL()
 
 void wxURL::CleanData()
 {
-  if (m_protoname != "proxy")
+  if (m_protoname != _T("proxy"))
     delete m_protocol;
 }
 
@@ -159,10 +162,9 @@ bool wxURL::PrepHost(wxString& url)
   // Retrieve service number
   pos2 = temp_url.Find(':', TRUE);
   if (pos2 != -1 && pos2 < pos) {
-    m_servname = url(pos2, pos);
+    m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())
       return FALSE;
-    pos2 = pos;
     temp_url = temp_url(0, pos2);
   }
 
@@ -237,7 +239,7 @@ wxInputStream *wxURL::GetInputStream(void)
   }
 
   m_error = wxURL_NOERR;
-  if (m_user != "") {
+  if (m_user != _T("")) {
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
@@ -313,3 +315,11 @@ void wxURL::SetProxy(const wxString& url_proxy)
   m_protoname = "proxy";
   m_path = url_proxy;
 }
+
+wxString wxURL::ConvertToValidURI(const wxString& uri)
+{
+  return wxString(uri);
+}
+
+#endif
+  // wxUSE_SOCKETS