X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26531700c7ec84872c60899ce6219954499086da..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/url.h?ds=sidebyside diff --git a/include/wx/url.h b/include/wx/url.h index d242169b33..171efe8562 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: url.h +// Name: wx/url.h // Purpose: URL parser // Author: Guilhem Lavaux // Modified by: Ryan Norton @@ -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,17 +47,25 @@ 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_PROTOCOL_HTTP @@ -69,22 +73,6 @@ public: void SetProxy(const wxString& url_proxy); #endif // wxUSE_PROTOCOL_HTTP -#if WXWIN_COMPATIBILITY_2_4 - //Use the proper wxURI accessors instead - wxDEPRECATED( wxString GetProtocolName() const ); - wxDEPRECATED( wxString GetHostName() const ); - wxDEPRECATED( wxString GetPath() const ); - - //Use wxURI instead - this does not work that well - wxDEPRECATED( static wxString ConvertToValidURI( - const wxString& uri, - const wxChar* delims = wxT(";/?:@&=+$,") - ) ); - - //Use wxURI::Unescape instead - wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) ); -#endif - protected: static wxProtoInfo *ms_protocols; @@ -92,6 +80,7 @@ protected: static wxHTTP *ms_proxyDefault; static bool ms_useDefaultProxy; wxHTTP *m_proxy; + bool m_useProxy; #endif // wxUSE_PROTOCOL_HTTP #if wxUSE_URL_NATIVE @@ -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;