X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d36417da1b3c2e5d2ad051b3c4603e96e0f7c2f..14619f10b0bdb630206607abd0ce0319d45e095a:/samples/widgets/itemcontainer.h

diff --git a/samples/widgets/itemcontainer.h b/samples/widgets/itemcontainer.h
index 8f25d70a17..06b1231da3 100644
--- a/samples/widgets/itemcontainer.h
+++ b/samples/widgets/itemcontainer.h
@@ -4,7 +4,7 @@
 // Purpose:     Part of the widgets sample showing wxComboBox
 // Created:     20.07.07
 // Id:          $Id$
-// License:     wxWindows license
+// License:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SAMPLE_WIDGETS_ITEMCONTAINER_H_
@@ -12,20 +12,12 @@
 
 #include "widgets.h"
 
-// define a common base class for sorted and normal string arrays
-#if wxUSE_STL
-    typedef wxBaseArrayStringBase wxMaybeSortedArrayString;
-#else
-    // in non-STL build wxSortedArrayString derives from wxArrayString
-    typedef wxArrayString wxMaybeSortedArrayString;
-#endif
-
 class ItemContainerWidgetsPage : public WidgetsPage
 {
 public:
     ItemContainerWidgetsPage(WidgetsBookCtrl *book,
                              wxImageList *image_list,
-                             char* icon[]);
+                             const char *const icon[]);
     virtual ~ItemContainerWidgetsPage();
 
     void OnButtonTestItemContainer(wxCommandEvent& event);
@@ -34,7 +26,7 @@ public:
 
 private:
     void StartTest(const wxString& label);
-    void EndTest(const wxMaybeSortedArrayString& result);
+    void EndTest(const wxArrayString& result);
 
     // Track client data in wxItemContainer instances
     wxClientData* CreateClientData(int value);
@@ -45,7 +37,9 @@ private:
     bool VerifyAllClientDataDestroyed();
     bool VerifyClientData(wxUIntPtr i, const wxString& str);
 
-    wxString DumpContainerData(const wxMaybeSortedArrayString& expected) const;
+    wxString DumpContainerData(const wxArrayString& expected) const;
+
+    static wxArrayString MakeArray(const wxSortedArrayString& sorted);
 
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;