Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/access.h b/interface/wx/access.h
index 953e9092b483115e5debb61031bfba1b4e8f67f9..77a890d60e51146228d97e3f7793b4d9cd87bfc2 100644 (file)
--- a/interface/wx/access.h
+++ b/interface/wx/access.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxAccessible
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxAccessible
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -357,9 +357,9 @@ public:
 
         Acceptable values are:
         @li a null variant (IsNull() returns @true)
 
         Acceptable values are:
         @li a null variant (IsNull() returns @true)

-        @li a list variant (GetType() == wxT("list"))
+        @li a list variant (GetType() == "list")

         @li an integer representing the selected child element,
         @li an integer representing the selected child element,

-            or 0 if this object is selected (GetType() == wxT("long"))
+            or 0 if this object is selected (GetType() == "long")

         @li a "void*" pointer to a wxAccessible child object
     */
     virtual wxAccStatus GetSelections(wxVariant* selections);
         @li a "void*" pointer to a wxAccessible child object
     */
     virtual wxAccStatus GetSelections(wxVariant* selections);


@@ -401,9 +401,9 @@ public:
         Allows the application to send an event when something changes in
         an accessible object.
     */
         Allows the application to send an event when something changes in
         an accessible object.
     */

-    virtual static void NotifyEvent(int eventType, wxWindow* window,
-                                    wxAccObject objectType,
-                                    int objectType);
+    static void NotifyEvent(int eventType, wxWindow* window,
+                            wxAccObject objectType,
+                            int objectType);

 
     /**
         Selects the object or child. See wxAccSelectionFlags for a list
 
     /**
         Selects the object or child. See wxAccSelectionFlags for a list