Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/arrstr.h b/interface/wx/arrstr.h
index 46d3fed6b6bd0c97c75b12e1359699f3dc7a38e3..3708c54635b95b0c8df7f005db0f8e21f261ba90 100644 (file)
--- a/interface/wx/arrstr.h
+++ b/interface/wx/arrstr.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxArrayString
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxArrayString
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

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


@@ -279,10 +279,12 @@ class wxSortedArrayString : public wxArrayString
 public:
 
     /**
 public:
 
     /**

-        Copy constructor. Note that when an array is assigned to a sorted array,
-        its contents is automatically sorted during construction.
+        Conversion constructor.
+
+        Constructs a sorted array with the same contents as the (possibly
+        unsorted) "array" argument.

     */
     */

-    wxArrayString(const wxArrayString& array);
+    wxSortedArrayString(const wxArrayString& array);

 
     /**
         @copydoc wxArrayString::Add()
 
     /**
         @copydoc wxArrayString::Add()


@@ -308,6 +310,8 @@ public:
         @warning This function should not be used with sorted arrays because it
                  could break the order of items and, for example, subsequent calls
                  to Index() would then not work!
         @warning This function should not be used with sorted arrays because it
                  could break the order of items and, for example, subsequent calls
                  to Index() would then not work!

+
+        @warning In STL mode, Insert is private and simply invokes wxFAIL_MSG.

     */
     void Insert(const wxString& str, size_t nIndex,
                 size_t copies = 1);
     */
     void Insert(const wxString& str, size_t nIndex,
                 size_t copies = 1);


@@ -318,6 +322,8 @@ public:
                  break the order of items and, for example, subsequent calls to Index()
                  would then not work! Also, sorting a wxSortedArrayString doesn't make
                  sense because its elements are always already sorted.
                  break the order of items and, for example, subsequent calls to Index()
                  would then not work! Also, sorting a wxSortedArrayString doesn't make
                  sense because its elements are always already sorted.

+
+        @warning In STL mode, Sort is private and simply invokes wxFAIL_MSG.

     */
     void Sort(bool reverseOrder = false);
     void Sort(CompareFunction compareFunction);
     */
     void Sort(bool reverseOrder = false);
     void Sort(CompareFunction compareFunction);