X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47261ba05fa6fcc3cc304a3746363956ed67a3ff..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/url.h?ds=sidebyside diff --git a/include/wx/url.h b/include/wx/url.h index ea48335c54..d242169b33 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -64,16 +64,16 @@ 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 - wxString GetProtocolName() const { return m_scheme; } - wxString GetHostName() const { return m_server; } - wxString GetPath() const { return m_path; } + wxDEPRECATED( wxString GetProtocolName() const ); + wxDEPRECATED( wxString GetHostName() const ); + wxDEPRECATED( wxString GetPath() const ); //Use wxURI instead - this does not work that well wxDEPRECATED( static wxString ConvertToValidURI( @@ -88,11 +88,11 @@ public: protected: static wxProtoInfo *ms_protocols; -#if wxUSE_SOCKETS +#if wxUSE_PROTOCOL_HTTP static wxHTTP *ms_proxyDefault; static bool ms_useDefaultProxy; wxHTTP *m_proxy; -#endif // wxUSE_SOCKETS +#endif // wxUSE_PROTOCOL_HTTP #if wxUSE_URL_NATIVE friend class wxURLNativeImp;