X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64fa6f167ebb404e5441eddcee5bbd0808466d7a..89c831801467203372b6964a785823f19e8063dd:/src/common/ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 59a9c9832b..7f294c3f5d 100644
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "controlwithitems.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -36,10 +32,10 @@
 #endif
 
 // ============================================================================
-// implementation
+// wxItemContainerImmutable implementation
 // ============================================================================
 
-wxItemContainer::~wxItemContainer()
+wxItemContainerImmutable::~wxItemContainerImmutable()
 {
     // this destructor is required for Darwin
 }
@@ -48,7 +44,7 @@ wxItemContainer::~wxItemContainer()
 // selection
 // ----------------------------------------------------------------------------
 
-wxString wxItemContainer::GetStringSelection() const
+wxString wxItemContainerImmutable::GetStringSelection() const
 {
     wxString s;
     int sel = GetSelection();
@@ -58,24 +54,36 @@ wxString wxItemContainer::GetStringSelection() const
     return s;
 }
 
-bool wxItemContainer::SetStringSelection(const wxString& s)
+bool wxItemContainerImmutable::SetStringSelection(const wxString& s)
 {
     const int sel = FindString(s);
     if ( sel == wxNOT_FOUND )
         return false;
 
-    Select(sel);
+    SetSelection(sel);
 
     return true;
 }
 
-wxArrayString wxItemContainer::GetStrings() const
+wxArrayString wxItemContainerImmutable::GetStrings() const
 {
-    wxArrayString result ;
-    size_t count = GetCount() ;
-    for ( size_t n = 0 ; n < count ; n++ )
+    wxArrayString result;
+
+    const size_t count = GetCount();
+    result.Alloc(count);
+    for ( size_t n = 0; n < count; n++ )
         result.Add(GetString(n));
-    return result ;
+
+    return result;
+}
+
+// ============================================================================
+// wxItemContainer implementation
+// ============================================================================
+
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
 }
 
 // ----------------------------------------------------------------------------
@@ -167,13 +175,4 @@ 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