Optionally set the window name in wxPersistentRegisterAndRestore().

[wxWidgets.git] / samples / widgets / itemcontainer.h

diff --git a/samples/widgets/itemcontainer.h b/samples/widgets/itemcontainer.h
index 8f25d70a176ab4d3927ea5ade46f4d52146a1890..f2ef6cb174b00ce74cb04d88a3d98b02d3c67cc1 100644 (file)
--- a/samples/widgets/itemcontainer.h
+++ b/samples/widgets/itemcontainer.h
@@ -12,20 +12,12 @@
 
 #include "widgets.h"
 
 
 #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,
 class ItemContainerWidgetsPage : public WidgetsPage
 {
 public:
     ItemContainerWidgetsPage(WidgetsBookCtrl *book,
                              wxImageList *image_list,

-                             char* icon[]);
+                             const char *const icon[]);

     virtual ~ItemContainerWidgetsPage();
 
     void OnButtonTestItemContainer(wxCommandEvent& event);
     virtual ~ItemContainerWidgetsPage();
 
     void OnButtonTestItemContainer(wxCommandEvent& event);


@@ -34,7 +26,7 @@ public:
 
 private:
     void StartTest(const wxString& label);
 
 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);
 
     // Track client data in wxItemContainer instances
     wxClientData* CreateClientData(int value);


@@ -45,7 +37,9 @@ private:
     bool VerifyAllClientDataDestroyed();
     bool VerifyClientData(wxUIntPtr i, const wxString& str);
 
     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;
 
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;