OSX reshuffling

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

diff --git a/include/wx/url.h b/include/wx/url.h
index ea48335c543decf0c8709959579ae2949620e630..5faae15fb9c3984fc881e60539039f64f8787ce9 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -12,10 +12,6 @@
 #ifndef _WX_URL_H
 #define _WX_URL_H
 
 #ifndef _WX_URL_H
 #define _WX_URL_H
 

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

 #include "wx/defs.h"
 
 #if wxUSE_URL
 #include "wx/defs.h"
 
 #if wxUSE_URL


@@ -38,7 +34,7 @@ typedef enum {
 } wxURLError;
 
 #if wxUSE_URL_NATIVE
 } wxURLError;
 
 #if wxUSE_URL_NATIVE

-class WXDLLIMPEXP_NET wxURL;
+class WXDLLIMPEXP_FWD_NET wxURL;

 
 class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject
 {
 
 class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject
 {


@@ -51,7 +47,7 @@ public:
 class WXDLLIMPEXP_NET wxURL : public wxURI
 {
 public:
 class WXDLLIMPEXP_NET wxURL : public wxURI
 {
 public:

-    wxURL(const wxString& sUrl);
+    wxURL(const wxString& sUrl = wxEmptyString);

     wxURL(const wxURI& url);
     virtual ~wxURL();
 
     wxURL(const wxURI& url);
     virtual ~wxURL();
 


@@ -62,37 +58,27 @@ public:
     wxURLError GetError() const      { return m_error; }
     wxString GetURL() const          { return m_url; }
 
     wxURLError GetError() const      { return m_error; }
     wxString GetURL() const          { return m_url; }
 

+    wxURLError SetURL(const wxString &url)
+        { *this = url; return m_error; }
+
+    bool IsOk() const
+        { return m_error == wxURL_NOERR; }
+

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

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

     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 // wxUSE_SOCKETS
-
-#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
-    wxDEPRECATED( static wxString ConvertToValidURI(
-                        const wxString& uri,
-                        const wxChar* delims = wxT(";/?:@&=+$,")
-                  ) );
-
-    //Use wxURI::Unescape instead
-    wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) );
-#endif
+#endif // wxUSE_PROTOCOL_HTTP

 
 protected:
     static wxProtoInfo *ms_protocols;
 
 
 protected:
     static wxProtoInfo *ms_protocols;
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

     static wxHTTP *ms_proxyDefault;
     static bool ms_useDefaultProxy;
     wxHTTP *m_proxy;
     static wxHTTP *ms_proxyDefault;
     static bool ms_useDefaultProxy;
     wxHTTP *m_proxy;

-#endif // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP

 
 #if wxUSE_URL_NATIVE
     friend class wxURLNativeImp;
 
 #if wxUSE_URL_NATIVE
     friend class wxURLNativeImp;