don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 761ba79b2dd83caa3005707c71e8ce66be63ac72..c74abf302c537755bb8e1dce7ebd38947ca4bafe 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -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
 {


@@ -47,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();
 


@@ -58,6 +58,12 @@ 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();
 
 #if wxUSE_PROTOCOL_HTTP
     wxInputStream *GetInputStream();
 
 #if wxUSE_PROTOCOL_HTTP


@@ -65,22 +71,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;
 


@@ -88,6 +78,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


@@ -97,13 +88,13 @@ 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 Init(const wxString&);
     bool ParseURL();