fixed #includes

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 6b1518758511593b7bbb70c26a96d77c270f49fd..89e3e34e74c5526e5db4d72be28aaf706d2dbe0f 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -2,26 +2,28 @@
 // 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

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

+

 #ifndef _WX_URL_H
 #define _WX_URL_H
 
 #ifndef _WX_URL_H
 #define _WX_URL_H
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "url.h"

 #endif
 
 #endif
 

-// wxWindows header
-#include "wx/object.h"
+#include "wx/defs.h"
+
+#if wxUSE_URL

 
 

-// wxSocket headers
+#include "wx/uri.h"

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

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

   #include "wx/protocol/http.h"
 #endif
 
   #include "wx/protocol/http.h"
 #endif
 


@@ -34,19 +36,31 @@ typedef enum {
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;

-  
-class WXDLLEXPORT wxURL : public wxObject
+
+#if wxUSE_URL_NATIVE
+class WXDLLIMPEXP_NET wxURL;
+
+class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject
+{
+public:
+    virtual ~wxURLNativeImp() { }
+    virtual wxInputStream *GetInputStream(wxURL *owner) = 0;
+};
+#endif // wxUSE_URL_NATIVE
+
+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; }
-    wxProtocol& GetProtocol() { return *m_protocol; }
-    wxURLError GetError() const { return m_error; }
-    wxString GetPath() const { return m_path; }
+    wxURL& operator = (const wxString& url);
+    wxURL& operator = (const wxURI& url);
+
+    wxProtocol& GetProtocol()        { return *m_protocol; }
+    wxURLError GetError() const      { return m_error; }
+    wxString GetURL() const          { return m_url; }

 
     wxInputStream *GetInputStream();
 
 
     wxInputStream *GetInputStream();
 


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

-    static wxString ConvertToValidURI(const wxString& uri);
+#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(";/?:@&=+$,")
+                    );
+
+    //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;


@@ -67,17 +94,22 @@ protected:
     wxHTTP *m_proxy;
 #endif // wxUSE_SOCKETS
 
     wxHTTP *m_proxy;
 #endif // wxUSE_SOCKETS
 

+#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
+    // implementation object for the current platform.
+    static wxURLNativeImp *CreateNativeImpObject();
+#endif

     wxProtoInfo *m_protoinfo;
     wxProtocol *m_protocol;
 
     wxURLError m_error;
     wxProtoInfo *m_protoinfo;
     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();


@@ -86,11 +118,10 @@ 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)
 };
 

-#endif
+#endif // wxUSE_URL
+
+#endif // _WX_URL_H
+