X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/375abe3dac3d7816738ccd1ab495d9a0441550d4..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/url.h diff --git a/include/wx/url.h b/include/wx/url.h index aa224f7f3b..80efd19ff6 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -8,6 +8,7 @@ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_URL_H #define _WX_URL_H @@ -20,7 +21,10 @@ // wxSocket headers #include "wx/protocol/protocol.h" -#include "wx/protocol/http.h" + +#if wxUSE_SOCKETS + #include "wx/protocol/http.h" +#endif typedef enum { wxURL_NOERR = 0, @@ -32,42 +36,65 @@ typedef enum { wxURL_PROTOERR } wxURLError; -class WXDLLEXPORT wxURL : public wxObject { - DECLARE_DYNAMIC_CLASS(wxURL) -protected: - static wxProtoInfo *g_protocols; - static wxHTTP *g_proxy; - wxProtoInfo *m_protoinfo; - wxProtocol *m_protocol; - wxHTTP m_proxy; - wxURLError m_error; - wxString m_protoname, m_hostname, m_servname, m_path, m_url; - wxString m_user, m_password; - - bool PrepProto(wxString& url); - bool PrepHost(wxString& url); - bool PrepPath(wxString& url); - bool ParseURL(); - void CleanData(); - bool FetchProtocol(); - - friend class wxProtoInfo; - friend class wxProtocolModule; +class WXDLLEXPORT wxURL : public wxObject +{ public: + wxURL(const wxString& url); + virtual ~wxURL(); + + wxString GetProtocolName() const { return m_protoinfo->m_protoname; } + wxString GetHostName() const { return m_hostname; } + wxString GetURL() const { return m_url; } + wxProtocol& GetProtocol() { return *m_protocol; } + wxURLError GetError() const { return m_error; } + wxString GetPath() const { return m_path; } + + wxInputStream *GetInputStream(); + +#if wxUSE_SOCKETS + static void SetDefaultProxy(const wxString& url_proxy); + void SetProxy(const wxString& url_proxy); +#endif // wxUSE_SOCKETS + + static wxString ConvertToValidURI( + const wxString& uri, + const wxChar* delims = wxT(";/?:@&=+$,") + ); + static wxString ConvertFromURI(const wxString& uri); + +protected: + static wxProtoInfo *ms_protocols; + +#if wxUSE_SOCKETS + static wxHTTP *ms_proxyDefault; + static bool ms_useDefaultProxy; + wxHTTP *m_proxy; +#endif // wxUSE_SOCKETS + + wxProtoInfo *m_protoinfo; + wxProtocol *m_protocol; + + wxURLError m_error; + wxString m_protoname, m_hostname, m_servname, m_path, m_url; + wxString m_user, m_password; + bool m_useProxy; - wxURL(const wxString& url); - virtual ~wxURL(); + bool PrepProto(wxString& url); + bool PrepHost(wxString& url); + bool PrepPath(wxString& url); + bool ParseURL(); + void CleanData(); + bool FetchProtocol(); - inline wxString GetProtocolName() const - { return m_protoinfo->m_protoname; } - inline wxProtocol& GetProtocol() { return *m_protocol; } - inline wxURLError GetError() const { return m_error; } - inline wxString GetPath() const { return m_path; } + friend class wxProtoInfo; + friend class wxURLModule; - wxInputStream *GetInputStream(); +private: + // VZ: can't use default copy ctor for this class, should write a correct + // one! (TODO) + DECLARE_NO_COPY_CLASS(wxURL) - static void SetDefaultProxy(const wxString& url_proxy); - void SetProxy(const wxString& url_proxy); + DECLARE_DYNAMIC_CLASS(wxURL) }; #endif