From 26531700c7ec84872c60899ce6219954499086da Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 19 Mar 2005 23:09:31 +0000 Subject: [PATCH] Correct compilation conditions for wxURL::SetProxy. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/url.h | 4 ++-- tests/uris/uris.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wx/url.h b/include/wx/url.h index 18143b786c..d242169b33 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -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 diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp index 3152be43aa..959c3e2928 100644 --- a/tests/uris/uris.cpp +++ b/tests/uris/uris.cpp @@ -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 -- 2.47.2