fixing leopard configure for universal_binary when no minimal sys given

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

diff --git a/samples/widgets/itemcontainer.cpp b/samples/widgets/itemcontainer.cpp
index c46a738d08ec87dd3bb8cccabc505f26586858ed..ad3aea3a5d97bb3befae27ae2079bea039f0663e 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());
 }
 
-void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
+void ItemContainerWidgetsPage::EndTest(const wxMaybeSortedArrayString& items)
 {
     const unsigned count = m_container->GetCount();
 
@@ -177,7 +177,7 @@ void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
 }
 
 wxString
-ItemContainerWidgetsPage::DumpContainerData(const wxArrayString& expected) const
+ItemContainerWidgetsPage::DumpContainerData(const wxMaybeSortedArrayString& expected) const
 {
     wxString str;
     str << _T("Current content:\n");
@@ -238,9 +238,9 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
                  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];
@@ -253,7 +253,8 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
 
     StartTest(_T("Append some items with data objects"));
     wxClientData **objects = new wxClientData *[m_items.GetCount()];
-    for ( unsigned i = 0; i < m_items.GetCount(); ++i )
+    unsigned i;
+    for ( i = 0; i < m_items.GetCount(); ++i )
         objects[i] = CreateClientData(i);
     m_container->Append(m_items, objects);
     EndTest(expected_result);
@@ -261,19 +262,19 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
 
     StartTest(_T("Append some items with data"));
     void **data = new void *[m_items.GetCount()];
-    for ( unsigned i = 0; i < m_items.GetCount(); ++i )
+    for ( i = 0; i < m_items.GetCount(); ++i )
         data[i] = (void*)i;
     m_container->Append(m_items, data);
     EndTest(expected_result);
     delete[] data;
 
     StartTest(_T("Append some items with data, one by one"));
-    for ( unsigned i = 0; i < m_items.GetCount(); ++i )
+    for ( i = 0; i < m_items.GetCount(); ++i )
         m_container->Append(m_items[i], (void*)i);
     EndTest(expected_result);
 
     StartTest(_T("Append some items with data objects, one by one"));
-    for ( unsigned i = 0; i < m_items.GetCount(); ++i )
+    for ( i = 0; i < m_items.GetCount(); ++i )
         m_container->Append(m_items[i], CreateClientData(i));
     EndTest(expected_result);