tree ctrl sorting shouldn't crash when items don't have data

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 0489da90d90d7942af73d1037c82812064bbd102..ef280923ab5553bd5b0ae68e3756127295731b90 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -41,7 +43,7 @@ IMPLEMENT_CLASS(wxURL, wxObject)
 
 // Protocols list
 wxProtoInfo *wxURL::g_protocols = NULL;
-wxHTTP wxURL::g_proxy;
+wxHTTP *wxURL::g_proxy;
 
 /////////////////////////////////////////////////////////////////
 // wxURL ////////////////////////////////////////////////////////
@@ -56,14 +58,15 @@ wxHTTP wxURL::g_proxy;
 wxURL::wxURL(const wxString& url)
 {
   m_protocol = NULL;
-  if (g_proxy.IsConnected()) {
-    m_protocol = &g_proxy;
+  if (g_proxy->IsConnected()) {
+    m_protocol = g_proxy;
     m_protoname = "proxy";
     m_path = url;
     return;
   }
   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);
   }
@@ -250,7 +252,8 @@ wxInputStream *wxURL::GetInputStream(void)
 
     addr.Service(m_servname);
 
-    if (!m_protocol->Connect(addr)) {
+    if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
+    {
       m_error = wxURL_CONNERR;
       return NULL;
     }
@@ -267,7 +270,7 @@ wxInputStream *wxURL::GetInputStream(void)
 
 void wxURL::SetDefaultProxy(const wxString& url_proxy)
 {
-  g_proxy.Close();
+  g_proxy->Close();
 
   if (url_proxy.IsNull())
     return;
@@ -281,7 +284,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   addr.Hostname(hostname);
   addr.Service(port);
   
-  g_proxy.Connect(addr);
+  g_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
 }
 
 void wxURL::SetProxy(const wxString& url_proxy)
@@ -306,9 +309,12 @@ void wxURL::SetProxy(const wxString& url_proxy)
   addr.Hostname(hostname);
   addr.Service(port);
 
-  m_proxy.Connect(addr);
+  m_proxy.Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
 
   m_protocol = &m_proxy;
   m_protoname = "proxy";
   m_path = url_proxy;
 }
+
+#endif
+  // wxUSE_SOCKETS