some fixes after global _T() => T() change

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

diff --git a/include/wx/url.h b/include/wx/url.h
index dae1c6ec308b1fdaea6bb31e93d60080d4d8d456..40ff50c370ade5bc570086cd89b4e7943e73fade 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -20,7 +20,10 @@
 
 // wxSocket headers
 #include "wx/protocol/protocol.h"
 
 // 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,
 
 typedef enum {
   wxURL_NOERR = 0,


@@ -36,12 +39,18 @@ class WXDLLEXPORT wxURL : public wxObject {
   DECLARE_DYNAMIC_CLASS(wxURL)
 protected:
   static wxProtoInfo *g_protocols;
   DECLARE_DYNAMIC_CLASS(wxURL)
 protected:
   static wxProtoInfo *g_protocols;

-  static wxHTTP g_proxy;
+#if wxUSE_SOCKETS
+  static wxHTTP *g_proxy;
+#endif

   wxProtoInfo *m_protoinfo;
   wxProtocol *m_protocol;
   wxProtoInfo *m_protoinfo;
   wxProtocol *m_protocol;

-  wxHTTP m_proxy;
+#if wxUSE_SOCKETS
+  wxHTTP *m_proxy;
+#endif

   wxURLError m_error;
   wxString m_protoname, m_hostname, m_servname, m_path, m_url;
   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 PrepProto(wxString& url);
   bool PrepHost(wxString& url);


@@ -51,6 +60,7 @@ protected:
   bool FetchProtocol();
 
   friend class wxProtoInfo;
   bool FetchProtocol();
 
   friend class wxProtoInfo;

+  friend class wxProtocolModule;

 public:
 
   wxURL(const wxString& url);
 public:
 
   wxURL(const wxString& url);


@@ -58,13 +68,21 @@ public:
 
   inline wxString GetProtocolName() const
         { return m_protoinfo->m_protoname; }
 
   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 wxProtocol& GetProtocol() { return *m_protocol; }
   inline wxURLError GetError() const { return m_error; }

+  inline wxString GetPath() const { return m_path; }

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

+#if wxUSE_SOCKETS

   static void SetDefaultProxy(const wxString& url_proxy);
   void SetProxy(const wxString& url_proxy);
   static void SetDefaultProxy(const wxString& url_proxy);
   void SetProxy(const wxString& url_proxy);

+#endif
+
+  static wxString ConvertToValidURI(const wxString& uri);
+  static wxString ConvertFromURI(const wxString& uri);

 };
 
 #endif
 };
 
 #endif