Fixed OS/2 compilation problems.

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 6b1518758511593b7bbb70c26a96d77c270f49fd..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,7 +36,7 @@ typedef enum {
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;

-  
+

 class WXDLLEXPORT wxURL : public wxObject
 {
 public:
 class WXDLLEXPORT wxURL : public wxObject
 {
 public:


@@ -42,11 +44,11 @@ public:
     virtual ~wxURL();
 
     wxString GetProtocolName() const { return m_protoinfo->m_protoname; }
     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; }
+    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();
 
 
     wxInputStream *GetInputStream();
 


@@ -55,7 +57,10 @@ 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);
+    static wxString ConvertToValidURI(
+                        const wxString& uri,
+                        const wxChar* delims = wxT(";/?:@&=+$,")
+                    );

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


@@ -88,9 +93,12 @@ protected:
 private:
     // VZ: can't use default copy ctor for this class, should write a correct
     //     one! (TODO)
 private:
     // VZ: can't use default copy ctor for this class, should write a correct
     //     one! (TODO)

-    DECLARE_NO_COPY_CLASS(wxURL);
+    DECLARE_NO_COPY_CLASS(wxURL)

 
     DECLARE_DYNAMIC_CLASS(wxURL)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxURL)
 };
 

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