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

Add default argument for the overridden base class Connect() in wxHTTP.

Browse Source 
This allows to call Connect(wxIPV4address) on a wxHTTP object, without
having to explicitly specify the second argument (this was documented as being
a Watcom-specific problem, but actually it wasn't).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-16 13:00:32 +00:00
parent 3a9237d78b
commit 36666a975f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/protocol/http.h
View File

@@ -26,7 +26,7 @@ public:
virtual bool Connect(const wxString& host, unsigned short port); virtual bool Connect(const wxString& host, unsigned short port);
virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); } virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); }
virtual bool Connect(const wxSockAddress& addr, bool wait) wxOVERRIDE; virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE;
bool Abort() wxOVERRIDE; bool Abort() wxOVERRIDE;
wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE;

6
src/common/url.cpp
View File

@@ -318,7 +318,7 @@ wxInputStream *wxURL::GetInputStream()
addr.Service(m_port); addr.Service(m_port);
if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason if (!m_protocol->Connect(addr))
{ {
m_error = wxURL_CONNERR; m_error = wxURL_CONNERR;
return NULL; return NULL;
@@ -388,7 +388,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
ms_proxyDefault->Close(); ms_proxyDefault->Close();
else else
ms_proxyDefault = new wxHTTP(); ms_proxyDefault = new wxHTTP();
ms_proxyDefault->Connect(addr, true); // Watcom needs the 2nd arg for some reason ms_proxyDefault->Connect(addr);
} }
} }
@@ -427,7 +427,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
if (m_proxy && m_proxy != ms_proxyDefault) if (m_proxy && m_proxy != ms_proxyDefault)
delete m_proxy; delete m_proxy;
m_proxy = new wxHTTP(); m_proxy = new wxHTTP();
m_proxy->Connect(addr, true); // Watcom needs the 2nd arg for some reason m_proxy->Connect(addr);
CleanData(); CleanData();
// Reparse url. // Reparse url.