X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1daf25293569ffc68e4afb26338fba4bc29cff4..8cd8a7feb72a8f45d5cb4d5f51fca7e73291d2b5:/samples/widgets/itemcontainer.cpp

diff --git a/samples/widgets/itemcontainer.cpp b/samples/widgets/itemcontainer.cpp
index b74f8fdccc..8085d5e230 100644
--- a/samples/widgets/itemcontainer.cpp
+++ b/samples/widgets/itemcontainer.cpp
@@ -68,7 +68,7 @@ private:
 
 ItemContainerWidgetsPage::ItemContainerWidgetsPage(WidgetsBookCtrl *book,
                                                    wxImageList *image_list,
-                                                   char* icon[])
+                                                   const char *const icon[])
 : WidgetsPage(book, image_list, icon), m_trackedDataObjects(0)
 {
     m_items.Add(_T("This"));
@@ -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);