X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce195ee63259e9a70136adef1ddcec4132647f96..7521630773affd2e8d8ff818285fe9c38f901eb6:/include/wx/url.h?ds=inline diff --git a/include/wx/url.h b/include/wx/url.h index 61c2233037..761ba79b2d 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -12,10 +12,6 @@ #ifndef _WX_URL_H #define _WX_URL_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "url.h" -#endif - #include "wx/defs.h" #if wxUSE_URL @@ -64,16 +60,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(