X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86470d432f52318dfaac17bfd6cf41e5123e82c9..5687a67ce1e365d010c6282aa57b4f99f7f5ea29:/include/wx/url.h diff --git a/include/wx/url.h b/include/wx/url.h index 36af3f2a59..89e3e34e74 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -58,12 +58,9 @@ public: wxURL& operator = (const wxString& url); wxURL& operator = (const wxURI& url); - wxString GetProtocolName() const { return m_scheme; } - wxString GetHostName() const { return m_server; } - wxString GetURL() const { return m_url; } wxProtocol& GetProtocol() { return *m_protocol; } wxURLError GetError() const { return m_error; } - wxString GetPath() const { return m_path; } + wxString GetURL() const { return m_url; } wxInputStream *GetInputStream(); @@ -73,7 +70,12 @@ public: #endif // wxUSE_SOCKETS #if WXWIN_COMPATIBILITY_2_4 - //Use wxURI instead - delims is ignored + //Use the proper wxURI accessors instead + wxString GetProtocolName() const { return m_scheme; } + wxString GetHostName() const { return m_server; } + wxString GetPath() const { return m_path; } + + //Use wxURI instead - this does not work that well static wxString ConvertToValidURI( const wxString& uri, const wxChar* delims = wxT(";/?:@&=+$,")