More tests for streams.

[wxWidgets.git] / samples / listctrl / listtest.cpp

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index d5578d2bee412875f946d14636accc8f7da80375..acdf26adfd559afc71fda3658f7ad6230e118fab 100644 (file)
--- 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);
        }
 
@@ -205,55 +205,62 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnDeselectAll(wxCommandEvent& WXUNUSED(event))
 {
    int n = m_listCtrl->GetItemCount();
-   int i;
-   for(i = 0; i < n; i++)
+   for (int i = 0; i < n; i++)
       m_listCtrl->SetItemState(i,0,wxLIST_STATE_SELECTED);
 }
 
 void MyFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
    int n = m_listCtrl->GetItemCount();
-   int i;
-   for(i = 0; i < n; i++)
+   for (int i = 0; i < n; i++)
       m_listCtrl->SetItemState(i,wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
 void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 {
-       m_listCtrl->DeleteAllItems();
-       m_logWindow->Clear();
-       m_listCtrl->SetSingleStyle(wxLC_LIST);
+    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);
-               m_listCtrl->InsertItem(i, buf);
-       }
+    for ( int i=0; i < 30; i++)
+    {
+       wxChar buf[20];
+       wxSprintf(buf, _T("Item %d"), i);
+       m_listCtrl->InsertItem(i, buf);
+    }
 }
 
 void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
 {
-       m_listCtrl->DeleteAllItems();
-       m_logWindow->Clear();
-       m_listCtrl->SetSingleStyle(wxLC_REPORT);
+    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);
 
-       m_listCtrl->InsertColumn(0, "Column 1", wxLIST_FORMAT_LEFT, 140);
-       m_listCtrl->InsertColumn(1, "Column 2", wxLIST_FORMAT_LEFT, 140);
-
-       for ( int i=0; i < 30; i++)
-       {
-               char buf[20];
-               sprintf(buf, "Item %d, col 1", i);
-               long tmp = m_listCtrl->InsertItem(i, buf, 0);
-
-               sprintf(buf, "Item %d, col 2", i);
-               tmp = m_listCtrl->SetItem(i, 1, buf);
-       }
+    m_listCtrl->InsertColumn(0, "Column 1"); // , wxLIST_FORMAT_LEFT, 140);
+    m_listCtrl->InsertColumn(1, "Column 2"); // , wxLIST_FORMAT_LEFT, 140);
+    m_listCtrl->InsertColumn(2, "One More Column (2)"); // , wxLIST_FORMAT_LEFT, 140);
+
+    for ( int i=0; i < 30; i++)
+    {
+       wxChar buf[50];
+       wxSprintf(buf, _T("This is item %d"), i);
+       long tmp = m_listCtrl->InsertItem(i, buf, 0);
+
+       wxSprintf(buf, _T("Col 1, item %d"), i);
+       tmp = m_listCtrl->SetItem(i, 1, buf);
+       
+       wxSprintf(buf, _T("Item %d in column 2"), i);
+       tmp = m_listCtrl->SetItem(i, 2, buf);
+    }
+    
+    m_listCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE );
+    m_listCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE );
+    m_listCtrl->SetColumnWidth( 2, wxLIST_AUTOSIZE );
 }
 
 void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
@@ -280,8 +287,8 @@ void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
 
        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);
        }
 }
@@ -462,7 +469,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;