X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..c4e2838090992384911a6a6aa44cac985d79a555:/samples/listctrl/listtest.cpp?ds=sidebyside diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index 3777ac5c16..11f2dab732 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -76,8 +76,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LIST_SHOW_SEL_INFO, MyFrame::OnShowSelInfo) EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze) EVT_MENU(LIST_THAW, MyFrame::OnThaw) + EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines) EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo) + EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) @@ -87,8 +89,10 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit) EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem) EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems) +#if WXWIN_COMPATIBILITY_2_4 EVT_LIST_GET_INFO(LIST_CTRL, MyListCtrl::OnGetInfo) EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo) +#endif EVT_LIST_ITEM_SELECTED(LIST_CTRL, MyListCtrl::OnSelected) EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected) EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown) @@ -114,11 +118,14 @@ static const int NUM_ITEMS = 30; // number of items in icon/small icon view static const int NUM_ICONS = 9; -int wxCALLBACK MyCompareFunction(long item1, long item2, long sortData) +int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData)) { // inverse the order - if (item1 < item2) return -1; - if (item1 > item2) return 1; + if (item1 < item2) + return -1; + if (item1 > item2) + return 1; + return 0; } @@ -129,16 +136,16 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"), 50, 50, 450, 340); // Show the frame - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } // My frame constructor MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) - : wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h)) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) { m_listCtrl = (MyListCtrl *) NULL; m_logWindow = (wxTextCtrl *) NULL; @@ -147,21 +154,21 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) SetIcon( wxICON(mondrian) ); // Make an image list containing large icons - m_imageListNormal = new wxImageList(32, 32, TRUE); - m_imageListSmall = new wxImageList(16, 16, TRUE); + m_imageListNormal = new wxImageList(32, 32, true); + m_imageListSmall = new wxImageList(16, 16, true); #ifdef __WXMSW__ - m_imageListNormal->Add( wxIcon("icon1", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon2", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon3", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon4", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon5", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon6", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon7", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon8", wxBITMAP_TYPE_ICO_RESOURCE) ); - m_imageListNormal->Add( wxIcon("icon9", wxBITMAP_TYPE_ICO_RESOURCE) ); - - m_imageListSmall->Add( wxIcon("iconsmall", wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon1"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon2"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon3"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon4"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon5"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon6"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon7"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon8"), wxBITMAP_TYPE_ICO_RESOURCE) ); + m_imageListNormal->Add( wxIcon(_T("icon9"), wxBITMAP_TYPE_ICO_RESOURCE) ); + + m_imageListSmall->Add( wxIcon(_T("iconsmall"), wxBITMAP_TYPE_ICO_RESOURCE) ); #else m_imageListNormal->Add( wxIcon( toolbrai_xpm ) ); @@ -211,8 +218,9 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) menuList->Append(LIST_FREEZE, _T("Free&ze\tCtrl-Z")); menuList->Append(LIST_THAW, _T("Tha&w\tCtrl-W")); menuList->AppendSeparator(); + menuList->AppendCheckItem(LIST_TOGGLE_LINES, _T("Toggle &lines\tCtrl-I")); menuList->Append(LIST_TOGGLE_MULTI_SEL, _T("&Multiple selection\tCtrl-M"), - _T("Toggle multiple selection"), TRUE); + _T("Toggle multiple selection"), true); wxMenu *menuCol = new wxMenu; menuCol->Append(LIST_SET_FG_COL, _T("&Foreground colour...")); @@ -225,8 +233,8 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) menubar->Append(menuCol, _T("&Colour")); SetMenuBar(menubar); - m_panel = new wxPanel(this, -1); - m_logWindow = new wxTextCtrl(m_panel, -1, wxEmptyString, + m_panel = new wxPanel(this, wxID_ANY); + m_logWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); @@ -234,7 +242,9 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL); +#if wxUSE_STATUSBAR CreateStatusBar(3); +#endif // wxUSE_STATUSBAR } MyFrame::~MyFrame() @@ -246,6 +256,13 @@ MyFrame::~MyFrame() } void MyFrame::OnSize(wxSizeEvent& event) +{ + DoSize(); + + event.Skip(); +} + +void MyFrame::DoSize() { if ( !m_logWindow ) return; @@ -254,13 +271,22 @@ void MyFrame::OnSize(wxSizeEvent& event) wxCoord y = (2*size.y)/3; m_listCtrl->SetSize(0, 0, size.x, y); m_logWindow->SetSize(0, y + 1, size.x, size.y - y); +} - event.Skip(); +bool MyFrame::CheckNonVirtual() const +{ + if ( !m_listCtrl->HasFlag(wxLC_VIRTUAL) ) + return true; + + // "this" == whatever + wxLogWarning(_T("Can't do this in virtual view, sorry.")); + + return false; } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -271,20 +297,25 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) dialog.ShowModal(); } -void MyFrame::OnFreeze(wxCommandEvent& event) +void MyFrame::OnFreeze(wxCommandEvent& WXUNUSED(event)) { wxLogMessage(_T("Freezing the control")); m_listCtrl->Freeze(); } -void MyFrame::OnThaw(wxCommandEvent& event) +void MyFrame::OnThaw(wxCommandEvent& WXUNUSED(event)) { wxLogMessage(_T("Thawing the control")); m_listCtrl->Thaw(); } +void MyFrame::OnToggleLines(wxCommandEvent& event) +{ + m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked()); +} + void MyFrame::OnFocusLast(wxCommandEvent& WXUNUSED(event)) { long index = m_listCtrl->GetItemCount() - 1; @@ -299,11 +330,14 @@ void MyFrame::OnFocusLast(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnToggleFirstSel(wxCommandEvent& WXUNUSED(event)) { - m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_listCtrl->SetItemState(0, (~m_listCtrl->GetItemState(0, wxLIST_STATE_SELECTED) ) & wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } void MyFrame::OnDeselectAll(wxCommandEvent& WXUNUSED(event)) { + if ( !CheckNonVirtual() ) + return; + int n = m_listCtrl->GetItemCount(); for (int i = 0; i < n; i++) m_listCtrl->SetItemState(i,0,wxLIST_STATE_SELECTED); @@ -311,6 +345,9 @@ void MyFrame::OnDeselectAll(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { + if ( !CheckNonVirtual() ) + return; + int n = m_listCtrl->GetItemCount(); for (int i = 0; i < n; i++) m_listCtrl->SetItemState(i,wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -347,7 +384,7 @@ void MyFrame::RecreateList(long flags, bool withText) break; case wxLC_SMALL_ICON: - InitWithIconItems(withText, TRUE); + InitWithIconItems(withText, true); break; case wxLC_REPORT: @@ -362,9 +399,7 @@ void MyFrame::RecreateList(long flags, bool withText) } } -#ifdef __WXMSW__ - SendSizeEvent(); -#endif + DoSize(); m_logWindow->Clear(); } @@ -391,23 +426,20 @@ void MyFrame::InitWithReportItems() { m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL); - // under MSW for SetColumnWidth() to work we need to create the items with - // images initially -#if 1 + // note that under MSW for SetColumnWidth() to work we need to create the + // items with images initially even if we specify dummy image id wxListItem itemCol; - itemCol.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE; - itemCol.m_text = _T("Column 1"); - itemCol.m_image = -1; + itemCol.SetText(_T("Column 1")); + itemCol.SetImage(-1); m_listCtrl->InsertColumn(0, itemCol); - itemCol.m_text = _T("Column 2"); + + itemCol.SetText(_T("Column 2")); + itemCol.SetAlign(wxLIST_FORMAT_CENTRE); m_listCtrl->InsertColumn(1, itemCol); - itemCol.m_text = _T("Column 3"); + + itemCol.SetText(_T("Column 3")); + itemCol.SetAlign(wxLIST_FORMAT_RIGHT); m_listCtrl->InsertColumn(2, itemCol); -#else - m_listCtrl->InsertColumn(0, _T("Column 1")); // , wxLIST_FORMAT_LEFT, 140); - m_listCtrl->InsertColumn(1, _T("Column 2")); // , wxLIST_FORMAT_LEFT, 140); - m_listCtrl->InsertColumn(2, _T("One More Column (2)")); // , wxLIST_FORMAT_LEFT, 140); -#endif // to speed up inserting we hide the control temporarily m_listCtrl->Hide(); @@ -469,7 +501,7 @@ void MyFrame::InitWithIconItems(bool withText, bool sameIcon) void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event)) { - RecreateList(wxLC_ICON, FALSE); + RecreateList(wxLC_ICON, false); } void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event)) @@ -479,7 +511,7 @@ void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event)) { - RecreateList(wxLC_SMALL_ICON, FALSE); + RecreateList(wxLC_SMALL_ICON, false); } void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event)) @@ -515,7 +547,7 @@ void MyFrame::OnSort(wxCommandEvent& WXUNUSED(event)) sw.Time())); } -void MyFrame::OnShowSelInfo(wxCommandEvent& event) +void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event)) { int selCount = m_listCtrl->GetSelectedItemCount(); wxLogMessage(_T("%d items selected:"), selCount); @@ -541,7 +573,7 @@ void MyFrame::OnShowSelInfo(wxCommandEvent& event) } } -void MyFrame::OnShowColInfo(wxCommandEvent& event) +void MyFrame::OnShowColInfo(wxCommandEvent& WXUNUSED(event)) { int count = m_listCtrl->GetColumnCount(); wxLogMessage(wxT("%d columns:"), count); @@ -571,6 +603,11 @@ void MyFrame::OnToggleMultiSel(wxCommandEvent& WXUNUSED(event)) RecreateList(flags); } +void MyFrame::OnUpdateToggleMultiSel(wxUpdateUIEvent& event) +{ + event.Check((m_listCtrl->GetWindowStyleFlag() & wxLC_SINGLE_SEL) == 0); +} + void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) { m_listCtrl->SetForegroundColour(wxGetColourFromUser(this)); @@ -619,10 +656,12 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event)) { wxStopWatch sw; + size_t itemCount = m_listCtrl->GetItemCount(); + m_listCtrl->DeleteAllItems(); m_logWindow->WriteText(wxString::Format(_T("Deleting %d items took %ld ms\n"), - m_listCtrl->GetItemCount(), + itemCount, sw.Time())); } @@ -658,6 +697,11 @@ void MyListCtrl::OnColRightClick(wxListEvent& event) SetColumnImage(col, -1); } + // Show popupmenu at position + wxMenu menu(wxT("Test")); + menu.Append(LIST_ABOUT, _T("&About")); + PopupMenu(&menu, event.GetPoint()); + wxLogMessage( wxT("OnColumnRightClick at %d."), event.GetColumn() ); } @@ -675,6 +719,13 @@ void MyListCtrl::LogColEvent(const wxListEvent& event, const wxChar *name) void MyListCtrl::OnColBeginDrag(wxListEvent& event) { LogColEvent( event, wxT("OnColBeginDrag") ); + + if ( event.GetColumn() == 0 ) + { + wxLogMessage(_T("Resizing this column shouldn't work.")); + + event.Veto(); + } } void MyListCtrl::OnColDragging(wxListEvent& event) @@ -709,7 +760,9 @@ void MyListCtrl::OnBeginLabelEdit(wxListEvent& event) void MyListCtrl::OnEndLabelEdit(wxListEvent& event) { - wxLogMessage( wxT("OnEndLabelEdit: %s"), event.m_item.m_text.c_str()); + wxLogMessage( wxT("OnEndLabelEdit: %s"), + event.IsEditCancelled() ? _T("[cancelled]") + : event.m_item.m_text.c_str()); } void MyListCtrl::OnDeleteItem(wxListEvent& event) @@ -722,6 +775,7 @@ void MyListCtrl::OnDeleteAllItems(wxListEvent& event) LogEvent(event, _T("OnDeleteAllItems")); } +#if WXWIN_COMPATIBILITY_2_4 void MyListCtrl::OnGetInfo(wxListEvent& event) { wxString msg; @@ -754,6 +808,7 @@ void MyListCtrl::OnSetInfo(wxListEvent& event) { LogEvent(event, _T("OnSetInfo")); } +#endif void MyListCtrl::OnSelected(wxListEvent& event) { @@ -902,7 +957,7 @@ wxString MyListCtrl::OnGetItemText(long item, long column) const return wxString::Format(_T("Column %ld of item %ld"), column, item); } -int MyListCtrl::OnGetItemImage(long item) const +int MyListCtrl::OnGetItemImage(long WXUNUSED(item)) const { return 0; }