X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b4183d82b7b833106edd751632c2f24c9580eb6..80a58c9968cc740b50fb92cd95d6a014a1c6e9bf:/include/wx/url.h diff --git a/include/wx/url.h b/include/wx/url.h index f37d4a9d90..40ff50c370 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -20,7 +20,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, @@ -36,13 +39,18 @@ class WXDLLEXPORT wxURL : public wxObject { DECLARE_DYNAMIC_CLASS(wxURL) protected: static wxProtoInfo *g_protocols; +#if wxUSE_SOCKETS static wxHTTP *g_proxy; +#endif wxProtoInfo *m_protoinfo; wxProtocol *m_protocol; - wxHTTP m_proxy; +#if wxUSE_SOCKETS + wxHTTP *m_proxy; +#endif wxURLError m_error; wxString m_protoname, m_hostname, m_servname, m_path, m_url; wxString m_user, m_password; + bool m_useProxy; bool PrepProto(wxString& url); bool PrepHost(wxString& url); @@ -60,13 +68,21 @@ public: inline wxString GetProtocolName() const { return m_protoinfo->m_protoname; } + inline wxString GetHostName() const { return m_hostname; } + inline wxString GetURL() const { return m_url; } inline wxProtocol& GetProtocol() { return *m_protocol; } inline wxURLError GetError() const { return m_error; } + inline 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 + + static wxString ConvertToValidURI(const wxString& uri); + static wxString ConvertFromURI(const wxString& uri); }; #endif