Applied patch [ 1117207 ] changed the test for SQL_C_WCHAR

[wxWidgets.git] / src / common / ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 9a7ec228e30ff3bf159bbafa4e9c1529d5cf58c3..cf913548e08ba71cc9b73aa6aa125d357e671d6c 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -58,6 +58,15 @@ wxString wxItemContainer::GetStringSelection() const
     return s;
 }
 
+wxArrayString wxItemContainer::GetStrings() const
+{
+    wxArrayString result ;
+    size_t count = GetCount() ;
+    for ( size_t n = 0 ; n < count ; n++ )
+        result.Add(GetString(n));
+    return result ;
+}
+
 // ----------------------------------------------------------------------------
 // appending items
 // ----------------------------------------------------------------------------
@@ -147,4 +156,13 @@ wxControlWithItems::~wxControlWithItems()
     // this destructor is required for Darwin
 }
 
+#if WXWIN_COMPATIBILITY_2_2
+
+int wxItemContainer::Number() const
+{
+    return GetCount();
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
 #endif // wxUSE_CONTROLS