more compilation fixes after pen/brush styles changes

[wxWidgets.git] / interface / url.h

diff --git a/interface/url.h b/interface/url.h
index dceb2096d190b4ea7f08d3a06ba2428f10999d3c..2c159c8004495273b6dfadbced59f3f8326ea508 100644 (file)
--- a/interface/url.h
+++ b/interface/url.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        url.h
-// Purpose:     documentation for wxURL class
+// Purpose:     interface of wxURL
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
@@ -21,8 +21,7 @@
     @library{wxnet}
     @category{net}
 
-    @seealso
-    wxSocketBase, wxProtocol
+    @see wxSocketBase, wxProtocol
 */
 class wxURL : public wxURI
 {
@@ -35,7 +34,7 @@ public:
         It is valid to leave out the hostname but slashes must remain in place -
         i.e. a file URL without a hostname must contain three consecutive slashes
         (e.g. @c file:///somepath/myfile).
-        
+
         @param url
             Url string to parse.
     */
@@ -49,36 +48,36 @@ public:
     /**
         Returns the last error. This error refers to the URL parsing or to the protocol.
         It can be one of these errors:
-        
+
         @b wxURL_NOERR
-        
+
         No error.
-        
+
         @b wxURL_SNTXERR
-        
+
         Syntax error in the URL string.
-        
+
         @b wxURL_NOPROTO
-        
+
         Found no protocol which can get this URL.
-        
+
         @b wxURL_NOHOST
-        
+
         A host name is required for this protocol.
-        
+
         @b wxURL_NOPATH
-        
+
         A path is required for this protocol.
-        
+
         @b wxURL_CONNERR
-        
+
         Connection error.
-        
+
         @b wxURL_PROTOERR
-        
+
         An error occurred during negotiation.
     */
-    wxURLError GetError();
+    wxURLError GetError() const;
 
     /**
         Creates a new input stream on the specified URL. You can use all but seek
@@ -87,10 +86,10 @@ public:
         Note that this method is somewhat deprecated, all future wxWidgets applications
         should really use wxFileSystem instead.
         Example:
-        
+
         @returns Returns the initialized stream. You will have to delete it
                  yourself.
-        
+
         @see wxInputStream
     */
     wxInputStream* GetInputStream();
@@ -104,22 +103,22 @@ public:
         Returns @true if this object is correctly initialized, i.e. if
         GetError() returns @c wxURL_NOERR.
     */
-    bool IsOk();
+    bool IsOk() const;
 
     /**
         Sets the default proxy server to use to get the URL. The string specifies
         the proxy like this: hostname:port number.
-        
+
         @param url_proxy
             Specifies the proxy to use
-        
+
         @see SetProxy()
     */
     static void SetDefaultProxy(const wxString& url_proxy);
 
     /**
         Sets the proxy to use for this URL.
-        
+
         @see SetDefaultProxy()
     */
     void SetProxy(const wxString& url_proxy);
@@ -130,3 +129,4 @@ public:
     */
     wxURLError SetURL(const wxString& url);
 };
+