X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2df7be7f2cca699a02ee0c9ce69de9bfe6b0922f..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/protocol.cpp diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp index 736b38fd13..64939970e6 100644 --- a/src/common/protocol.cpp +++ b/src/common/protocol.cpp @@ -20,12 +20,12 @@ #pragma hdrstop #endif -#if wxUSE_SOCKETS - #include "wx/protocol/protocol.h" #include "wx/url.h" #include "wx/module.h" +#include + ///////////////////////////////////////////////////////////////// // wxProtoInfo ///////////////////////////////////////////////////////////////// @@ -51,13 +51,20 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv, // wxProtocol /////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////// +#if wxUSE_SOCKETS IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient) +#else +IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject) +#endif wxProtocol::wxProtocol() +#if wxUSE_SOCKETS : wxSocketClient() +#endif { } +#if wxUSE_SOCKETS bool wxProtocol::Reconnect() { wxIPV4address addr; @@ -103,10 +110,11 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) { 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 } +#endif // ---------------------------------------------------------------------- // Module @@ -126,15 +134,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule) bool wxProtocolModule::OnInit() { - wxURL::g_proxy = new wxHTTP(); +#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() { - delete wxURL::g_proxy; +#if wxUSE_SOCKETS + if (wxURL::g_proxy) + delete wxURL::g_proxy; wxURL::g_proxy = NULL; +#endif } -#endif - // wxUSE_SOCKETS