wxImage now uses GTK 1.2's fast rendering code if possible

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 21df7e8997284e0fed06df95342a78d3e5cd476c..ac5020956faca9836520bd8fcfe711ac96b7ea27 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -13,18 +13,22 @@
 #pragma implementation "protocol.h"
 #endif
 
 #pragma implementation "protocol.h"
 #endif
 

-#ifdef WXPREC
-#include <wx/wxprec.h>
-#else
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#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/wx.h>
 #endif
 
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"

-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/module.h"

 
 /////////////////////////////////////////////////////////////////
 // wxProtoInfo
 
 /////////////////////////////////////////////////////////////////
 // wxProtoInfo


@@ -36,7 +40,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;
                          const bool need_host1, wxClassInfo *info)
 {
   m_protoname = name;


@@ -107,3 +111,34 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }

+
+// ----------------------------------------------------------------------
+// Module
+// ----------------------------------------------------------------------
+
+class wxProtocolModule: public wxModule {
+  DECLARE_DYNAMIC_CLASS(wxProtocolModule)
+public:
+  wxProtocolModule() {}
+  bool OnInit();
+  void OnExit();
+};
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
+#endif
+
+bool wxProtocolModule::OnInit()
+{
+  wxURL::g_proxy = new wxHTTP();
+  return TRUE;
+}
+
+void wxProtocolModule::OnExit()
+{
+  delete wxURL::g_proxy;
+  wxURL::g_proxy = NULL;
+}
+
+#endif
+  // wxUSE_SOCKETS