X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86470d432f52318dfaac17bfd6cf41e5123e82c9..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/url.h?ds=sidebyside diff --git a/include/wx/url.h b/include/wx/url.h index 36af3f2a59..5faae15fb9 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 @@ -38,7 +34,7 @@ typedef enum { } wxURLError; #if wxUSE_URL_NATIVE -class WXDLLIMPEXP_NET wxURL; +class WXDLLIMPEXP_FWD_NET wxURL; class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject { @@ -51,46 +47,38 @@ public: class WXDLLIMPEXP_NET wxURL : public wxURI { public: - wxURL(const wxString& sUrl); + wxURL(const wxString& sUrl = wxEmptyString); wxURL(const wxURI& url); virtual ~wxURL(); 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; } + + wxURLError SetURL(const wxString &url) + { *this = url; return m_error; } + + bool IsOk() const + { return m_error == wxURL_NOERR; } 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 - -#if WXWIN_COMPATIBILITY_2_4 - //Use wxURI instead - delims is ignored - static wxString ConvertToValidURI( - const wxString& uri, - const wxChar* delims = wxT(";/?:@&=+$,") - ); - - //Use wxURI::Unescape instead - static wxString ConvertFromURI(const wxString& uri); -#endif +#endif // wxUSE_PROTOCOL_HTTP 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;