Wrap missing.h in #ifdef __GNUG__

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index d91ce1b9f4c9a72a9000e03b6ba4c4364e75b773..db6eb7cfcfb6fae62ae6b775ca30c44aff245c4c 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -25,7 +25,7 @@ public:
                const wxSize& size,
                long style)
         : wxListCtrl(parent, id, pos, size, style),
-          m_attr(*wxCYAN, *wxLIGHT_GREY, wxNullFont)
+          m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)
         {
         }
 
@@ -49,12 +49,16 @@ public:
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnActivated(wxListEvent& event);
+    void OnFocused(wxListEvent& event);
     void OnCacheHint(wxListEvent& event);
 
     void OnChar(wxKeyEvent& event);
 
 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;
@@ -69,13 +73,10 @@ 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();
 
-public:
+protected:
     void OnSize(wxSizeEvent& event);
 
     void OnQuit(wxCommandEvent& event);
@@ -93,6 +94,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);
@@ -101,12 +103,18 @@ public:
     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;
 
+    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);
@@ -142,6 +150,7 @@ enum
     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_ADD,
+    LIST_EDIT,
     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
@@ -150,6 +159,8 @@ enum
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,
     LIST_FOCUS_LAST,
+    LIST_FREEZE,
+    LIST_THAW,
 
     LIST_CTRL                   = 1000
 };