Add WXK_NONE symbolic constant indicating absence of a key.

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 5faae15fb9c3984fc881e60539039f64f8787ce9..71189f1830710a553695b79b860afac37ad50335 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -48,11 +48,13 @@ class WXDLLIMPEXP_NET wxURL : public wxURI
 {
 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);
-    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; }
@@ -78,6 +80,7 @@ protected:
     static wxHTTP *ms_proxyDefault;
     static bool ms_useDefaultProxy;
     wxHTTP *m_proxy;
+    bool m_useProxy;
 #endif // wxUSE_PROTOCOL_HTTP
 
 #if wxUSE_URL_NATIVE
@@ -87,17 +90,18 @@ protected:
     // 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;
-    bool m_useProxy;
 
     void Init(const wxString&);
     bool ParseURL();
     void CleanData();
+    void Free();
     bool FetchProtocol();
 
     friend class wxProtoInfo;