Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header...

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 66d974b4493d6a423be246b686e887571cbc652c..b941e10e168110ec739b8c1523ca1bd3e958b70a 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -8,6 +8,7 @@
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_URL_H
 #define _WX_URL_H
 
@@ -20,7 +21,10 @@
 
 // wxSocket headers
 #include "wx/protocol/protocol.h"
-#include "wx/protocol/http.h"
+
+#if wxUSE_SOCKETS
+  #include "wx/protocol/http.h"
+#endif
 
 typedef enum {
   wxURL_NOERR = 0,
@@ -32,47 +36,65 @@ typedef enum {
   wxURL_PROTOERR
 } wxURLError;
   
-class WXDLLEXPORT wxURL : public wxObject {
-  DECLARE_DYNAMIC_CLASS(wxURL)
-protected:
-  static wxProtoInfo *g_protocols;
-  static wxHTTP *g_proxy;
-  wxProtoInfo *m_protoinfo;
-  wxProtocol *m_protocol;
-  wxHTTP *m_proxy;
-  wxURLError m_error;
-  wxString m_protoname, m_hostname, m_servname, m_path, m_url;
-  wxString m_user, m_password;
-  bool m_useProxy;
-
-  bool PrepProto(wxString& url);
-  bool PrepHost(wxString& url);
-  bool PrepPath(wxString& url);
-  bool ParseURL();
-  void CleanData();
-  bool FetchProtocol();
-
-  friend class wxProtoInfo;
-  friend class wxProtocolModule;
+class WXDLLEXPORT wxURL : public wxObject
+{
 public:
+    wxURL(const wxString& url);
+    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; }
+
+    wxInputStream *GetInputStream();
+
+#if wxUSE_SOCKETS
+    static void SetDefaultProxy(const wxString& url_proxy);
+    void SetProxy(const wxString& url_proxy);
+#endif // wxUSE_SOCKETS
+
+    static wxString ConvertToValidURI(
+                        const wxString& uri,
+                        const wxChar* delims = wxT(";/?:@&=+$,")
+                    );
+    static wxString ConvertFromURI(const wxString& uri);
+
+protected:
+    static wxProtoInfo *ms_protocols;
+
+#if wxUSE_SOCKETS
+    static wxHTTP *ms_proxyDefault;
+    static bool ms_useDefaultProxy;
+    wxHTTP *m_proxy;
+#endif // wxUSE_SOCKETS
+
+    wxProtoInfo *m_protoinfo;
+    wxProtocol *m_protocol;
 
-  wxURL(const wxString& url);
-  virtual ~wxURL();
+    wxURLError m_error;
+    wxString m_protoname, m_hostname, m_servname, m_path, m_url;
+    wxString m_user, m_password;
+    bool m_useProxy;
 
-  inline wxString GetProtocolName() const
-        { return m_protoinfo->m_protoname; }
-  inline wxString GetHostName() const { return m_hostname; }
-  inline wxString GetURL() const { return m_url; }
-  inline wxProtocol& GetProtocol() { return *m_protocol; }
-  inline wxURLError GetError() const { return m_error; }
-  inline wxString GetPath() const { return m_path; }
+    bool PrepProto(wxString& url);
+    bool PrepHost(wxString& url);
+    bool PrepPath(wxString& url);
+    bool ParseURL();
+    void CleanData();
+    bool FetchProtocol();
 
-  wxInputStream *GetInputStream();
+    friend class wxProtoInfo;
+    friend class wxURLModule;
 
-  static void SetDefaultProxy(const wxString& url_proxy);
-  void SetProxy(const wxString& url_proxy);
+private:
+    // VZ: can't use default copy ctor for this class, should write a correct
+    //     one! (TODO)
+    DECLARE_NO_COPY_CLASS(wxURL);
 
-  static wxString ConvertToValidURI(const wxString& uri);
+    DECLARE_DYNAMIC_CLASS(wxURL)
 };
 
 #endif