X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1824493628261b2cb7ceceb431d85c427f1c976b..ef5390661e7e0122ecaab8eeafd9a221fed3f80b:/samples/listctrl/listtest.cpp diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index 6e4b55f5ee..47b336f58a 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -161,7 +161,7 @@ bool MyApp::OnInit(void) { char buf[20]; sprintf(buf, "Item %d", i); - long tmp = frame->m_listCtrl->InsertItem(i, buf); + frame->m_listCtrl->InsertItem(i, buf); } frame->CreateStatusBar(3); @@ -230,7 +230,7 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event)) { char buf[20]; sprintf(buf, "Item %d", i); - long tmp = m_listCtrl->InsertItem(i, buf); + m_listCtrl->InsertItem(i, buf); } } @@ -266,7 +266,7 @@ void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event)) for ( int i=0; i < 9; i++) { - long tmp = m_listCtrl->InsertItem(i, i); + m_listCtrl->InsertItem(i, i); } } @@ -282,7 +282,7 @@ void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event)) { char buf[20]; sprintf(buf, "Label %d", i); - long tmp = m_listCtrl->InsertItem(i, buf, i); + m_listCtrl->InsertItem(i, buf, i); } } @@ -296,7 +296,7 @@ void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event)) for ( int i=0; i < 9; i++) { - long tmp = m_listCtrl->InsertItem(i, 0); + m_listCtrl->InsertItem(i, 0); } } @@ -310,13 +310,13 @@ void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event)) for ( int i=0; i < 9; i++) { - long tmp = m_listCtrl->InsertItem(i, "Label", 0); + m_listCtrl->InsertItem(i, "Label", 0); } } // MyListCtrl -void MyListCtrl::OnBeginDrag(wxListEvent& event) +void MyListCtrl::OnBeginDrag(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -325,15 +325,10 @@ void MyListCtrl::OnBeginDrag(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnBeginDrag\n"; - str.flush(); -#endif + text->WriteText("OnBeginDrag\n"); } -void MyListCtrl::OnBeginRDrag(wxListEvent& event) +void MyListCtrl::OnBeginRDrag(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -341,15 +336,10 @@ void MyListCtrl::OnBeginRDrag(wxListEvent& event) wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow; if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnBeginRDrag\n"; - str.flush(); -#endif + text->WriteText("OnBeginRDrag\n"); } -void MyListCtrl::OnBeginLabelEdit(wxListEvent& event) +void MyListCtrl::OnBeginLabelEdit(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -358,15 +348,10 @@ void MyListCtrl::OnBeginLabelEdit(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnBeginLabelEdit\n"; - str.flush(); -#endif + text->WriteText("OnBeginLabelEdit\n"); } -void MyListCtrl::OnEndLabelEdit(wxListEvent& event) +void MyListCtrl::OnEndLabelEdit(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -375,15 +360,10 @@ void MyListCtrl::OnEndLabelEdit(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnEndLabelEdit\n"; - str.flush(); -#endif + text->WriteText("OnEndLabelEdit\n"); } -void MyListCtrl::OnDeleteItem(wxListEvent& event) +void MyListCtrl::OnDeleteItem(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -392,12 +372,7 @@ void MyListCtrl::OnDeleteItem(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnDeleteItem\n"; - str.flush(); -#endif + text->WriteText("OnDeleteItem\n"); } void MyListCtrl::OnGetInfo(wxListEvent& event) @@ -409,7 +384,9 @@ void MyListCtrl::OnGetInfo(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ + text->WriteText("OnGetInfo\n"); + +/* ostream str(text); str << "OnGetInfo (" << event.m_item.m_itemId << ", " << event.m_item.m_col << ")"; @@ -434,10 +411,10 @@ void MyListCtrl::OnGetInfo(wxListEvent& event) } str << "\n"; str.flush(); -#endif +*/ } -void MyListCtrl::OnSetInfo(wxListEvent& event) +void MyListCtrl::OnSetInfo(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -446,15 +423,10 @@ void MyListCtrl::OnSetInfo(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnSetInfo\n"; - str.flush(); -#endif + text->WriteText("OnSetInfo\n"); } -void MyListCtrl::OnSelected(wxListEvent& event) +void MyListCtrl::OnSelected(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -463,15 +435,10 @@ void MyListCtrl::OnSelected(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnSelected\n"; - str.flush(); -#endif + text->WriteText("OnSelected\n"); } -void MyListCtrl::OnDeselected(wxListEvent& event) +void MyListCtrl::OnDeselected(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -480,15 +447,10 @@ void MyListCtrl::OnDeselected(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnDeselected\n"; - str.flush(); -#endif + text->WriteText("OnDeselected\n"); } -void MyListCtrl::OnKeyDown(wxListEvent& event) +void MyListCtrl::OnKeyDown(wxListEvent& WXUNUSED(event)) { if ( !wxGetApp().GetTopWindow() ) return; @@ -497,11 +459,6 @@ void MyListCtrl::OnKeyDown(wxListEvent& event) if ( !text ) return; -#ifndef __GNUWIN32__ - ostream str(text); - - str << "OnKeyDown\n"; - str.flush(); -#endif + text->WriteText("OnKeyDown\n"); }