Get wxSearchCtrl text events working, and share the text event handler code among...

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 600eaf4b1ae08c3861574d624f6087333263e817..f99982d6982212f05123c2e210b02a96cdbef88f 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -26,7 +26,7 @@ public:
     virtual bool OnInit();
 
 private:
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 class MyListCtrl: public wxListCtrl
@@ -40,6 +40,8 @@ public:
         : wxListCtrl(parent, id, pos, size, style),
           m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)
         {
+            m_updated = -1;
+
 #ifdef __POCKETPC__
             EnableContextMenu();
 #endif
@@ -59,10 +61,6 @@ public:
     void OnEndLabelEdit(wxListEvent& event);
     void OnDeleteItem(wxListEvent& event);
     void OnDeleteAllItems(wxListEvent& event);
-#if WXWIN_COMPATIBILITY_2_4
-    void OnGetInfo(wxListEvent& event);
-    void OnSetInfo(wxListEvent& event);
-#endif
     void OnSelected(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
@@ -92,7 +90,10 @@ private:
 
     wxListItemAttr m_attr;
 
-    DECLARE_NO_COPY_CLASS(MyListCtrl)
+    long m_updated;
+
+
+    wxDECLARE_NO_COPY_CLASS(MyListCtrl);
     DECLARE_EVENT_TABLE()
 };
 
@@ -119,6 +120,10 @@ protected:
     void OnVirtualView(wxCommandEvent& event);
     void OnSmallVirtualView(wxCommandEvent& event);
 
+    void OnSetItemsCount(wxCommandEvent& event);
+
+
+    void OnGoTo(wxCommandEvent& event);
     void OnFocusLast(wxCommandEvent& event);
     void OnToggleFirstSel(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
@@ -133,9 +138,18 @@ protected:
     void OnToggleMultiSel(wxCommandEvent& event);
     void OnShowColInfo(wxCommandEvent& event);
     void OnShowSelInfo(wxCommandEvent& event);
+    void OnShowViewRect(wxCommandEvent& event);
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    void OnSetColOrder(wxCommandEvent& event);
+    void OnGetColOrder(wxCommandEvent& event);
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER
     void OnFreeze(wxCommandEvent& event);
     void OnThaw(wxCommandEvent& event);
     void OnToggleLines(wxCommandEvent& event);
+#ifdef __WXOSX__
+    void OnToggleMacUseGeneric(wxCommandEvent& event);
+#endif // __WXOSX__
+    void OnFind(wxCommandEvent& event);
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
     void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);
@@ -166,7 +180,11 @@ private:
 
     bool m_smallVirtual;
 
-    DECLARE_NO_COPY_CLASS(MyFrame)
+    // number of items to initialize list/report view with
+    int m_numListItems;
+
+
+    wxDECLARE_NO_COPY_CLASS(MyFrame);
     DECLARE_EVENT_TABLE()
 };
 
@@ -185,6 +203,7 @@ enum
     LIST_REPORT_VIEW,
     LIST_VIRTUAL_VIEW,
     LIST_SMALL_VIRTUAL_VIEW,
+    LIST_SET_ITEMS_COUNT,
 
     LIST_DESELECT_ALL,
     LIST_SELECT_ALL,
@@ -193,16 +212,26 @@ enum
     LIST_ADD,
     LIST_EDIT,
     LIST_SORT,
+    LIST_FIND,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
     LIST_TOGGLE_MULTI_SEL,
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,
+    LIST_SHOW_VIEW_RECT,
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    LIST_SET_COL_ORDER,
+    LIST_GET_COL_ORDER,
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER
+    LIST_GOTO,
     LIST_FOCUS_LAST,
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,
+#ifdef __WXOSX__
+    LIST_MAC_USE_GENERIC,
+#endif
 
     LIST_CTRL                   = 1000
 };