Committing in .

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 1f5fb7adfd5af6e2d230cdbe849ff984148bf5dc..64939970e69828cf3d18d7a190911f0d2ac9f769 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -20,8 +20,6 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS
-

 #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"


@@ -53,13 +51,20 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
 // wxProtocol ///////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
 // wxProtocol ///////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 

+#if wxUSE_SOCKETS

 IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)
 IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)

+#else
+IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject)
+#endif

 
 wxProtocol::wxProtocol()
 
 wxProtocol::wxProtocol()

+#if wxUSE_SOCKETS

  : wxSocketClient()
  : wxSocketClient()

+#endif

 {
 }
 
 {
 }
 

+#if wxUSE_SOCKETS

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


@@ -105,10 +110,11 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   result = result.Left(result.Length()-1);
 
   size = ret-tmp_str+1;
   result = result.Left(result.Length()-1);
 
   size = ret-tmp_str+1;

-  sock->CreatePushbackBefore(&tmp_buf[size], avail-size);
+  sock->Unread(&tmp_buf[size], avail-size);

   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }

+#endif

 
 // ----------------------------------------------------------------------
 // Module
 
 // ----------------------------------------------------------------------
 // Module


@@ -128,6 +134,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
 
 bool wxProtocolModule::OnInit()
 {
 
 bool wxProtocolModule::OnInit()
 {

+#if wxUSE_SOCKETS

   char *env_http_prox;
 
   wxURL::g_proxy = NULL;
   char *env_http_prox;
 
   wxURL::g_proxy = NULL;


@@ -135,16 +142,17 @@ bool wxProtocolModule::OnInit()
   env_http_prox = getenv("HTTP_PROXY");
   if (env_http_prox)
     wxURL::SetDefaultProxy(env_http_prox);
   env_http_prox = getenv("HTTP_PROXY");
   if (env_http_prox)
     wxURL::SetDefaultProxy(env_http_prox);

+#endif

   
   return TRUE;
 }
 
 void wxProtocolModule::OnExit()
 {
   
   return TRUE;
 }
 
 void wxProtocolModule::OnExit()
 {

+#if wxUSE_SOCKETS

   if (wxURL::g_proxy)
     delete wxURL::g_proxy;
   wxURL::g_proxy = NULL;
   if (wxURL::g_proxy)
     delete wxURL::g_proxy;
   wxURL::g_proxy = NULL;

+#endif

 }
 
 }
 

-#endif
-  // wxUSE_SOCKETS