Window management and sizer layout corrections

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 0b145297efaf731ae12929e7585c804e9b38e6a9..f9cfdbdb75b8646ce1f833bbe53c7bb70184a3b3 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
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

+

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


@@ -15,13 +16,14 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

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

 
 

-// wxSocket headers
+#include "wx/object.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,54 +36,69 @@ typedef enum {
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;

-  
-class WXDLLEXPORT wxURL : public wxObject {
-  DECLARE_DYNAMIC_CLASS(wxURL)
-protected:
-  static wxProtoInfo *g_protocols;
-#if wxUSE_SOCKETS
-  static wxHTTP *g_proxy;
-#endif
-  wxProtoInfo *m_protoinfo;
-  wxProtocol *m_protocol;
-#if wxUSE_SOCKETS
-  wxHTTP *m_proxy;
-#endif
-  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:
 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; }

 
 

-  wxURL(const wxString& url);
-  virtual ~wxURL();
+    wxInputStream *GetInputStream();

 
 

-  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; }
+#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);

 
 

-  wxInputStream *GetInputStream();
+protected:
+    static wxProtoInfo *ms_protocols;

 
 #if wxUSE_SOCKETS
 
 #if wxUSE_SOCKETS

-  static void SetDefaultProxy(const wxString& url_proxy);
-  void SetProxy(const wxString& url_proxy);
-#endif
+    static wxHTTP *ms_proxyDefault;
+    static bool ms_useDefaultProxy;
+    wxHTTP *m_proxy;
+#endif // wxUSE_SOCKETS
+
+    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;
+    bool m_useProxy;

 
 

-  static wxString ConvertToValidURI(const wxString& uri);
+    bool PrepProto(wxString& url);
+    bool PrepHost(wxString& url);
+    bool PrepPath(wxString& url);
+    bool ParseURL();
+    void CleanData();
+    bool FetchProtocol();
+
+    friend class wxProtoInfo;
+    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)

 };
 
 };
 

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