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

Correct compilation conditions for wxURL::SetProxy.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-03-19 23:09:31 +00:00
parent c27bcbd5a7
commit 26531700c7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/url.h
View File

@@ -64,10 +64,10 @@ public:
wxInputStream *GetInputStream(); wxInputStream *GetInputStream();
#if wxUSE_SOCKETS #if wxUSE_PROTOCOL_HTTP
static void SetDefaultProxy(const wxString& url_proxy); static void SetDefaultProxy(const wxString& url_proxy);
void SetProxy(const wxString& url_proxy); void SetProxy(const wxString& url_proxy);
#endif // wxUSE_SOCKETS #endif // wxUSE_PROTOCOL_HTTP
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4
//Use the proper wxURI accessors instead //Use the proper wxURI accessors instead

4
tests/uris/uris.cpp
View File

@@ -50,7 +50,9 @@ private:
CPPUNIT_TEST( Comparison ); CPPUNIT_TEST( Comparison );
#if TEST_URL #if TEST_URL
CPPUNIT_TEST( URLCompat ); CPPUNIT_TEST( URLCompat );
#if wxUSE_PROTOCOL_HTTP
CPPUNIT_TEST( URLProxy ); CPPUNIT_TEST( URLProxy );
#endif
#endif #endif
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
@@ -318,10 +320,12 @@ void URITestCase::URLCompat()
CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") ); CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );
} }
#if wxUSE_PROTOCOL_HTTP
void URITestCase::URLProxy() void URITestCase::URLProxy()
{ {
wxURL url(wxT("http://www.asite.com/index.html")); wxURL url(wxT("http://www.asite.com/index.html"));
url.SetProxy(wxT("pserv:3122")); url.SetProxy(wxT("pserv:3122"));
} }
#endif // wxUSE_PROTOCOL_HTTP
#endif #endif