Always use icons with wxToolbook in the notebook sample.

[wxWidgets.git] / samples / grid / griddemo.h

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index fdd0a06a28fcd327217a259f21d1d001e92ff0c7..15e8b882237a6c2c8cb1e9639137a1cf1aa28759 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward, Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -39,7 +39,9 @@ class GridFrame : public wxFrame
     void ToggleColMoving( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );
     void ToggleGridDragCell ( wxCommandEvent& );
-    void ToggleNativeHeader ( wxCommandEvent& );
+    void SetNativeColHeader ( wxCommandEvent& );
+    void SetCustomColHeader( wxCommandEvent& );
+    void SetDefaultColHeader( wxCommandEvent& );
     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( wxCommandEvent& );
@@ -75,7 +77,6 @@ class GridFrame : public wxFrame
     void SelectRow(wxCommandEvent& event);
     void SelectAll(wxCommandEvent& event);
     void OnAddToSelectToggle(wxCommandEvent& event);
-    void OnShowSelection(wxCommandEvent& event);
 
     void AutoSizeRow(wxCommandEvent& event);
     void AutoSizeCol(wxCommandEvent& event);
@@ -121,7 +122,6 @@ public:
         ID_TOGGLECOLMOVING,
         ID_TOGGLEGRIDSIZING,
         ID_TOGGLEGRIDDRAGCELL,
-        ID_TOGGLENATIVEHEADER,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,
@@ -135,6 +135,9 @@ public:
         ID_COLLABELALIGN,
         ID_COLLABELHORIZALIGN,
         ID_COLLABELVERTALIGN,
+        ID_COLDEFAULTHEADER,
+        ID_COLNATIVEHEADER,
+        ID_COLCUSTOMHEADER,
         ID_GRIDLINECOLOUR,
         ID_INSERTROW,
         ID_INSERTCOL,
@@ -152,7 +155,6 @@ public:
         ID_BUGS_TABLE,
         ID_TABULAR_TABLE,
         ID_SELECT_UNSELECT,
-        ID_SHOW_SELECTION,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,