X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/435fe83e747aba481a255bab37768038cf9a9e81..88ac883a0d005437c97a60d8195bd5e4719b1154:/samples/listctrl/listtest.cpp?ds=sidebyside

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 8f17b941d9..7e3afcc677 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -65,7 +65,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit(void)
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxListCtrl Test", 50, 50, 450, 340);
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxListCtrl Test", 50, 50, 450, 340);
 
   // This reduces flicker effects - even better would be to define OnEraseBackground
   // to do nothing. When the list control's scrollbars are show or hidden, the
@@ -159,8 +159,8 @@ bool MyApp::OnInit(void)
 
   for ( int i=0; i < 30; i++)
 	{
-		char buf[20];
-		sprintf(buf, "Item %d", i);
+		wxChar buf[20];
+		wxSprintf(buf, _T("Item %d"), i);
 		frame->m_listCtrl->InsertItem(i, buf);
 	}
 
@@ -220,24 +220,24 @@ void MyFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 {
-	m_logWindow->Clear();
 	m_listCtrl->DeleteAllItems();
+	m_logWindow->Clear();
 	m_listCtrl->SetSingleStyle(wxLC_LIST);
     m_listCtrl->SetImageList((wxImageList *) NULL, wxIMAGE_LIST_NORMAL);
     m_listCtrl->SetImageList((wxImageList *) NULL, wxIMAGE_LIST_SMALL);
 
 	for ( int i=0; i < 30; i++)
 	{
-		char buf[20];
-		sprintf(buf, "Item %d", i);
+		wxChar buf[20];
+		wxSprintf(buf, _T("Item %d"), i);
 		m_listCtrl->InsertItem(i, buf);
 	}
 }
 
 void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
 {
-	m_logWindow->Clear();
 	m_listCtrl->DeleteAllItems();
+	m_logWindow->Clear();
 	m_listCtrl->SetSingleStyle(wxLC_REPORT);
     m_listCtrl->SetImageList((wxImageList *) NULL, wxIMAGE_LIST_NORMAL);
     m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL);
@@ -247,19 +247,19 @@ void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
 
 	for ( int i=0; i < 30; i++)
 	{
-		char buf[20];
-		sprintf(buf, "Item %d, col 1", i);
+		wxChar buf[50];
+		wxSprintf(buf, _T("Item %d, col 1"), i);
 		long tmp = m_listCtrl->InsertItem(i, buf, 0);
 
-		sprintf(buf, "Item %d, col 2", i);
+		wxSprintf(buf, _T("Item %d, broad column 2"), i);
 		tmp = m_listCtrl->SetItem(i, 1, buf);
 	}
 }
 
 void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
 {
-	m_logWindow->Clear();
 	m_listCtrl->DeleteAllItems();
+	m_logWindow->Clear();
 	m_listCtrl->SetSingleStyle(wxLC_ICON);
     m_listCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL);
     m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL);
@@ -272,24 +272,24 @@ void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
 {
-	m_logWindow->Clear();
 	m_listCtrl->DeleteAllItems();
+	m_logWindow->Clear();
 	m_listCtrl->SetSingleStyle(wxLC_ICON);
     m_listCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL);
     m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL);
 
 	for ( int i=0; i < 9; i++)
 	{
-		char buf[20];
-		sprintf(buf, "Label %d", i);
+		wxChar buf[20];
+		wxSprintf(buf, _T("Label %d"), i);
 		m_listCtrl->InsertItem(i, buf, i);
 	}
 }
 
 void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event))
 {
-	m_logWindow->Clear();
 	m_listCtrl->DeleteAllItems();
+	m_logWindow->Clear();
 	m_listCtrl->SetSingleStyle(wxLC_SMALL_ICON);
     m_listCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL);
     m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL);
@@ -302,8 +302,8 @@ void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event))
 {
-	m_logWindow->Clear();
 	m_listCtrl->DeleteAllItems();
+	m_logWindow->Clear();
 	m_listCtrl->SetSingleStyle(wxLC_SMALL_ICON);
     m_listCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL);
     m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL);
@@ -462,7 +462,7 @@ void MyListCtrl::OnActivated(wxListEvent& WXUNUSED(event))
 	text->WriteText("OnActivated\n");
 }
 
-void MyListCtrl::OnListKeyDown(wxListEvent& WXUNUSED(event))
+void MyListCtrl::OnListKeyDown(wxListEvent& event)
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;