don't use deprecated toolbar API

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

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index f2ff5c4af0b64f33b651e01aa7dffc0f17ffd4a0..5d9201af8e99f36a816e0814cfd7716fe748756c 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -28,7 +28,6 @@ class GridFrame : public wxFrame
     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;
 #endif // wxUSE_LOG
-    wxString       logBuf;
 
     void SetDefaults();
 
@@ -37,6 +36,7 @@ class GridFrame : public wxFrame
     void ToggleEditing( wxCommandEvent& );
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
+    void ToggleColMoving( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );
     void ToggleGridDragCell ( wxCommandEvent& );
     void ToggleGridLines( wxCommandEvent& );
@@ -73,6 +73,15 @@ 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);
+    void AutoSizeRowLabel(wxCommandEvent& event);
+    void AutoSizeColLabel(wxCommandEvent& event);
+    void AutoSizeLabelsCol(wxCommandEvent& event);
+    void AutoSizeLabelsRow(wxCommandEvent& event);
+    void AutoSizeTable(wxCommandEvent& event);
 
     void OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );
@@ -98,6 +107,7 @@ public:
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
     void OnSmallGrid( wxCommandEvent& );
+    void OnTabularGrid( wxCommandEvent& );
 
     enum
     {
@@ -106,6 +116,7 @@ public:
         ID_TOGGLEEDIT,
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
+        ID_TOGGLECOLMOVING,
         ID_TOGGLEGRIDSIZING,
         ID_TOGGLEGRIDDRAGCELL,
         ID_TOGGLEGRIDLINES,
@@ -136,7 +147,9 @@ public:
         ID_VTABLE,
         ID_BUGS_TABLE,
         ID_SMALL_GRID,
+        ID_TABULAR_GRID,
         ID_SELECT_UNSELECT,
+        ID_SHOW_SELECTION,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,
@@ -145,6 +158,13 @@ public:
         ID_DESELECT_ROW,
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
+        ID_SIZE_ROW,
+        ID_SIZE_COL,
+        ID_SIZE_ROW_LABEL,
+        ID_SIZE_COL_LABEL,
+        ID_SIZE_LABELS_COL,
+        ID_SIZE_LABELS_ROW,
+        ID_SIZE_GRID,
 
         ID_SET_HIGHLIGHT_WIDTH,
         ID_SET_RO_HIGHLIGHT_WIDTH,