1. wxSpinButton fixed: it now sends EVT_SPIN_UP/DOWN messages (and unnecessary

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 5ee3ebf5fa731b2cc0842ba5298c399eabbf6625..1f5fb7adfd5af6e2d230cdbe849ff984148bf5dc 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -17,19 +17,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
 #if wxUSE_SOCKETS
 
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
-
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 #include "wx/module.h"
 
+#include <stdlib.h>
+
 /////////////////////////////////////////////////////////////////
 // wxProtoInfo
 /////////////////////////////////////////////////////////////////
@@ -40,7 +38,7 @@
  * --------------------------------------------------------------
  */
 
-wxProtoInfo::wxProtoInfo(const char *name, const char *serv,
+wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
 {
   m_protoname = name;
@@ -130,13 +128,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
 
 bool wxProtocolModule::OnInit()
 {
-  wxURL::g_proxy = new wxHTTP();
+  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);
+  
   return TRUE;
 }
 
 void wxProtocolModule::OnExit()
 {
-  delete wxURL::g_proxy;
+  if (wxURL::g_proxy)
+    delete wxURL::g_proxy;
   wxURL::g_proxy = NULL;
 }