Correct compilation conditions for wxURL::SetProxy.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c27bcbd5a7
commit
26531700c7
@ -64,10 +64,10 @@ public:
|
||||
|
||||
wxInputStream *GetInputStream();
|
||||
|
||||
#if wxUSE_SOCKETS
|
||||
#if wxUSE_PROTOCOL_HTTP
|
||||
static void SetDefaultProxy(const wxString& url_proxy);
|
||||
void SetProxy(const wxString& url_proxy);
|
||||
#endif // wxUSE_SOCKETS
|
||||
#endif // wxUSE_PROTOCOL_HTTP
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
//Use the proper wxURI accessors instead
|
||||
|
@ -50,7 +50,9 @@ private:
|
||||
CPPUNIT_TEST( Comparison );
|
||||
#if TEST_URL
|
||||
CPPUNIT_TEST( URLCompat );
|
||||
#if wxUSE_PROTOCOL_HTTP
|
||||
CPPUNIT_TEST( URLProxy );
|
||||
#endif
|
||||
#endif
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
@ -318,10 +320,12 @@ void URITestCase::URLCompat()
|
||||
CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );
|
||||
}
|
||||
|
||||
#if wxUSE_PROTOCOL_HTTP
|
||||
void URITestCase::URLProxy()
|
||||
{
|
||||
wxURL url(wxT("http://www.asite.com/index.html"));
|
||||
url.SetProxy(wxT("pserv:3122"));
|
||||
}
|
||||
#endif // wxUSE_PROTOCOL_HTTP
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user