Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixed sor wxUSE_PROTOCOL_FTP/HTTP=0.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@22929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-08-16 12:10:15 +00:00
parent ad7462e21d
commit 4d831c9265
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/url.h
View File

@@ -66,7 +66,7 @@ public:
protected: protected:
static wxProtoInfo *ms_protocols; static wxProtoInfo *ms_protocols;
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
static wxHTTP *ms_proxyDefault; static wxHTTP *ms_proxyDefault;
static bool ms_useDefaultProxy; static bool ms_useDefaultProxy;
wxHTTP *m_proxy; wxHTTP *m_proxy;

21
src/common/url.cpp
View File

@@ -41,12 +41,17 @@ wxProtoInfo *wxURL::ms_protocols = NULL;
USE_PROTOCOL(wxFileProto) USE_PROTOCOL(wxFileProto)
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
#if wxUSE_PROTOCOL_HTTP
USE_PROTOCOL(wxHTTP) USE_PROTOCOL(wxHTTP)
#endif
#if wxUSE_PROTOCOL_FTP
USE_PROTOCOL(wxFTP) USE_PROTOCOL(wxFTP)
#endif
#if wxUSE_PROTOCOL_HTTP
wxHTTP *wxURL::ms_proxyDefault = NULL; wxHTTP *wxURL::ms_proxyDefault = NULL;
bool wxURL::ms_useDefaultProxy = FALSE; bool wxURL::ms_useDefaultProxy = FALSE;
#endif #endif
#endif
// -------------------------------------------------------------- // --------------------------------------------------------------
// wxURL // wxURL
@@ -62,7 +67,7 @@ wxURL::wxURL(const wxString& url)
m_error = wxURL_NOERR; m_error = wxURL_NOERR;
m_url = url; m_url = url;
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
if ( ms_useDefaultProxy && !ms_proxyDefault ) if ( ms_useDefaultProxy && !ms_proxyDefault )
{ {
SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) ); SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
@@ -125,7 +130,7 @@ bool wxURL::ParseURL()
} }
// URL parse finished. // URL parse finished.
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
if (m_useProxy) if (m_useProxy)
{ {
// We destroy the newly created protocol. // We destroy the newly created protocol.
@@ -149,7 +154,7 @@ bool wxURL::ParseURL()
void wxURL::CleanData() void wxURL::CleanData()
{ {
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
if (!m_useProxy) if (!m_useProxy)
#endif #endif
delete m_protocol; delete m_protocol;
@@ -158,7 +163,7 @@ void wxURL::CleanData()
wxURL::~wxURL() wxURL::~wxURL()
{ {
CleanData(); CleanData();
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
if (m_proxy && m_proxy != ms_proxyDefault) if (m_proxy && m_proxy != ms_proxyDefault)
delete m_proxy; delete m_proxy;
#endif #endif
@@ -287,7 +292,7 @@ wxInputStream *wxURL::GetInputStream()
m_protocol->SetPassword(m_password); m_protocol->SetPassword(m_password);
} }
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
wxIPV4address addr; wxIPV4address addr;
// m_protoinfo is NULL when we use a proxy // m_protoinfo is NULL when we use a proxy
@@ -324,7 +329,7 @@ wxInputStream *wxURL::GetInputStream()
return the_i_stream; return the_i_stream;
} }
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
void wxURL::SetDefaultProxy(const wxString& url_proxy) void wxURL::SetDefaultProxy(const wxString& url_proxy)
{ {
if ( !url_proxy ) if ( !url_proxy )
@@ -487,7 +492,7 @@ wxString wxURL::ConvertFromURI(const wxString& uri)
// A module which deletes the default proxy if we created it // A module which deletes the default proxy if we created it
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
#if wxUSE_SOCKETS #if wxUSE_SOCKETS && wxUSE_PROTOCOL_HTTP
class wxURLModule : public wxModule class wxURLModule : public wxModule
{ {