X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/997ba01b2824763881936e242ce6a35576a45d71..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/url.h diff --git a/include/wx/url.h b/include/wx/url.h index 89e3e34e74..71189f1830 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,48 +47,41 @@ public: class WXDLLIMPEXP_NET wxURL : public wxURI { public: - wxURL(const wxString& sUrl); - wxURL(const wxURI& url); + wxURL(const wxString& sUrl = wxEmptyString); + wxURL(const wxURI& uri); + wxURL(const wxURL& url); virtual ~wxURL(); wxURL& operator = (const wxString& url); - wxURL& operator = (const wxURI& url); + wxURL& operator = (const wxURI& uri); + wxURL& operator = (const wxURL& url); wxProtocol& GetProtocol() { return *m_protocol; } wxURLError GetError() const { return m_error; } 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 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(";/?:@&=+$,") - ); - - //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 + bool m_useProxy; +#endif // wxUSE_PROTOCOL_HTTP #if wxUSE_URL_NATIVE friend class wxURLNativeImp; @@ -101,17 +90,18 @@ protected: // Creates on the heap and returns a native // implementation object for the current platform. static wxURLNativeImp *CreateNativeImpObject(); -#endif +#endif // wxUSE_URL_NATIVE + wxProtoInfo *m_protoinfo; wxProtocol *m_protocol; wxURLError m_error; wxString m_url; - bool m_useProxy; void Init(const wxString&); bool ParseURL(); void CleanData(); + void Free(); bool FetchProtocol(); friend class wxProtoInfo;