Move code removing "-psn_xxx" command line arguments to common code.

[wxWidgets.git] / interface / wx / uri.h

diff --git a/interface/wx/uri.h b/interface/wx/uri.h
index b85d1cd8f01437ac7e4550dcde19ce38f90f87fe..a9b8a70214d67954d2fc9e4eb6afa093bce7d21c 100644 (file)
--- a/interface/wx/uri.h
+++ b/interface/wx/uri.h
@@ -2,7 +2,6 @@
 // Name:        uri.h
 // Purpose:     interface of wxURI
 // Author:      wxWidgets team
 // Name:        uri.h
 // Purpose:     interface of wxURI
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -31,7 +30,7 @@ enum wxURIHostType
     chance of wxURI "failing" on construction/creation.
 
     wxURI supports copy construction and standard assignment operators. wxURI
     chance of wxURI "failing" on construction/creation.
 
     wxURI supports copy construction and standard assignment operators. wxURI

-    can also be inherited from to provide furthur functionality.
+    can also be inherited from to provide further functionality.

 
     To obtain individual components you can use one of the GetXXX() methods.
     However, you should check HasXXX() before calling a get method, which
 
     To obtain individual components you can use one of the GetXXX() methods.
     However, you should check HasXXX() before calling a get method, which


@@ -49,7 +48,7 @@ enum wxURIHostType
     @endcode
 
     @note On URIs with a "file" scheme wxURI does not parse the userinfo,
     @endcode
 
     @note On URIs with a "file" scheme wxURI does not parse the userinfo,

-          server, or port portion. This is to keep compatability with
+          server, or port portion. This is to keep compatibility with

           wxFileSystem, the old wxURL, and older url specifications.
 
     @library{wxbase}
           wxFileSystem, the old wxURL, and older url specifications.
 
     @library{wxbase}


@@ -242,7 +241,7 @@ public:
     /**
         Returns @true if the User component of the URI exists.
     */
     /**
         Returns @true if the User component of the URI exists.
     */

-    bool HasUser() const;
+    bool HasUserInfo() const;

 
     /**
         Returns @true if a valid [absolute] URI, otherwise this URI is a URI
 
     /**
         Returns @true if a valid [absolute] URI, otherwise this URI is a URI