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 26e1c6cf07ee20cfadb48f8d3a60ad2ddc524116..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
@@ -93,7 +93,7 @@ private:
     long m_updated;
 
 
-    DECLARE_NO_COPY_CLASS(MyListCtrl)
+    wxDECLARE_NO_COPY_CLASS(MyListCtrl);
     DECLARE_EVENT_TABLE()
 };
 
@@ -120,6 +120,9 @@ 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);
@@ -143,7 +146,10 @@ protected:
     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);
@@ -153,7 +159,6 @@ protected:
 
     wxPanel *m_panel;
     MyListCtrl *m_listCtrl;
-    wxListCtrl *m_simpleListCtrl;
     wxTextCtrl *m_logWindow;
 
 private:
@@ -175,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()
 };
 
@@ -194,6 +203,7 @@ enum
     LIST_REPORT_VIEW,
     LIST_VIRTUAL_VIEW,
     LIST_SMALL_VIRTUAL_VIEW,
+    LIST_SET_ITEMS_COUNT,
 
     LIST_DESELECT_ALL,
     LIST_SELECT_ALL,
@@ -202,6 +212,7 @@ enum
     LIST_ADD,
     LIST_EDIT,
     LIST_SORT,
+    LIST_FIND,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
     LIST_TOGGLE_MULTI_SEL,
@@ -218,7 +229,9 @@ enum
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,
+#ifdef __WXOSX__
     LIST_MAC_USE_GENERIC,
+#endif
 
     LIST_CTRL                   = 1000
 };