include xpm files for Mac OS after correction of wxICON macro

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 8258cf17bf000b17918d4836a48884c2fe54b451..29e351e1ffa679db3ab698d805154a2e9a001165 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -14,9 +14,6 @@ class MyApp: public wxApp
 {
 public:
     virtual bool OnInit();
-
-    wxImageList *m_imageListNormal;
-    wxImageList *m_imageListSmall;
 };
 
 class MyListCtrl: public wxListCtrl
@@ -44,6 +41,9 @@ public:
 
     void OnChar(wxKeyEvent& event);
 
+private:
+    void LogEvent(const wxListEvent& event, const wxChar *eventName);
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -54,7 +54,7 @@ public:
     MyListCtrl *m_listCtrl;
     wxTextCtrl *m_logWindow;
 
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+    MyFrame(const wxChar *title, int x, int y, int w, int h);
     ~MyFrame();
 
 public:
@@ -66,14 +66,27 @@ public:
     void OnIconTextView(wxCommandEvent& event);
     void OnSmallIconView(wxCommandEvent& event);
     void OnSmallIconTextView(wxCommandEvent& event);
+    void OnToggleFirstSel(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
+    void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);
+    void OnSetFgColour(wxCommandEvent& event);
+    void OnSetBgColour(wxCommandEvent& event);
+    void OnToggleMultiSel(wxCommandEvent& event);
+    void OnShowColInfo(wxCommandEvent& event);
+    void OnUpdateShowColInfo(wxUpdateUIEvent& event);
 
     void BusyOn(wxCommandEvent& event);
     void BusyOff(wxCommandEvent& event);
 
+    wxImageList *m_imageListNormal;
+    wxImageList *m_imageListSmall;
+
+private:
+    wxLog *m_logOld;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -94,7 +107,13 @@ enum
     BUSY_ON                     = 10,
     BUSY_OFF                    = 11,
     LIST_DELETE_ALL             = 12,
+    LIST_DELETE,
     LIST_SORT,
+    LIST_SET_FG_COL,
+    LIST_SET_BG_COL,
+    LIST_TOGGLE_MULTI_SEL,
+    LIST_TOGGLE_FIRST,
+    LIST_SHOW_COL_INFO,
 
     LIST_CTRL                   = 1000
 };