compilation fix for wxOSX_USE_EXPERIMENTAL_FONTDIALOG==0 (closes #10834)

[wxWidgets.git] / samples / listctrl / listtest.cpp

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 7a24e4118a7fbc2a98a7025c35cff7cb47410348..bbf8ea7207988debba0ca2a0abe9ed4ca1ddb94f 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -43,6 +43,7 @@
 #include "wx/colordlg.h"        // for wxGetColourFromUser
 #include "wx/settings.h"
 #include "wx/sysopt.h"
 #include "wx/colordlg.h"        // for wxGetColourFromUser
 #include "wx/settings.h"
 #include "wx/sysopt.h"

+#include "wx/numdlg.h"

 
 #include "listtest.h"
 
 
 #include "listtest.h"
 


@@ -65,13 +66,11 @@ const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] =
     { _T("Sheep"), _T("baaah") },
 };
 
     { _T("Sheep"), _T("baaah") },
 };
 

-// 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;
 
 // number of items in icon/small icon view
 static const int NUM_ICONS = 9;
 

-int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData))
+int wxCALLBACK
+MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData))

 {
     // inverse the order
     if (item1 < item2)
 {
     // inverse the order
     if (item1 < item2)


@@ -92,18 +91,18 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {

-  if ( !wxApp::OnInit() )
-      return false;
+    if ( !wxApp::OnInit() )
+        return false;

 
 

-  // Create the main frame window
-  MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"));
+    // Create the main frame window
+    MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"));

 
 

-  // Show the frame
-  frame->Show(true);
+    // Show the frame
+    frame->Show(true);

 
 

-  SetTopWindow(frame);
+    SetTopWindow(frame);

 
 

-  return true;
+    return true;

 }
 
 
 }
 
 


@@ -126,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_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_GOTO, MyFrame::OnGoTo)
     EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast)
     EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel)


@@ -149,7 +150,10 @@ 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_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)
     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)
 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)


@@ -157,12 +161,12 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(const wxChar *title)
 
 // 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_listCtrl = NULL;
     m_logWindow = NULL;

-    m_simpleListCtrl = NULL;

     m_smallVirtual = false;
     m_smallVirtual = false;

+    m_numListItems = 10;

 
     // Give it an icon
     SetIcon( wxICON(mondrian) );
 
     // Give it an icon
     SetIcon( wxICON(mondrian) );


@@ -213,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"));
     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
 
     menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control"));
 #endif
 


@@ -229,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_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"));
 #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"));
     menuList->AppendSeparator();
     menuList->Append(LIST_ADD, _T("&Append an item\tCtrl-P"));
     menuList->Append(LIST_EDIT, _T("&Edit the item\tCtrl-E"));


@@ -266,24 +274,11 @@ MyFrame::MyFrame(const wxChar *title)
 
     RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL);
 
 
     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();
 
 #if wxUSE_STATUSBAR
     CreateStatusBar();


@@ -312,8 +307,7 @@ void MyFrame::DoSize()
 
     wxSize size = GetClientSize();
     wxCoord y = (2*size.y)/3;
 
     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_listCtrl->SetSize(0, 0, size.x, y);

     m_logWindow->SetSize(0, y + 1, size.x, size.y - y -1);
 }
 
     m_logWindow->SetSize(0, y + 1, size.x, size.y - y -1);
 }
 


@@ -360,11 +354,15 @@ void MyFrame::OnToggleLines(wxCommandEvent& event)
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 
     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());
 }
 
 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;
 void MyFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
     long index = 3;


@@ -472,7 +470,7 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::InitWithListItems()
 {
 
 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));
     }
     {
         m_listCtrl->InsertItem(i, wxString::Format(_T("Item %d"), i));
     }


@@ -507,13 +505,13 @@ void MyFrame::InitWithReportItems()
 
     wxStopWatch sw;
 
 
     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"),
     {
         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
     m_listCtrl->Show();
 
     // we leave all mask fields to 0 and only change the colour


@@ -603,6 +601,31 @@ void MyFrame::OnSmallVirtualView(wxCommandEvent& WXUNUSED(event))
     RecreateList(wxLC_REPORT | wxLC_VIRTUAL);
 }
 
     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);
 void MyFrame::InitWithVirtualItems()
 {
     m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);


@@ -634,6 +657,18 @@ void MyFrame::OnSort(wxCommandEvent& WXUNUSED(event))
                                             sw.Time()));
 }
 
                                             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();
 void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event))
 {
     int selCount = m_listCtrl->GetSelectedItemCount();