X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37e8bdb87d4f455f99f8ddf3497c24f915a5b8ea..e8b90482676205a0fc997be9fcdc47ef62a37211:/samples/listctrl/listtest.cpp diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index 162d2b7d1f..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,8 @@ 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) @@ -98,85 +150,23 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) - 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 = 10; - -// 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() -{ - 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; -} - // My frame constructor MyFrame::MyFrame(const wxChar *title) - : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(800, 500)) + : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(600, 500)) { m_listCtrl = NULL; m_logWindow = NULL; - m_simpleListCtrl = NULL; m_smallVirtual = false; + m_numListItems = 10; // Give it an icon SetIcon( wxICON(mondrian) ); @@ -227,7 +217,10 @@ 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 @@ -243,10 +236,11 @@ MyFrame::MyFrame(const wxChar *title) 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("Show&w columns order\tCtrl-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("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")); @@ -279,26 +273,13 @@ MyFrame::MyFrame(const wxChar *title) m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_logWindow)); RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL); - - // Also add a simple list to the sample - - m_simpleListCtrl = new wxListCtrl( m_panel, -1, wxDefaultPosition, wxDefaultSize, - wxLC_REPORT | wxLC_SINGLE_SEL ); - m_simpleListCtrl->InsertColumn(0, "Column 1", wxLIST_FORMAT_LEFT, 80); - m_simpleListCtrl->InsertColumn(1, "Column 2", wxLIST_FORMAT_LEFT, 100); - m_simpleListCtrl->InsertColumn(2, "Column 3", wxLIST_FORMAT_LEFT, 100); - - for ( int i = 0; i < NUM_ITEMS; i++ ) - { - wxString buf; - buf.Printf(_T("Item %d"), i); - long tmp = m_simpleListCtrl->InsertItem(i, buf, 0); - buf.Printf(_T("Col 1, item %d"), i); - m_simpleListCtrl->SetItem(tmp, 1, buf); - buf.Printf(_T("Col 2, item %d"), i); - m_simpleListCtrl->SetItem(tmp, 2, buf); - } - + +#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(); #endif // wxUSE_STATUSBAR @@ -326,9 +307,8 @@ void MyFrame::DoSize() wxSize size = GetClientSize(); wxCoord y = (2*size.y)/3; - m_listCtrl->SetSize(0, 0, size.x-320, y); - if (m_simpleListCtrl) m_simpleListCtrl->SetSize(size.x-320+1, 0, 320-1, y); - m_logWindow->SetSize(0, y + 1, size.x, size.y - y); + m_listCtrl->SetSize(0, 0, size.x, y); + m_logWindow->SetSize(0, y + 1, size.x, size.y - y -1); } bool MyFrame::CheckNonVirtual() const @@ -374,11 +354,15 @@ 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; @@ -486,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)); } @@ -521,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 @@ -617,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); @@ -648,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(); @@ -836,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) { @@ -947,8 +1000,8 @@ void MyListCtrl::OnEndLabelEdit(wxListEvent& event) { wxLogMessage( wxT("OnEndLabelEdit: %s"), ( - event.IsEditCancelled() ? - wxString("[cancelled]") : + event.IsEditCancelled() ? + wxString("[cancelled]") : event.m_item.m_text ).c_str() );