expand . into cwd

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 875ad85af0bc02e7a45c44170415a8b7a9b1cf95..9deef928f6cd7e15693a9efe7cd4b3cc15861d02 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -20,6 +20,8 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_PROTOCOL
+

 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 #include "wx/module.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 #include "wx/module.h"


@@ -43,8 +45,8 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
   m_servname = serv;
   m_cinfo = info;
   m_needhost = need_host1;
   m_servname = serv;
   m_cinfo = info;
   m_needhost = need_host1;

-  next = wxURL::g_protocols;
-  wxURL::g_protocols = this;
+  next = wxURL::ms_protocols;
+  wxURL::ms_protocols = this;

 }
 
 /////////////////////////////////////////////////////////////////
 }
 
 /////////////////////////////////////////////////////////////////


@@ -64,7 +66,6 @@ wxProtocol::wxProtocol()
 {
 }
 
 {
 }
 

-#if wxUSE_SOCKETS

 bool wxProtocol::Reconnect()
 {
   wxIPV4address addr;
 bool wxProtocol::Reconnect()
 {
   wxIPV4address addr;


@@ -166,43 +167,6 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }

-#endif
-
-// ----------------------------------------------------------------------
-// Module
-// ----------------------------------------------------------------------
-
-class wxProtocolModule: public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxProtocolModule)
-public:
-  wxProtocolModule() {}
-  bool OnInit();
-  void OnExit();
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
-
-bool wxProtocolModule::OnInit()
-{
-#if wxUSE_SOCKETS
-  char *env_http_prox;

 
 

-  wxURL::g_proxy = NULL;
-  // Initialize the proxy when HTTP_PROXY is defined
-  env_http_prox = getenv("HTTP_PROXY");
-  if (env_http_prox)
-    wxURL::SetDefaultProxy(env_http_prox);
-#endif
-  
-  return TRUE;
-}
-
-void wxProtocolModule::OnExit()
-{
-#if wxUSE_SOCKETS
-  if (wxURL::g_proxy)
-    delete wxURL::g_proxy;
-  wxURL::g_proxy = NULL;
-#endif
-}
+#endif // wxUSE_PROTOCOL