Correct compilation conditions for wxURL::SetProxy.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/url.h b/include/wx/url.h
index 18143b786c8f46da7eedf7608e0b09a9954eb40a..d242169b3339e9d7ce5d1ba2d5210eacc3ddfeb0 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -64,10 +64,10 @@ public:
 
     wxInputStream *GetInputStream();
 
 
     wxInputStream *GetInputStream();
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

     static void SetDefaultProxy(const wxString& url_proxy);
     void SetProxy(const wxString& url_proxy);
     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
 
 #if WXWIN_COMPATIBILITY_2_4
     //Use the proper wxURI accessors instead

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index 3152be43aa744f1a6c2d9bb50d7a2aadae538331..959c3e2928f73716078872290340aa9f5a09e55b 100644 (file)
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -50,7 +50,9 @@ private:
         CPPUNIT_TEST( Comparison );
 #if TEST_URL
         CPPUNIT_TEST( URLCompat );
         CPPUNIT_TEST( Comparison );
 #if TEST_URL
         CPPUNIT_TEST( URLCompat );

+#if wxUSE_PROTOCOL_HTTP

         CPPUNIT_TEST( URLProxy  );
         CPPUNIT_TEST( URLProxy  );

+#endif

 #endif
     CPPUNIT_TEST_SUITE_END();
 
 #endif
     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()
 {
     wxURL url(wxT("http://www.asite.com/index.html"));
     url.SetProxy(wxT("pserv:3122"));
 }
 void URITestCase::URLProxy()
 {
     wxURL url(wxT("http://www.asite.com/index.html"));
     url.SetProxy(wxT("pserv:3122"));
 }

+#endif // wxUSE_PROTOCOL_HTTP

 #endif
 
 #endif