minor corrections for CodeWarrior

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 5818ac6557f6bcebbd620ef6535d1bde48529fb1..e0ca2f31f7fc5198cc903a7e84987b3f61a669ad 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -11,11 +11,9 @@
 
 // Define a new application type
 class MyApp: public wxApp
-{ public:
-    bool OnInit();
-
-    wxImageList *m_imageListNormal;
-    wxImageList *m_imageListSmall;
+{
+public:
+    virtual bool OnInit();
 };
 
 class MyListCtrl: public wxListCtrl
@@ -27,11 +25,13 @@ public:
         {
         }
 
+    void OnColClick(wxListEvent& event);
     void OnBeginDrag(wxListEvent& event);
     void OnBeginRDrag(wxListEvent& event);
     void OnBeginLabelEdit(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);
     void OnDeleteItem(wxListEvent& event);
+    void OnDeleteAllItems(wxListEvent& event);
     void OnGetInfo(wxListEvent& event);
     void OnSetInfo(wxListEvent& event);
     void OnSelected(wxListEvent& event);
@@ -41,6 +41,9 @@ public:
 
     void OnChar(wxKeyEvent& event);
 
+private:
+    void LogEvent(const wxListEvent& event, const wxChar *eventName);
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -51,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:
@@ -63,32 +66,53 @@ 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 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()
 };
 
 
 // ID for the menu quit command
-#define LIST_QUIT                   1
-#define LIST_LIST_VIEW              2
-#define LIST_ICON_VIEW              3
-#define LIST_ICON_TEXT_VIEW         4
-#define LIST_SMALL_ICON_VIEW        5
-#define LIST_SMALL_ICON_TEXT_VIEW   6
-#define LIST_REPORT_VIEW            7
-#define LIST_DESELECT_ALL           8
-#define LIST_SELECT_ALL             9
-#define LIST_ABOUT                  102
-#define BUSY_ON                     10
-#define BUSY_OFF                    11
-#define LIST_DELETE_ALL             12
-
-#define LIST_CTRL                   1000
-
+enum
+{
+    LIST_QUIT                   = 1,
+    LIST_LIST_VIEW              = 2,
+    LIST_ICON_VIEW              = 3,
+    LIST_ICON_TEXT_VIEW         = 4,
+    LIST_SMALL_ICON_VIEW        = 5,
+    LIST_SMALL_ICON_TEXT_VIEW   = 6,
+    LIST_REPORT_VIEW            = 7,
+    LIST_DESELECT_ALL           = 8,
+    LIST_SELECT_ALL             = 9,
+    LIST_ABOUT                  = 102,
+    BUSY_ON                     = 10,
+    BUSY_OFF                    = 11,
+    LIST_DELETE_ALL             = 12,
+    LIST_SORT,
+    LIST_SET_FG_COL,
+    LIST_SET_BG_COL,
+    LIST_TOGGLE_MULTI_SEL,
+    LIST_TOGGLE_FIRST,
+    LIST_SHOW_COL_INFO,
+
+    LIST_CTRL                   = 1000
+};