Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/apptrait.h b/interface/wx/apptrait.h
index 5e8fd7ae665e0c2265324ab4085805d25fd9c643..15dd77450bbc38ec42a77c18abd30e37980d07a1 100644 (file)
--- a/interface/wx/apptrait.h
+++ b/interface/wx/apptrait.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxAppTraits
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxAppTraits
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -23,7 +23,7 @@
     implementation of the wxAppTraits interface.
 
     @library{wxbase}
     implementation of the wxAppTraits interface.
 
     @library{wxbase}

-    @category{appmanagement}
+    @category{cfg}

 
     @see @ref overview_app, wxApp
 */
 
     @see @ref overview_app, wxApp
 */


@@ -93,12 +93,11 @@ public:
         It's normally the same for wxBase and wxGUI except in the case of wxMac
         and wxCocoa.
 
         It's normally the same for wxBase and wxGUI except in the case of wxMac
         and wxCocoa.
 

-        @todo the real function returns a reference to wxStandardPathsBase;
-              user looking at these docs will write code:
-                    wxStandardPaths &ref = ...->GetStandardPaths();
-              which won't compile...
+        @note
+        The returned reference is to a @c wxStandardPathsBase class but you
+        can consider it to be equivalent to wxStandardPaths (which is documented).

     */
     */

-    virtual wxStandardPaths& GetStandardPaths();
+    virtual wxStandardPathsBase& GetStandardPaths();

 
     /**
         Returns the wxWidgets port ID used by the running program and eventually
 
     /**
         Returns the wxWidgets port ID used by the running program and eventually