X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a367b9b3f8a722d6029e209070be11d120be0180..7e2c43b8551c394d790e416ae52a4476c759683e:/samples/listctrl/listtest.cpp

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 47b336f58a..7e3afcc677 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -25,6 +25,10 @@
 #include "wx/wx.h"
 #endif
 
+#ifndef __WXMSW__
+#include "mondrian.xpm"
+#endif
+
 #include "wx/listctrl.h"
 #include "listtest.h"
 
@@ -51,7 +55,8 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
 	EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo)
 	EVT_LIST_ITEM_SELECTED(LIST_CTRL, MyListCtrl::OnSelected)
 	EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected)
-	EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnKeyDown)
+	EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
+	EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
@@ -60,20 +65,15 @@ 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
   // frame is sent a background erase event.
-  frame->SetBackgroundColour(wxColour(255, 255, 255));
+  frame->SetBackgroundColour( *wxWHITE );
 
   // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#else
-#include "mondrian.xpm"
-  frame->SetIcon(wxIcon(mondrian_xpm));
-#endif
+  frame->SetIcon( wxICON(mondrian) );
 
   // Make an image list containing large icons
   m_imageListNormal = new wxImageList(32, 32, TRUE);
@@ -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);
@@ -375,7 +375,7 @@ void MyListCtrl::OnDeleteItem(wxListEvent& WXUNUSED(event))
         text->WriteText("OnDeleteItem\n");
 }
 
-void MyListCtrl::OnGetInfo(wxListEvent& event)
+void MyListCtrl::OnGetInfo(wxListEvent& /*event*/)
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -450,7 +450,7 @@ void MyListCtrl::OnDeselected(wxListEvent& WXUNUSED(event))
 	text->WriteText("OnDeselected\n");
 }
 
-void MyListCtrl::OnKeyDown(wxListEvent& WXUNUSED(event))
+void MyListCtrl::OnActivated(wxListEvent& WXUNUSED(event))
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -459,6 +459,19 @@ void MyListCtrl::OnKeyDown(wxListEvent& WXUNUSED(event))
 	if ( !text )
 		return;
 
-	text->WriteText("OnKeyDown\n");
+	text->WriteText("OnActivated\n");
 }
 
+void MyListCtrl::OnListKeyDown(wxListEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+	text->WriteText("OnListKeyDown\n");
+}
+
+