X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b143cf708ba5e419de4c3d0b03640eedb6b926d1..e9cec36348072df16d6cd649f82a92c86ba3b662:/samples/listctrl/listtest.cpp diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index 9f9a2df9d8..ebfa7accb6 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -42,6 +42,7 @@ #include "wx/timer.h" // for wxStopWatch #include "wx/colordlg.h" // for wxGetColourFromUser #include "wx/settings.h" +#include "wx/sysopt.h" #include "listtest.h" @@ -91,6 +92,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze) EVT_MENU(LIST_THAW, MyFrame::OnThaw) EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines) + EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric) EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo) EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel) @@ -103,10 +105,6 @@ 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) @@ -132,7 +130,7 @@ END_EVENT_TABLE() IMPLEMENT_APP(MyApp) // number of items in list/report view -static const int NUM_ITEMS = 30; +static const int NUM_ITEMS = 10; // number of items in icon/small icon view static const int NUM_ICONS = 9; @@ -151,6 +149,9 @@ int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData) // `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")); @@ -164,15 +165,12 @@ bool MyApp::OnInit() // 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)); - // Give it an icon SetIcon( wxICON(mondrian) ); @@ -222,6 +220,9 @@ 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->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control")); +#endif wxMenu *menuList = new wxMenu; menuList->Append(LIST_FOCUS_LAST, _T("&Make last item current\tCtrl-L")); @@ -260,14 +261,14 @@ 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); #if wxUSE_STATUSBAR - CreateStatusBar(3); + CreateStatusBar(); #endif // wxUSE_STATUSBAR } @@ -340,6 +341,11 @@ void MyFrame::OnToggleLines(wxCommandEvent& event) m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked()); } +void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event) +{ + wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked()); +} + void MyFrame::OnFocusLast(wxCommandEvent& WXUNUSED(event)) { long index = m_listCtrl->GetItemCount() - 1; @@ -815,13 +821,18 @@ void MyListCtrl::OnBeginLabelEdit(wxListEvent& event) 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) { LogEvent(event, _T("OnDeleteItem")); + wxLogMessage( wxT("Number of items when delete event is sent: %d"), GetItemCount() ); } void MyListCtrl::OnDeleteAllItems(wxListEvent& event) @@ -829,41 +840,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")); @@ -909,11 +885,16 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) switch ( event.GetKeyCode() ) { - case 'c': // colorize - case 'C': + case 'C': // colorize { wxListItem info; info.m_itemId = event.GetIndex(); + if ( info.m_itemId == -1 ) + { + // no item + break; + } + GetItem(info); wxListItemAttr *attr = info.GetAttributes(); @@ -928,8 +909,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 ) { @@ -942,8 +922,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; @@ -958,6 +937,26 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) } 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 WXK_DELETE: item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); while ( item != -1 ) @@ -1003,6 +1002,12 @@ void MyListCtrl::OnChar(wxKeyEvent& event) case 'N': case 'c': case 'C': + case 'r': + case 'R': + case 'u': + case 'U': + case WXK_DELETE: + case WXK_INSERT: // these are the keys we process ourselves break; @@ -1054,7 +1059,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); } @@ -1065,7 +1070,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; @@ -1073,6 +1078,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; }