new makefiles (part I)

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

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 8f17b941d904892a25fefc2f521dee38b439155c..7e3afcc677042961eb439524d17ee077e04a2eb7 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
 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
 
   // 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++)
        {
 
   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);
        }
 
                frame->m_listCtrl->InsertItem(i, buf);
        }
 


@@ -220,24 +220,24 @@ void MyFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 {

-       m_logWindow->Clear();

        m_listCtrl->DeleteAllItems();
        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++)
        {
        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_listCtrl->InsertItem(i, buf);
        }
 }
 
 void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
 {

-       m_logWindow->Clear();

        m_listCtrl->DeleteAllItems();
        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->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++)
        {
 
        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);
 
                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))
 {
                tmp = m_listCtrl->SetItem(i, 1, buf);
        }
 }
 
 void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
 {

-       m_logWindow->Clear();

        m_listCtrl->DeleteAllItems();
        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);
        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))
 {
 
 void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
 {

-       m_logWindow->Clear();

        m_listCtrl->DeleteAllItems();
        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++)
        {
        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_listCtrl->InsertItem(i, buf, i);
        }
 }
 
 void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event))
 {

-       m_logWindow->Clear();

        m_listCtrl->DeleteAllItems();
        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);
        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))
 {
 
 void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event))
 {

-       m_logWindow->Clear();

        m_listCtrl->DeleteAllItems();
        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);
        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");
 }
 
        text->WriteText("OnActivated\n");
 }
 

-void MyListCtrl::OnListKeyDown(wxListEvent& WXUNUSED(event))
+void MyListCtrl::OnListKeyDown(wxListEvent& event)

 {
        if ( !wxGetApp().GetTopWindow() )
                return;
 {
        if ( !wxGetApp().GetTopWindow() )
                return;