undef CreateWindow too, even if we don't use it ourselves it's still a very common...

[wxWidgets.git] / include / wx / url.h

diff --git a/include/wx/url.h b/include/wx/url.h
index 25bf2bb5ae3d333891352f4da01895595ae1a14d..89e3e34e74c5526e5db4d72be28aaf706d2dbe0f 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -2,7 +2,7 @@
 // Name:        url.h
 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // 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
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux


@@ -20,7 +20,7 @@
 
 #if wxUSE_URL
 
 
 #if wxUSE_URL
 

-#include "wx/object.h"
+#include "wx/uri.h"

 #include "wx/protocol/protocol.h"
 
 #if wxUSE_PROTOCOL_HTTP
 #include "wx/protocol/protocol.h"
 
 #if wxUSE_PROTOCOL_HTTP


@@ -48,18 +48,19 @@ public:
 };
 #endif // wxUSE_URL_NATIVE
 
 };
 #endif // wxUSE_URL_NATIVE
 

-class WXDLLIMPEXP_NET wxURL : public wxObject
+class WXDLLIMPEXP_NET wxURL : public wxURI

 {
 public:
 {
 public:

-    wxURL(const wxString& url);
+    wxURL(const wxString& sUrl);
+    wxURL(const wxURI& url);

     virtual ~wxURL();
 
     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; }
     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();
 
 
     wxInputStream *GetInputStream();
 


@@ -68,11 +69,21 @@ public:
     void SetProxy(const wxString& url_proxy);
 #endif // wxUSE_SOCKETS
 
     void SetProxy(const wxString& url_proxy);
 #endif // wxUSE_SOCKETS
 

+#if WXWIN_COMPATIBILITY_2_4
+    //Use the proper wxURI accessors instead
+    wxString GetProtocolName() const { return m_scheme; }
+    wxString GetHostName() const     { return m_server; }
+    wxString GetPath() const         { return m_path; }
+
+    //Use wxURI instead - this does not work that well

     static wxString ConvertToValidURI(
                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")
                     );
     static wxString ConvertToValidURI(
                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")
                     );

+
+    //Use wxURI::Unescape instead

     static wxString ConvertFromURI(const wxString& uri);
     static wxString ConvertFromURI(const wxString& uri);

+#endif

 
 protected:
     static wxProtoInfo *ms_protocols;
 
 protected:
     static wxProtoInfo *ms_protocols;


@@ -95,13 +106,10 @@ protected:
     wxProtocol *m_protocol;
 
     wxURLError m_error;
     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 m_useProxy;
 

-    bool PrepProto(wxString& url);
-    bool PrepHost(wxString& url);
-    bool PrepPath(wxString& url);
+    void Init(const wxString&);

     bool ParseURL();
     void CleanData();
     bool FetchProtocol();
     bool ParseURL();
     void CleanData();
     bool FetchProtocol();


@@ -110,10 +118,6 @@ protected:
     friend class wxURLModule;
 
 private:
     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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxURL)
 };