The object size page now has full position attribute editing.

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 5b350d99fb2c999a8c1877ccc07e65ff69947524..171efe8562da260be61f87b583a43c6e48c04130 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        url.h
+// Name:        wx/url.h

 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by: Ryan Norton
 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by: Ryan Norton


@@ -34,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
 {


@@ -48,11 +48,13 @@ class WXDLLIMPEXP_NET wxURL : public wxURI
 {
 public:
     wxURL(const wxString& sUrl = wxEmptyString);
 {
 public:
     wxURL(const wxString& sUrl = wxEmptyString);

-    wxURL(const wxURI& url);
+    wxURL(const wxURI& uri);
+    wxURL(const wxURL& url);

     virtual ~wxURL();
 
     wxURL& operator = (const wxString& url);
     virtual ~wxURL();
 
     wxURL& operator = (const wxString& url);

-    wxURL& operator = (const wxURI& url);
+    wxURL& operator = (const wxURI& uri);
+    wxURL& operator = (const wxURL& url);

 
     wxProtocol& GetProtocol()        { return *m_protocol; }
     wxURLError GetError() const      { return m_error; }
 
     wxProtocol& GetProtocol()        { return *m_protocol; }
     wxURLError GetError() const      { return m_error; }


@@ -71,22 +73,6 @@ public:
     void SetProxy(const wxString& url_proxy);
 #endif // wxUSE_PROTOCOL_HTTP
 
     void SetProxy(const wxString& url_proxy);
 #endif // wxUSE_PROTOCOL_HTTP
 

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

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


@@ -94,6 +80,7 @@ protected:
     static wxHTTP *ms_proxyDefault;
     static bool ms_useDefaultProxy;
     wxHTTP *m_proxy;
     static wxHTTP *ms_proxyDefault;
     static bool ms_useDefaultProxy;
     wxHTTP *m_proxy;

+    bool m_useProxy;

 #endif // wxUSE_PROTOCOL_HTTP
 
 #if wxUSE_URL_NATIVE
 #endif // wxUSE_PROTOCOL_HTTP
 
 #if wxUSE_URL_NATIVE


@@ -103,17 +90,18 @@ protected:
     // Creates on the heap and returns a native
     // implementation object for the current platform.
     static wxURLNativeImp *CreateNativeImpObject();
     // Creates on the heap and returns a native
     // implementation object for the current platform.
     static wxURLNativeImp *CreateNativeImpObject();

-#endif
+#endif // wxUSE_URL_NATIVE
+

     wxProtoInfo *m_protoinfo;
     wxProtocol *m_protocol;
 
     wxURLError m_error;
     wxString m_url;
     wxProtoInfo *m_protoinfo;
     wxProtocol *m_protocol;
 
     wxURLError m_error;
     wxString m_url;

-    bool m_useProxy;

 
     void Init(const wxString&);
     bool ParseURL();
     void CleanData();
 
     void Init(const wxString&);
     bool ParseURL();
     void CleanData();

+    void Free();

     bool FetchProtocol();
 
     friend class wxProtoInfo;
     bool FetchProtocol();
 
     friend class wxProtoInfo;