(ugly) compilation fix for wxUSE_STL==1 build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/itemcontainer.cpp b/samples/widgets/itemcontainer.cpp
index c46a738d08ec87dd3bb8cccabc505f26586858ed..b74f8fdcccd25175024b51179b46db169a44fdb0 100644 (file)
--- a/samples/widgets/itemcontainer.cpp
+++ b/samples/widgets/itemcontainer.cpp
@@ -121,7 +121,7 @@ void ItemContainerWidgetsPage::StartTest(const wxString& label)
     wxLogMessage(_T("Test - %s:"), label.c_str());
 }
 
     wxLogMessage(_T("Test - %s:"), label.c_str());
 }
 

-void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
+void ItemContainerWidgetsPage::EndTest(const wxMaybeSortedArrayString& items)

 {
     const unsigned count = m_container->GetCount();
 
 {
     const unsigned count = m_container->GetCount();
 


@@ -177,7 +177,7 @@ void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
 }
 
 wxString
 }
 
 wxString

-ItemContainerWidgetsPage::DumpContainerData(const wxArrayString& expected) const
+ItemContainerWidgetsPage::DumpContainerData(const wxMaybeSortedArrayString& expected) const

 {
     wxString str;
     str << _T("Current content:\n");
 {
     wxString str;
     str << _T("Current content:\n");


@@ -238,9 +238,9 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
                  GetWidget()->GetClassInfo()->GetClassName(),
                  (m_container->IsSorted() ? "Sorted" : "Unsorted"));
 
                  GetWidget()->GetClassInfo()->GetClassName(),
                  (m_container->IsSorted() ? "Sorted" : "Unsorted"));
 

-    const wxArrayString
-        & expected_result = m_container->IsSorted() ? m_itemsSorted
-                                                    : m_items;
+    const wxMaybeSortedArrayString&
+        expected_result = m_container->IsSorted() ? m_itemsSorted
+                                                   : m_items;

 
     StartTest(_T("Append one item"));
     wxString item = m_items[0];
 
     StartTest(_T("Append one item"));
     wxString item = m_items[0];

diff --git a/samples/widgets/itemcontainer.h b/samples/widgets/itemcontainer.h
index 30d79ec558b5299cd0d84508147cf9bee64296cc..baa1982bb8f02af1a8d81a1bda5d97dda42f8516 100644 (file)
--- a/samples/widgets/itemcontainer.h
+++ b/samples/widgets/itemcontainer.h
@@ -15,6 +15,14 @@
 
 #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:
 class ItemContainerWidgetsPage : public WidgetsPage
 {
 public:


@@ -29,7 +37,7 @@ public:
 
 private:
     void StartTest(const wxString& label);
 
 private:
     void StartTest(const wxString& label);

-    void EndTest(const wxArrayString& result);
+    void EndTest(const wxMaybeSortedArrayString& result);

 
     // Track client data in wxItemContainer instances
     wxClientData* CreateClientData(int value);
 
     // Track client data in wxItemContainer instances
     wxClientData* CreateClientData(int value);


@@ -40,7 +48,7 @@ private:
     bool VerifyAllClientDataDestroyed();
     bool VerifyClientData(wxUIntPtr i, const wxString& str);
 
     bool VerifyAllClientDataDestroyed();
     bool VerifyClientData(wxUIntPtr i, const wxString& str);
 

-    wxString DumpContainerData(const wxArrayString& expected) const;
+    wxString DumpContainerData(const wxMaybeSortedArrayString& expected) const;

 
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;
 
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;