X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35a4dab713ccc16c2414aa18d360aa40929fd60c..9e855852c1bc24ddd49b69df5290111022a96093:/src/common/url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 9c012d1602..3c8aebe2dc 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -45,15 +45,13 @@ IMPLEMENT_CLASS(wxURL, wxObject)
 wxProtoInfo *wxURL::g_protocols = NULL;
 wxHTTP *wxURL::g_proxy;
 
-/////////////////////////////////////////////////////////////////
-// wxURL ////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
+// --------------------------------------------------------------
+// wxURL
+// --------------------------------------------------------------
 
-/*
- * --------------------------------------------------------------
- * --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// --------------------------------------------------------------
 
 wxURL::wxURL(const wxString& url)
 {
@@ -109,7 +107,7 @@ bool wxURL::ParseURL()
 
 void wxURL::CleanData()
 {
-  if (m_protoname != "proxy")
+  if (m_protoname != _T("proxy"))
     delete m_protocol;
 }
 
@@ -118,11 +116,10 @@ wxURL::~wxURL()
   CleanData();
 }
 
-/*
- * --------------------------------------------------------------
- * --------- wxURL urls decoders --------------------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL urls decoders --------------------------------
+// --------------------------------------------------------------
+
 bool wxURL::PrepProto(wxString& url)
 {
   int pos;
@@ -219,11 +216,10 @@ bool wxURL::FetchProtocol()
   return FALSE;
 }
 
-/*
- * --------------------------------------------------------------
- * --------- wxURL get ------------------------------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL get ------------------------------------------
+// --------------------------------------------------------------
+
 wxInputStream *wxURL::GetInputStream(void)
 {
   wxIPV4address addr;
@@ -239,7 +235,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);
   }
@@ -316,5 +312,25 @@ void wxURL::SetProxy(const wxString& url_proxy)
   m_path = url_proxy;
 }
 
+wxString wxURL::ConvertToValidURI(const wxString& uri)
+{
+  wxString out_str;
+  wxString hexa_code;
+  size_t i;
+
+  for (i=0;i<uri.Len();i++) {
+    wxChar c = uri.GetChar(i);
+
+    if (!isalpha(c) && c != _T('.') && c != _T('+') && c != _T('.') && 
+                       c != _T('/')) {
+      hexa_code.Printf(_T("%02X"), c);
+      out_str += hexa_code;
+    } else
+      out_str += c;
+  }
+  
+  return out_str;
+}
+
 #endif
   // wxUSE_SOCKETS