X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2936eaf046b87eaf707c728a06abc20581fb0043..6ba5438dda164146bf36ca729f8328332fae36b7:/samples/listctrl/listtest.cpp?ds=inline diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index 9d81a24486..bfef9f62ab 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 ///////////////////////////////////////////////////////////////////////////// @@ -25,9 +25,11 @@ #include "wx/wx.h" #endif -#ifndef __WXMSW__ +#if !defined(__WXMSW__) && !defined(__WXPM__) #include "mondrian.xpm" +#endif +#ifndef __WXMSW__ #include "bitmaps/toolbrai.xpm" #include "bitmaps/toolchar.xpm" #include "bitmaps/tooldata.xpm" @@ -47,6 +49,21 @@ #include "listtest.h" +const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] = +{ + { _T("Cat"), _T("meow") }, + { _T("Cow"), _T("moo") }, + { _T("Crow"), _T("caw") }, + { _T("Dog"), _T("woof") }, + { _T("Duck"), _T("quack") }, + { _T("Mouse"), _T("squeak") }, + { _T("Owl"), _T("hoo") }, + { _T("Pig"), _T("oink") }, + { _T("Pigeon"), _T("coo") }, + { _T("Sheep"), _T("baaah") }, +}; + + BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_SIZE(MyFrame::OnSize) @@ -59,6 +76,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LIST_SMALL_ICON_VIEW, MyFrame::OnSmallIconView) EVT_MENU(LIST_SMALL_ICON_TEXT_VIEW, MyFrame::OnSmallIconTextView) EVT_MENU(LIST_VIRTUAL_VIEW, MyFrame::OnVirtualView) + EVT_MENU(LIST_SMALL_VIRTUAL_VIEW, MyFrame::OnSmallVirtualView) EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast) EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel) @@ -76,8 +94,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 +107,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,10 +136,15 @@ 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 - return item1 < item2; + if (item1 < item2) + return -1; + if (item1 > item2) + return 1; + + return 0; } // `Main program' equivalent, creating windows and returning main app frame @@ -127,39 +154,40 @@ 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(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) { - m_listCtrl = (MyListCtrl *) NULL; - m_logWindow = (wxTextCtrl *) NULL; + m_listCtrl = NULL; + m_logWindow = NULL; + m_smallVirtual = false; // Give it an icon 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 ) ); @@ -188,7 +216,8 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) menuView->Append(LIST_ICON_TEXT_VIEW, _T("Icon view with &text\tF4")); menuView->Append(LIST_SMALL_ICON_VIEW, _T("&Small icon view\tF5")); menuView->Append(LIST_SMALL_ICON_TEXT_VIEW, _T("Small icon &view with text\tF6")); - menuView->Append(LIST_VIRTUAL_VIEW, _T("Virtual view\tF7")); + menuView->Append(LIST_VIRTUAL_VIEW, _T("&Virtual view\tF7")); + menuView->Append(LIST_SMALL_VIRTUAL_VIEW, _T("Small virtual vie&w\tF8")); wxMenu *menuList = new wxMenu; menuList->Append(LIST_FOCUS_LAST, _T("&Make last item current\tCtrl-L")); @@ -209,8 +238,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...")); @@ -223,7 +253,8 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h) menubar->Append(menuCol, _T("&Colour")); SetMenuBar(menubar); - m_logWindow = new wxTextCtrl(this, -1, wxEmptyString, + m_panel = new wxPanel(this, wxID_ANY); + m_logWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); @@ -231,7 +262,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() @@ -243,6 +276,13 @@ MyFrame::~MyFrame() } void MyFrame::OnSize(wxSizeEvent& event) +{ + DoSize(); + + event.Skip(); +} + +void MyFrame::DoSize() { if ( !m_logWindow ) return; @@ -251,13 +291,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)) @@ -268,20 +317,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; @@ -296,11 +350,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); @@ -308,6 +365,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); @@ -328,7 +388,7 @@ void MyFrame::RecreateList(long flags, bool withText) { delete m_listCtrl; - m_listCtrl = new MyListCtrl(this, LIST_CTRL, + m_listCtrl = new MyListCtrl(m_panel, LIST_CTRL, wxDefaultPosition, wxDefaultSize, flags | wxSUNKEN_BORDER | wxLC_EDIT_LABELS); @@ -344,7 +404,7 @@ void MyFrame::RecreateList(long flags, bool withText) break; case wxLC_SMALL_ICON: - InitWithIconItems(withText, TRUE); + InitWithIconItems(withText, true); break; case wxLC_REPORT: @@ -359,9 +419,7 @@ void MyFrame::RecreateList(long flags, bool withText) } } -#ifdef __WXMSW__ - SendSizeEvent(); -#endif + DoSize(); m_logWindow->Clear(); } @@ -388,23 +446,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(); @@ -441,6 +496,9 @@ void MyFrame::InitWithReportItems() m_listCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE ); m_listCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE ); m_listCtrl->SetColumnWidth( 2, wxLIST_AUTOSIZE ); + + // test SetItemFont too + m_listCtrl->SetItemFont(0, *wxITALIC_FONT); } void MyFrame::InitWithIconItems(bool withText, bool sameIcon) @@ -466,7 +524,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)) @@ -476,7 +534,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)) @@ -486,6 +544,13 @@ void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnVirtualView(wxCommandEvent& WXUNUSED(event)) { + m_smallVirtual = false; + RecreateList(wxLC_REPORT | wxLC_VIRTUAL); +} + +void MyFrame::OnSmallVirtualView(wxCommandEvent& WXUNUSED(event)) +{ + m_smallVirtual = true; RecreateList(wxLC_REPORT | wxLC_VIRTUAL); } @@ -493,12 +558,20 @@ void MyFrame::InitWithVirtualItems() { m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL); - m_listCtrl->InsertColumn(0, _T("First Column")); - m_listCtrl->InsertColumn(1, _T("Second Column")); - m_listCtrl->SetColumnWidth(0, 150); - m_listCtrl->SetColumnWidth(1, 150); - - m_listCtrl->SetItemCount(1000000); + if ( m_smallVirtual ) + { + m_listCtrl->InsertColumn(0, _T("Animal")); + m_listCtrl->InsertColumn(1, _T("Sound")); + m_listCtrl->SetItemCount(WXSIZEOF(SMALL_VIRTUAL_VIEW_ITEMS)); + } + else + { + m_listCtrl->InsertColumn(0, _T("First Column")); + m_listCtrl->InsertColumn(1, _T("Second Column")); + m_listCtrl->SetColumnWidth(0, 150); + m_listCtrl->SetColumnWidth(1, 150); + m_listCtrl->SetItemCount(1000000); + } } void MyFrame::OnSort(wxCommandEvent& WXUNUSED(event)) @@ -512,7 +585,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); @@ -538,7 +611,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); @@ -568,6 +641,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)); @@ -616,10 +694,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())); } @@ -642,7 +722,11 @@ void MyListCtrl::SetColumnImage(int col, int image) void MyListCtrl::OnColClick(wxListEvent& event) { int col = event.GetColumn(); - SetColumnImage(col, 0); + + // set or unset image + static bool x = false; + x = !x; + SetColumnImage(col, x ? 0 : -1); wxLogMessage( wxT("OnColumnClick at %d."), col ); } @@ -655,22 +739,45 @@ 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() ); } +void MyListCtrl::LogColEvent(const wxListEvent& event, const wxChar *name) +{ + const int col = event.GetColumn(); + + wxLogMessage(wxT("%s: column %d (width = %d or %d)."), + name, + col, + event.GetItem().GetWidth(), + GetColumnWidth(col)); +} + void MyListCtrl::OnColBeginDrag(wxListEvent& event) { - wxLogMessage( wxT("OnColBeginDrag: column %d."), event.GetColumn() ); + LogColEvent( event, wxT("OnColBeginDrag") ); + + if ( event.GetColumn() == 0 ) + { + wxLogMessage(_T("Resizing this column shouldn't work.")); + + event.Veto(); + } } void MyListCtrl::OnColDragging(wxListEvent& event) { - wxLogMessage( wxT("OnColDragging: column %d."), event.GetColumn() ); + LogColEvent( event, wxT("OnColDragging") ); } void MyListCtrl::OnColEndDrag(wxListEvent& event) { - wxLogMessage( wxT("OnColEndDrag: column %d."), event.GetColumn() ); + LogColEvent( event, wxT("OnColEndDrag") ); } void MyListCtrl::OnBeginDrag(wxListEvent& event) @@ -695,7 +802,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) @@ -708,6 +817,7 @@ void MyListCtrl::OnDeleteAllItems(wxListEvent& event) LogEvent(event, _T("OnDeleteAllItems")); } +#if WXWIN_COMPATIBILITY_2_4 void MyListCtrl::OnGetInfo(wxListEvent& event) { wxString msg; @@ -740,6 +850,7 @@ void MyListCtrl::OnSetInfo(wxListEvent& event) { LogEvent(event, _T("OnSetInfo")); } +#endif void MyListCtrl::OnSelected(wxListEvent& event) { @@ -782,6 +893,8 @@ void MyListCtrl::OnFocused(wxListEvent& event) void MyListCtrl::OnListKeyDown(wxListEvent& event) { + long item; + switch ( event.GetKeyCode() ) { case 'c': // colorize @@ -805,35 +918,45 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) case 'n': // next case 'N': + item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); + if ( item++ == GetItemCount() - 1 ) + { + item = 0; + } + + wxLogMessage(_T("Focusing item %ld"), item); + + SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + EnsureVisible(item); + break; + + case 'r': // show bounding Rect + case 'R': { - long item = GetNextItem(-1, - wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - if ( item++ == GetItemCount() - 1 ) + item = event.GetIndex(); + wxRect r; + if ( !GetItemRect(item, r) ) { - item = 0; + wxLogError(_T("Failed to retrieve rect of item %ld"), item); + break; } - wxLogMessage(_T("Focusing item %ld"), item); - - SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - EnsureVisible(item); + wxLogMessage(_T("Bounding rect of item %ld is (%d, %d)-(%d, %d)"), + item, r.x, r.y, r.x + r.width, r.y + r.height); } break; case WXK_DELETE: + item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + while ( item != -1 ) { - long item = GetNextItem(-1, - wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - while ( item != -1 ) - { - DeleteItem(item); + DeleteItem(item); - wxLogMessage(_T("Item %ld deleted"), item); + wxLogMessage(_T("Item %ld deleted"), item); - // -1 because the indices were shifted by DeleteItem() - item = GetNextItem(item - 1, - wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - } + // -1 because the indices were shifted by DeleteItem() + item = GetNextItem(item - 1, + wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } break; @@ -885,10 +1008,17 @@ void MyListCtrl::LogEvent(const wxListEvent& event, const wxChar *eventName) wxString MyListCtrl::OnGetItemText(long item, long column) const { - return wxString::Format(_T("Column %ld of item %ld"), column, item); + if ( GetItemCount() == WXSIZEOF(SMALL_VIRTUAL_VIEW_ITEMS) ) + { + return SMALL_VIRTUAL_VIEW_ITEMS[item][column]; + } + else + { + 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; } @@ -911,4 +1041,3 @@ void MyListCtrl::InsertItemInReportView(int i) buf.Printf(_T("Item %d in column 2"), i); SetItem(i, 2, buf); } -