Fixed parameter type

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index b3464b74db6c8ef8710b68381317dc352e0dbbfc..97a719b7dc31e0e78106aca981b6acc5ea72daab 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,7 +13,12 @@
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

+    MyApp() { }
+

     virtual bool OnInit();
     virtual bool OnInit();

+
+private:
+    DECLARE_NO_COPY_CLASS(MyApp)

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


@@ -25,7 +30,7 @@ public:
                const wxSize& size,
                long style)
         : wxListCtrl(parent, id, pos, size, style),
                const wxSize& size,
                long style)
         : wxListCtrl(parent, id, pos, size, style),

-          m_attr(*wxCYAN, *wxLIGHT_GREY, wxNullFont)
+          m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)

         {
         }
 
         {
         }
 


@@ -49,6 +54,7 @@ public:
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnActivated(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnActivated(wxListEvent& event);

+    void OnFocused(wxListEvent& event);

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


@@ -57,6 +63,7 @@ private:
     void SetColumnImage(int col, int image);
 
     void LogEvent(const wxListEvent& event, const wxChar *eventName);
     void SetColumnImage(int col, int image);
 
     void LogEvent(const wxListEvent& event, const wxChar *eventName);

+    void LogColEvent(const wxListEvent& event, const wxChar *eventName);

 
     virtual wxString OnGetItemText(long item, long column) const;
     virtual int OnGetItemImage(long item) const;
 
     virtual wxString OnGetItemText(long item, long column) const;
     virtual int OnGetItemImage(long item) const;


@@ -64,6 +71,7 @@ private:
 
     wxListItemAttr m_attr;
 
 
     wxListItemAttr m_attr;
 

+    DECLARE_NO_COPY_CLASS(MyListCtrl)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -71,13 +79,12 @@ private:
 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:

-    MyListCtrl *m_listCtrl;
-    wxTextCtrl *m_logWindow;
-

     MyFrame(const wxChar *title, int x, int y, int w, int h);
     MyFrame(const wxChar *title, int x, int y, int w, int h);

-    ~MyFrame();
+    virtual ~MyFrame();

 
 

-public:
+    void DoSize();
+
+protected:

     void OnSize(wxSizeEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
 
     void OnQuit(wxCommandEvent& event);


@@ -95,6 +102,7 @@ public:
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
     void OnAdd(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
     void OnAdd(wxCommandEvent& event);

+    void OnEdit(wxCommandEvent& event);

     void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);
     void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);


@@ -103,12 +111,18 @@ public:
     void OnToggleMultiSel(wxCommandEvent& event);
     void OnShowColInfo(wxCommandEvent& event);
     void OnShowSelInfo(wxCommandEvent& event);
     void OnToggleMultiSel(wxCommandEvent& event);
     void OnShowColInfo(wxCommandEvent& event);
     void OnShowSelInfo(wxCommandEvent& event);

+    void OnFreeze(wxCommandEvent& event);
+    void OnThaw(wxCommandEvent& event);

 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
 
     wxImageList *m_imageListNormal;
     wxImageList *m_imageListSmall;
 
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
 
     wxImageList *m_imageListNormal;
     wxImageList *m_imageListSmall;
 

+    wxPanel *m_panel;
+    MyListCtrl *m_listCtrl;
+    wxTextCtrl *m_logWindow;
+

 private:
     // recreate the list control with the new flags
     void RecreateList(long flags, bool withText = TRUE);
 private:
     // recreate the list control with the new flags
     void RecreateList(long flags, bool withText = TRUE);


@@ -121,6 +135,7 @@ private:
 
     wxLog *m_logOld;
 
 
     wxLog *m_logOld;
 

+    DECLARE_NO_COPY_CLASS(MyFrame)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -144,6 +159,7 @@ enum
     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_ADD,
     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_ADD,

+    LIST_EDIT,

     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,


@@ -152,6 +168,8 @@ enum
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,
     LIST_FOCUS_LAST,
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,
     LIST_FOCUS_LAST,

+    LIST_FREEZE,
+    LIST_THAW,

 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };