don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

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

diff --git a/include/wx/url.h b/include/wx/url.h
index 18143b786c8f46da7eedf7608e0b09a9954eb40a..5b350d99fb2c999a8c1877ccc07e65ff69947524 100644 (file)
--- 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
@@ -51,7 +47,7 @@ public:
 class WXDLLIMPEXP_NET wxURL : public wxURI
 {
 public:
-    wxURL(const wxString& sUrl);
+    wxURL(const wxString& sUrl = wxEmptyString);
     wxURL(const wxURI& url);
     virtual ~wxURL();
 
@@ -62,12 +58,18 @@ public:
     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_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
 
 #if WXWIN_COMPATIBILITY_2_4
     //Use the proper wxURI accessors instead