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 f6358de0b39b57fe87b6ba162daedb4933307e48..29e351e1ffa679db3ab698d805154a2e9a001165 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -6,54 +6,58 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application type
 class MyApp: public wxApp
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application type
 class MyApp: public wxApp

-{ public:
-    bool OnInit(void);
-
-    wxImageList *m_imageListNormal;
-    wxImageList *m_imageListSmall;
+{
+public:
+    virtual bool OnInit();

 };
 
 class MyListCtrl: public wxListCtrl
 {
 public:
 };
 
 class MyListCtrl: public wxListCtrl
 {
 public:

-   MyListCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
-    const wxSize& size, long style):
+    MyListCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
+            const wxSize& size, long style):

         wxListCtrl(parent, id, pos, size, style)
         wxListCtrl(parent, id, pos, size, style)

-   {
-   }
-   
-       void OnBeginDrag(wxListEvent& event);
-       void OnBeginRDrag(wxListEvent& event);
-       void OnBeginLabelEdit(wxListEvent& event);
-       void OnEndLabelEdit(wxListEvent& event);
-       void OnDeleteItem(wxListEvent& event);
-       void OnGetInfo(wxListEvent& event);
-       void OnSetInfo(wxListEvent& event);
-       void OnSelected(wxListEvent& event);
-       void OnDeselected(wxListEvent& event);
-       void OnListKeyDown(wxListEvent& event);
-       void OnActivated(wxListEvent& event);
+        {
+        }
+
+    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);
+    void OnDeselected(wxListEvent& event);
+    void OnListKeyDown(wxListEvent& event);
+    void OnActivated(wxListEvent& event);

 
     void OnChar(wxKeyEvent& event);
 
 
     void OnChar(wxKeyEvent& event);
 

-   DECLARE_EVENT_TABLE()
+private:
+    void LogEvent(const wxListEvent& event, const wxChar *eventName);
+
+    DECLARE_EVENT_TABLE()

 };
 
 // Define a new frame type
 class MyFrame: public wxFrame
 };
 
 // Define a new frame type
 class MyFrame: public wxFrame

-{ public:
+{
+public:

     MyListCtrl *m_listCtrl;
     wxTextCtrl *m_logWindow;
 
     MyListCtrl *m_listCtrl;
     wxTextCtrl *m_logWindow;
 

-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    ~MyFrame(void);
-    
- public:
+    MyFrame(const wxChar *title, int x, int y, int w, int h);
+    ~MyFrame();
+
+public:

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnListView(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnListView(wxCommandEvent& event);


@@ -62,28 +66,55 @@ class MyFrame: public wxFrame
     void OnIconTextView(wxCommandEvent& event);
     void OnSmallIconView(wxCommandEvent& event);
     void OnSmallIconTextView(wxCommandEvent& event);
     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 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);
     void BusyOn(wxCommandEvent& event);
     void BusyOff(wxCommandEvent& event);

-   DECLARE_EVENT_TABLE()
+
+    wxImageList *m_imageListNormal;
+    wxImageList *m_imageListSmall;
+
+private:
+    wxLog *m_logOld;
+
+    DECLARE_EVENT_TABLE()

 };
 
 
 // ID for the menu quit command
 };
 
 
 // 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_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_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
+};