X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/url.h

diff --git a/include/wx/url.h b/include/wx/url.h
index 90576092b1..d242169b33 100644
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -2,11 +2,11 @@
 // Name:        url.h
 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: Ryan Norton
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_URL_H
@@ -20,7 +20,7 @@
 
 #if wxUSE_URL
 
-#include "wx/object.h"
+#include "wx/uri.h"
 #include "wx/protocol/protocol.h"
 
 #if wxUSE_PROTOCOL_HTTP
@@ -48,46 +48,57 @@ public:
 };
 #endif // wxUSE_URL_NATIVE
 
-class WXDLLIMPEXP_NET wxURL : public wxObject
+class WXDLLIMPEXP_NET wxURL : public wxURI
 {
 public:
-    wxURL(const wxString& url);
+    wxURL(const wxString& sUrl);
+    wxURL(const wxURI& url);
     virtual ~wxURL();
 
-    wxString GetProtocolName() const { return m_protoinfo->m_protoname; }
-    wxString GetHostName() const     { return m_hostname; }
-    wxString GetURL() const          { return m_url; }
+    wxURL& operator = (const wxString& url);
+    wxURL& operator = (const wxURI& url);
+
     wxProtocol& GetProtocol()        { return *m_protocol; }
     wxURLError GetError() const      { return m_error; }
-    wxString GetPath() const         { return m_path; }
+    wxString GetURL() const          { return m_url; }
 
     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
+#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 );
 
-    static wxString ConvertToValidURI(
+    //Use wxURI instead - this does not work that well
+    wxDEPRECATED( static wxString ConvertToValidURI(
                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")
-                    );
-    static wxString ConvertFromURI(const wxString& uri);
+                  ) );
+
+    //Use wxURI::Unescape instead
+    wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) );
+#endif
 
 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
+#endif // wxUSE_PROTOCOL_HTTP
 
 #if wxUSE_URL_NATIVE
     friend class wxURLNativeImp;
     // pointer to a native URL implementation object
     wxURLNativeImp *m_nativeImp;
-    // Creates on the heap and returns a native 
+    // Creates on the heap and returns a native
     // implementation object for the current platform.
     static wxURLNativeImp *CreateNativeImpObject();
 #endif
@@ -95,13 +106,10 @@ protected:
     wxProtocol *m_protocol;
 
     wxURLError m_error;
-    wxString m_protoname, m_hostname, m_servname, m_path, m_url;
-    wxString m_user, m_password;
+    wxString m_url;
     bool m_useProxy;
 
-    bool PrepProto(wxString& url);
-    bool PrepHost(wxString& url);
-    bool PrepPath(wxString& url);
+    void Init(const wxString&);
     bool ParseURL();
     void CleanData();
     bool FetchProtocol();
@@ -110,10 +118,6 @@ protected:
     friend class wxURLModule;
 
 private:
-    // VZ: can't use default copy ctor for this class, should write a correct
-    //     one! (TODO)
-    DECLARE_NO_COPY_CLASS(wxURL)
-
     DECLARE_DYNAMIC_CLASS(wxURL)
 };