make construct simpler

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

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 975812f8d44749c7b385f2105b83775082ca8722..03be03f3dc1cc17287d09e967425192fe5cef4bc 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "controlwithitems.h"
 #endif
 
     #pragma implementation "controlwithitems.h"
 #endif
 


@@ -32,6 +32,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"

+    #include "wx/arrstr.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -57,6 +58,15 @@ wxString wxItemContainer::GetStringSelection() const
     return s;
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // appending items
 // ----------------------------------------------------------------------------