X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b60b2ec8ac57d569c4831eb98113f7cb713a117a..467e04791c0d5914dc8ed8e535af607f7fc1dfe1:/include/wx/url.h

diff --git a/include/wx/url.h b/include/wx/url.h
index 3e41a473d1..761ba79b2d 100644
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -12,10 +12,6 @@
 #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
@@ -58,34 +54,41 @@ public:
     wxURL& operator = (const wxString& url);
     wxURL& operator = (const wxURI& url);
 
-    wxString GetProtocolName() const { return m_scheme; }
-    wxString GetHostName() const     { return m_server; }
-    wxString GetURL() const          { return m_url; }
     wxProtocol& GetProtocol()        { return *m_protocol; }
     wxURLError GetError() const      { return m_error; }
-    wxString GetPath() const         { return m_path; }
+    wxString GetURL() const          { return m_url; }
 
     wxInputStream *GetInputStream();
 
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP
     static void SetDefaultProxy(const wxString& url_proxy);
     void SetProxy(const wxString& url_proxy);
-#endif // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
 
-    static wxString ConvertToValidURI(
+#if WXWIN_COMPATIBILITY_2_4
+    //Use the proper wxURI accessors instead
+    wxDEPRECATED( wxString GetProtocolName() const );
+    wxDEPRECATED( wxString GetHostName() const );
+    wxDEPRECATED( wxString GetPath() const );
+
+    //Use wxURI instead - this does not work that well
+    wxDEPRECATED( static wxString ConvertToValidURI(
                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")
-                    );
-    static wxString ConvertFromURI(const wxString& uri);
+                  ) );
+
+    //Use wxURI::Unescape instead
+    wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) );
+#endif
 
 protected:
     static wxProtoInfo *ms_protocols;
 
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP
     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;