X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/856d2e527d20faf46ce40734e858c7cc92b2f704..861ccde48164e232a7486e6084db4727faf50e0a:/include/wx/url.h?ds=sidebyside diff --git a/include/wx/url.h b/include/wx/url.h index 22741e9295..f8f54af963 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -36,7 +36,7 @@ class WXDLLEXPORT wxURL : public wxObject { DECLARE_DYNAMIC_CLASS(wxURL) protected: static wxProtoInfo *g_protocols; - static wxHTTP g_proxy; + static wxHTTP *g_proxy; wxProtoInfo *m_protoinfo; wxProtocol *m_protocol; wxHTTP m_proxy; @@ -52,6 +52,7 @@ protected: bool FetchProtocol(); friend class wxProtoInfo; + friend class wxProtocolModule; public: wxURL(const wxString& url); @@ -61,11 +62,14 @@ public: { 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; } wxInputStream *GetInputStream(); static void SetDefaultProxy(const wxString& url_proxy); void SetProxy(const wxString& url_proxy); + + static wxString ConvertToValidURI(const wxString& uri); }; #endif