made wxSplitterWindow::SplitXXX() virtual

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 46e26db8ceaed0aa199d91a865cdeeb830099b18..f2d58e5dbba6cfc60572a83ba8cf4b986781d8bf 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -250,7 +250,8 @@ wxInputStream *wxURL::GetInputStream(void)
 
     addr.Service(m_servname);
 
 
     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;
     }
       m_error = wxURL_CONNERR;
       return NULL;
     }


@@ -281,7 +282,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   addr.Hostname(hostname);
   addr.Service(port);
   
   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)
 }
 
 void wxURL::SetProxy(const wxString& url_proxy)


@@ -306,7 +307,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
   addr.Hostname(hostname);
   addr.Service(port);
 
   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_protocol = &m_proxy;
   m_protoname = "proxy";