X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2458daa72859a8307ab18a18b38b9da6c13a8d7d..e8b90482676205a0fc997be9fcdc47ef62a37211:/samples/listctrl/listtest.cpp diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index b4252ebb22..bbf8ea7207 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -43,9 +43,15 @@ #include "wx/colordlg.h" // for wxGetColourFromUser #include "wx/settings.h" #include "wx/sysopt.h" +#include "wx/numdlg.h" #include "listtest.h" + +// ---------------------------------------------------------------------------- +// Constants and globals +// ---------------------------------------------------------------------------- + const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] = { { _T("Cat"), _T("meow") }, @@ -60,6 +66,50 @@ const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] = { _T("Sheep"), _T("baaah") }, }; +// number of items in icon/small icon view +static const int NUM_ICONS = 9; + +int wxCALLBACK +MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData)) +{ + // inverse the order + if (item1 < item2) + return -1; + if (item1 > item2) + return 1; + + return 0; +} + + +// ---------------------------------------------------------------------------- +// MyApp +// ---------------------------------------------------------------------------- + +IMPLEMENT_APP(MyApp) + +// `Main program' equivalent, creating windows and returning main app frame +bool MyApp::OnInit() +{ + if ( !wxApp::OnInit() ) + return false; + + // Create the main frame window + MyFrame *frame = new MyFrame(wxT("wxListCtrl Test")); + + // Show the frame + frame->Show(true); + + SetTopWindow(frame); + + return true; +} + + + +// ---------------------------------------------------------------------------- +// MyFrame +// ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_SIZE(MyFrame::OnSize) @@ -75,6 +125,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LIST_VIRTUAL_VIEW, MyFrame::OnVirtualView) EVT_MENU(LIST_SMALL_VIRTUAL_VIEW, MyFrame::OnSmallVirtualView) + EVT_MENU(LIST_SET_ITEMS_COUNT, MyFrame::OnSetItemsCount) + + EVT_MENU(LIST_GOTO, MyFrame::OnGoTo) EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast) EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel) EVT_MENU(LIST_DESELECT_ALL, MyFrame::OnDeselectAll) @@ -89,91 +142,31 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LIST_TOGGLE_MULTI_SEL, MyFrame::OnToggleMultiSel) EVT_MENU(LIST_SHOW_COL_INFO, MyFrame::OnShowColInfo) EVT_MENU(LIST_SHOW_SEL_INFO, MyFrame::OnShowSelInfo) + EVT_MENU(LIST_SHOW_VIEW_RECT, MyFrame::OnShowViewRect) +#ifdef wxHAS_LISTCTRL_COLUMN_ORDER + EVT_MENU(LIST_SET_COL_ORDER, MyFrame::OnSetColOrder) + EVT_MENU(LIST_GET_COL_ORDER, MyFrame::OnGetColOrder) +#endif // wxHAS_LISTCTRL_COLUMN_ORDER EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze) EVT_MENU(LIST_THAW, MyFrame::OnThaw) EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines) +#ifdef __WXOSX__ EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric) +#endif // __WXOSX__ + EVT_MENU(LIST_FIND, MyFrame::OnFind) 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) - EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag) - EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag) - EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit) - 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) - EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated) - EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused) - - EVT_LIST_COL_CLICK(LIST_CTRL, MyListCtrl::OnColClick) - EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick) - EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag) - EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging) - EVT_LIST_COL_END_DRAG(LIST_CTRL, MyListCtrl::OnColEndDrag) - - EVT_LIST_CACHE_HINT(LIST_CTRL, MyListCtrl::OnCacheHint) - -#if USE_CONTEXT_MENU - EVT_CONTEXT_MENU(MyListCtrl::OnContextMenu) -#endif - EVT_CHAR(MyListCtrl::OnChar) - - EVT_RIGHT_DOWN(MyListCtrl::OnRightClick) -END_EVENT_TABLE() - -IMPLEMENT_APP(MyApp) - -// number of items in list/report view -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 WXUNUSED(sortData)) -{ - // inverse the order - if (item1 < item2) - return -1; - if (item1 > item2) - return 1; - - return 0; -} - -// `Main program' equivalent, creating windows and returning main app frame -bool MyApp::OnInit() -{ - // Create the main frame window - MyFrame *frame = new MyFrame(wxT("wxListCtrl Test")); - - // Show the frame - frame->Show(true); - - SetTopWindow(frame); - - return true; -} - // My frame constructor MyFrame::MyFrame(const wxChar *title) - : wxFrame(NULL, wxID_ANY, title) + : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(600, 500)) { m_listCtrl = NULL; m_logWindow = NULL; m_smallVirtual = false; - - if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_SMALL) - SetSize(wxSize(450, 340)); + m_numListItems = 10; // Give it an icon SetIcon( wxICON(mondrian) ); @@ -224,11 +217,15 @@ MyFrame::MyFrame(const wxChar *title) 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_SMALL_VIRTUAL_VIEW, _T("Small virtual vie&w\tF8")); -#ifdef __WXMAC__ + menuView->AppendSeparator(); + menuView->Append(LIST_SET_ITEMS_COUNT, "Set &number of items"); +#ifdef __WXOSX__ + menuView->AppendSeparator(); menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control")); #endif wxMenu *menuList = new wxMenu; + menuList->Append(LIST_GOTO, _T("&Go to item #3\tCtrl-3")); menuList->Append(LIST_FOCUS_LAST, _T("&Make last item current\tCtrl-L")); menuList->Append(LIST_TOGGLE_FIRST, _T("To&ggle first item\tCtrl-G")); menuList->Append(LIST_DESELECT_ALL, _T("&Deselect All\tCtrl-D")); @@ -236,8 +233,14 @@ MyFrame::MyFrame(const wxChar *title) menuList->AppendSeparator(); menuList->Append(LIST_SHOW_COL_INFO, _T("Show &column info\tCtrl-C")); menuList->Append(LIST_SHOW_SEL_INFO, _T("Show &selected items\tCtrl-S")); + menuList->Append(LIST_SHOW_VIEW_RECT, _T("Show &view rect")); +#ifdef wxHAS_LISTCTRL_COLUMN_ORDER + menuList->Append(LIST_SET_COL_ORDER, _T("Se&t columns order\tShift-Ctrl-O")); + menuList->Append(LIST_GET_COL_ORDER, _T("Sho&w columns order\tCtrl-O")); +#endif // wxHAS_LISTCTRL_COLUMN_ORDER menuList->AppendSeparator(); - menuList->Append(LIST_SORT, _T("&Sort\tCtrl-S")); + menuList->Append(LIST_SORT, _T("Sor&t\tCtrl-T")); + menuList->Append(LIST_FIND, "Test Find() performance"); menuList->AppendSeparator(); menuList->Append(LIST_ADD, _T("&Append an item\tCtrl-P")); menuList->Append(LIST_EDIT, _T("&Edit the item\tCtrl-E")); @@ -265,14 +268,20 @@ MyFrame::MyFrame(const wxChar *title) m_panel = new wxPanel(this, wxID_ANY); m_logWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxTE_MULTILINE | wxSUNKEN_BORDER); + wxTE_READONLY | wxTE_MULTILINE | wxSUNKEN_BORDER); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_logWindow)); RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL); +#ifdef __WXMSW__ + // this is useful to know specially when debugging :) + wxLogMessage("Your version of comctl32.dll is: %d", + wxApp::GetComCtl32Version()); +#endif + #if wxUSE_STATUSBAR - CreateStatusBar(3); + CreateStatusBar(); #endif // wxUSE_STATUSBAR } @@ -299,7 +308,7 @@ void MyFrame::DoSize() wxSize size = GetClientSize(); 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); + m_logWindow->SetSize(0, y + 1, size.x, size.y - y -1); } bool MyFrame::CheckNonVirtual() const @@ -345,11 +354,27 @@ void MyFrame::OnToggleLines(wxCommandEvent& event) m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked()); } +#ifdef __WXOSX__ + void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event) { wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked()); } +#endif // __WXOSX__ + +void MyFrame::OnGoTo(wxCommandEvent& WXUNUSED(event)) +{ + long index = 3; + m_listCtrl->SetItemState(index, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + + long sel = m_listCtrl->GetNextItem(-1, wxLIST_NEXT_ALL, + wxLIST_STATE_SELECTED); + if ( sel != -1 ) + m_listCtrl->SetItemState(sel, 0, wxLIST_STATE_SELECTED); + m_listCtrl->SetItemState(index, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); +} + void MyFrame::OnFocusLast(wxCommandEvent& WXUNUSED(event)) { long index = m_listCtrl->GetItemCount() - 1; @@ -405,7 +430,7 @@ void MyFrame::RecreateList(long flags, bool withText) m_listCtrl = new MyListCtrl(m_panel, LIST_CTRL, wxDefaultPosition, wxDefaultSize, flags | - wxSUNKEN_BORDER | wxLC_EDIT_LABELS); + wxBORDER_THEME | wxLC_EDIT_LABELS); switch ( flags & wxLC_MASK_TYPE ) { @@ -445,7 +470,7 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event)) void MyFrame::InitWithListItems() { - for ( int i = 0; i < NUM_ITEMS; i++ ) + for ( int i = 0; i < m_numListItems; i++ ) { m_listCtrl->InsertItem(i, wxString::Format(_T("Item %d"), i)); } @@ -480,13 +505,13 @@ void MyFrame::InitWithReportItems() wxStopWatch sw; - for ( int i = 0; i < NUM_ITEMS; i++ ) + for ( int i = 0; i < m_numListItems; i++ ) { m_listCtrl->InsertItemInReportView(i); } m_logWindow->WriteText(wxString::Format(_T("%d items inserted in %ldms\n"), - NUM_ITEMS, sw.Time())); + m_numListItems, sw.Time())); m_listCtrl->Show(); // we leave all mask fields to 0 and only change the colour @@ -576,6 +601,31 @@ void MyFrame::OnSmallVirtualView(wxCommandEvent& WXUNUSED(event)) RecreateList(wxLC_REPORT | wxLC_VIRTUAL); } +void MyFrame::OnSetItemsCount(wxCommandEvent& WXUNUSED(event)) +{ + int numItems = wxGetNumberFromUser + ( + "Enter the initial number of items for " + "the list and report views", + "Number of items:", + "wxWidgets wxListCtrl sample", + m_numListItems, + 0, + 10000, + this + ); + if ( numItems == -1 || numItems == m_numListItems ) + return; + + m_numListItems = numItems; + + if ( m_listCtrl->HasFlag(wxLC_REPORT) && + !m_listCtrl->HasFlag(wxLC_VIRTUAL) ) + RecreateList(wxLC_REPORT); + else if ( m_listCtrl->HasFlag(wxLC_LIST) ) + RecreateList(wxLC_LIST); +} + void MyFrame::InitWithVirtualItems() { m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL); @@ -607,6 +657,18 @@ void MyFrame::OnSort(wxCommandEvent& WXUNUSED(event)) sw.Time())); } +void MyFrame::OnFind(wxCommandEvent& WXUNUSED(event)) +{ + wxStopWatch sw; + + const int itemCount = m_listCtrl->GetItemCount(); + for ( int i = 0; i < itemCount; i++ ) + m_listCtrl->FindItem(-1, i); + + wxLogMessage("Calling Find() for all %d items took %ld ms", + itemCount, sw.Time()); +} + void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event)) { int selCount = m_listCtrl->GetSelectedItemCount(); @@ -633,6 +695,76 @@ void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnShowViewRect(wxCommandEvent& WXUNUSED(event)) +{ + const wxRect r = m_listCtrl->GetViewRect(); + wxLogMessage("View rect: (%d, %d)-(%d, %d)", + r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom()); +} + +// ---------------------------------------------------------------------------- +// column order tests +// ---------------------------------------------------------------------------- + +#ifdef wxHAS_LISTCTRL_COLUMN_ORDER + +static wxString DumpIntArray(const wxArrayInt& a) +{ + wxString s("{ "); + const size_t count = a.size(); + for ( size_t n = 0; n < count; n++ ) + { + if ( n ) + s += ", "; + s += wxString::Format("%lu", (unsigned long)a[n]); + } + + s += " }"; + + return s; +} + +void MyFrame::OnSetColOrder(wxCommandEvent& WXUNUSED(event)) +{ + wxArrayInt order(3); + order[0] = 2; + order[1] = 0; + order[2] = 1; + if ( m_listCtrl->SetColumnsOrder(order) ) + wxLogMessage("Column order set to %s", DumpIntArray(order)); +} + +void MyFrame::OnGetColOrder(wxCommandEvent& WXUNUSED(event)) +{ + // show what GetColumnsOrder() returns + const wxArrayInt order = m_listCtrl->GetColumnsOrder(); + wxString msg = "Columns order: " + + DumpIntArray(m_listCtrl->GetColumnsOrder()) + "\n"; + + int n; + const int count = m_listCtrl->GetColumnCount(); + + // show the results of GetColumnOrder() for each column + msg += "GetColumnOrder() results:\n"; + for ( n = 0; n < count; n++ ) + { + msg += wxString::Format(" %2d -> %2d\n", + n, m_listCtrl->GetColumnOrder(n)); + } + + // and the results of GetColumnIndexFromOrder() too + msg += "GetColumnIndexFromOrder() results:\n"; + for ( n = 0; n < count; n++ ) + { + msg += wxString::Format(" %2d -> %2d\n", + n, m_listCtrl->GetColumnIndexFromOrder(n)); + } + + wxLogMessage("%s", msg); +} + +#endif // wxHAS_LISTCTRL_COLUMN_ORDER + void MyFrame::OnShowColInfo(wxCommandEvent& WXUNUSED(event)) { int count = m_listCtrl->GetColumnCount(); @@ -725,7 +857,39 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event)) sw.Time())); } + +// ---------------------------------------------------------------------------- // MyListCtrl +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) + EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag) + EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag) + EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit) + 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) + EVT_LIST_ITEM_SELECTED(LIST_CTRL, MyListCtrl::OnSelected) + EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected) + EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown) + EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated) + EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused) + + EVT_LIST_COL_CLICK(LIST_CTRL, MyListCtrl::OnColClick) + EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick) + EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag) + EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging) + EVT_LIST_COL_END_DRAG(LIST_CTRL, MyListCtrl::OnColEndDrag) + + EVT_LIST_CACHE_HINT(LIST_CTRL, MyListCtrl::OnCacheHint) + +#if USE_CONTEXT_MENU + EVT_CONTEXT_MENU(MyListCtrl::OnContextMenu) +#endif + EVT_CHAR(MyListCtrl::OnChar) + + EVT_RIGHT_DOWN(MyListCtrl::OnRightClick) +END_EVENT_TABLE() void MyListCtrl::OnCacheHint(wxListEvent& event) { @@ -820,13 +984,27 @@ void MyListCtrl::OnBeginRDrag(wxListEvent& event) void MyListCtrl::OnBeginLabelEdit(wxListEvent& event) { wxLogMessage( wxT("OnBeginLabelEdit: %s"), event.m_item.m_text.c_str()); + + wxTextCtrl * const text = GetEditControl(); + if ( !text ) + { + wxLogMessage("BUG: started to edit but no edit control"); + } + else + { + wxLogMessage("Edit control value: \"%s\"", text->GetValue()); + } } void MyListCtrl::OnEndLabelEdit(wxListEvent& event) { wxLogMessage( wxT("OnEndLabelEdit: %s"), - event.IsEditCancelled() ? _T("[cancelled]") - : event.m_item.m_text.c_str()); + ( + event.IsEditCancelled() ? + wxString("[cancelled]") : + event.m_item.m_text + ).c_str() + ); } void MyListCtrl::OnDeleteItem(wxListEvent& event) @@ -840,41 +1018,6 @@ void MyListCtrl::OnDeleteAllItems(wxListEvent& event) LogEvent(event, _T("OnDeleteAllItems")); } -#if WXWIN_COMPATIBILITY_2_4 -void MyListCtrl::OnGetInfo(wxListEvent& event) -{ - wxString msg; - - msg << _T("OnGetInfo (") << event.m_item.m_itemId << _T(", ") << event.m_item.m_col << _T(")"); - if ( event.m_item.m_mask & wxLIST_MASK_STATE ) - msg << _T(" wxLIST_MASK_STATE"); - if ( event.m_item.m_mask & wxLIST_MASK_TEXT ) - msg << _T(" wxLIST_MASK_TEXT"); - if ( event.m_item.m_mask & wxLIST_MASK_IMAGE ) - msg << _T(" wxLIST_MASK_IMAGE"); - if ( event.m_item.m_mask & wxLIST_MASK_DATA ) - msg << _T(" wxLIST_MASK_DATA"); - if ( event.m_item.m_mask & wxLIST_SET_ITEM ) - msg << _T(" wxLIST_SET_ITEM"); - if ( event.m_item.m_mask & wxLIST_MASK_WIDTH ) - msg << _T(" wxLIST_MASK_WIDTH"); - if ( event.m_item.m_mask & wxLIST_MASK_FORMAT ) - msg << _T(" wxLIST_MASK_WIDTH"); - - if ( event.m_item.m_mask & wxLIST_MASK_TEXT ) - { - event.m_item.m_text = _T("My callback text"); - } - - wxLogMessage(msg); -} - -void MyListCtrl::OnSetInfo(wxListEvent& event) -{ - LogEvent(event, _T("OnSetInfo")); -} -#endif - void MyListCtrl::OnSelected(wxListEvent& event) { LogEvent(event, _T("OnSelected")); @@ -920,8 +1063,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) switch ( event.GetKeyCode() ) { - case 'c': // colorize - case 'C': + case 'C': // colorize { wxListItem info; info.m_itemId = event.GetIndex(); @@ -945,8 +1087,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) } break; - case 'n': // next - case 'N': + case 'N': // next item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); if ( item++ == GetItemCount() - 1 ) { @@ -959,8 +1100,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) EnsureVisible(item); break; - case 'r': // show bounding Rect - case 'R': + case 'R': // show bounding rectangle { item = event.GetIndex(); wxRect r; @@ -975,7 +1115,48 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) } break; - case WXK_DELETE: + case '1': // show sub item bounding rectangle + case '2': + case '3': + case '4': // this column is invalid but we want to test it too + if ( InReportView() ) + { + int subItem = event.GetKeyCode() - '1'; + item = event.GetIndex(); + wxRect r; + if ( !GetSubItemRect(item, subItem, r) ) + { + wxLogError(_T("Failed to retrieve rect of item %ld column %d"), item, subItem + 1); + break; + } + + wxLogMessage(_T("Bounding rect of item %ld column %d is (%d, %d)-(%d, %d)"), + item, subItem + 1, + r.x, r.y, r.x + r.width, r.y + r.height); + } + break; + + case 'U': // update + if ( !IsVirtual() ) + break; + + if ( m_updated != -1 ) + RefreshItem(m_updated); + + m_updated = event.GetIndex(); + if ( m_updated != -1 ) + { + // we won't see changes to this item as it's selected, update + // the next one (or the first one if we're on the last item) + if ( ++m_updated == GetItemCount() ) + m_updated = 0; + + wxLogMessage("Updating colour of the item %ld", m_updated); + RefreshItem(m_updated); + } + break; + + case 'D': // delete item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); while ( item != -1 ) { @@ -989,7 +1170,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) } break; - case WXK_INSERT: + case 'I': // insert if ( GetWindowStyle() & wxLC_REPORT ) { if ( GetWindowStyle() & wxLC_VIRTUAL ) @@ -1020,6 +1201,14 @@ void MyListCtrl::OnChar(wxKeyEvent& event) case 'N': case 'c': case 'C': + case 'r': + case 'R': + case 'u': + case 'U': + case 'd': + case 'D': + case 'i': + case 'I': // these are the keys we process ourselves break; @@ -1071,7 +1260,7 @@ wxString MyListCtrl::OnGetItemText(long item, long column) const { return SMALL_VIRTUAL_VIEW_ITEMS[item][column]; } - else + else // "big" virtual control { return wxString::Format(_T("Column %ld of item %ld"), column, item); } @@ -1082,7 +1271,7 @@ int MyListCtrl::OnGetItemColumnImage(long item, long column) const if (!column) return 0; - if (!(item %3) && column == 1) + if (!(item % 3) && column == 1) return 0; return -1; @@ -1090,6 +1279,14 @@ int MyListCtrl::OnGetItemColumnImage(long item, long column) const wxListItemAttr *MyListCtrl::OnGetItemAttr(long item) const { + // test to check that RefreshItem() works correctly: when m_updated is + // set to some item and it is refreshed, we highlight the item + if ( item == m_updated ) + { + static wxListItemAttr s_attrHighlight(*wxRED, wxNullColour, wxNullFont); + return &s_attrHighlight; + } + return item % 2 ? NULL : (wxListItemAttr *)&m_attr; } @@ -1110,16 +1307,29 @@ void MyListCtrl::InsertItemInReportView(int i) #if USE_CONTEXT_MENU void MyListCtrl::OnContextMenu(wxContextMenuEvent& event) { - wxPoint point = event.GetPosition(); - // If from keyboard - if (point.x == -1 && point.y == -1) { - wxSize size = GetSize(); - point.x = size.x / 2; - point.y = size.y / 2; - } else { - point = ScreenToClient(point); + if (GetEditControl() == NULL) + { + wxPoint point = event.GetPosition(); + // If from keyboard + if ( (point.x == -1) && (point.y == -1) ) + { + wxSize size = GetSize(); + point.x = size.x / 2; + point.y = size.y / 2; + } + else + { + point = ScreenToClient(point); + } + ShowContextMenu(point); + } + else + { + // the user is editing: + // allow the text control to display its context menu + // if it has one (it has on Windows) rather than display our one + event.Skip(); } - ShowContextMenu(point); } #endif