Add some missing wx. prefixes

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index a79ca7c580ad9196937a38126ef7c95d24b4b525..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$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,7 +13,12 @@
 class MyApp: public wxApp
 {
 public:
+    MyApp() { }
+
     virtual bool OnInit();
+
+private:
+    DECLARE_NO_COPY_CLASS(MyApp)
 };
 
 class MyListCtrl: public wxListCtrl
@@ -58,6 +63,7 @@ private:
     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;
@@ -65,6 +71,7 @@ private:
 
     wxListItemAttr m_attr;
 
+    DECLARE_NO_COPY_CLASS(MyListCtrl)
     DECLARE_EVENT_TABLE()
 };
 
@@ -72,13 +79,12 @@ private:
 class MyFrame: public wxFrame
 {
 public:
-    MyListCtrl *m_listCtrl;
-    wxTextCtrl *m_logWindow;
-
     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);
@@ -96,6 +102,7 @@ public:
     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);
@@ -112,6 +119,10 @@ public:
     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);
@@ -124,6 +135,7 @@ private:
 
     wxLog *m_logOld;
 
+    DECLARE_NO_COPY_CLASS(MyFrame)
     DECLARE_EVENT_TABLE()
 };
 
@@ -147,6 +159,7 @@ enum
     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_ADD,
+    LIST_EDIT,
     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,