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 a06464e232074c7f0c0c404f810f93b0c32efeea..5d9201af8e99f36a816e0814cfd7716fe748756c 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -24,9 +24,10 @@ public:
 class GridFrame : public wxFrame
 {
     wxGrid         *grid;
 class GridFrame : public wxFrame
 {
     wxGrid         *grid;

+#if wxUSE_LOG

     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;
     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;

-    wxString       logBuf;
+#endif // wxUSE_LOG

 
     void SetDefaults();
 
 
     void SetDefaults();
 


@@ -35,7 +36,9 @@ class GridFrame : public wxFrame
     void ToggleEditing( wxCommandEvent& );
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
     void ToggleEditing( wxCommandEvent& );
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );

+    void ToggleColMoving( wxCommandEvent& );

     void ToggleGridSizing( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );

+    void ToggleGridDragCell ( wxCommandEvent& );

     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( wxCommandEvent& );
     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( wxCommandEvent& );


@@ -70,6 +73,15 @@ class GridFrame : public wxFrame
     void SelectRow(wxCommandEvent& event);
     void SelectAll(wxCommandEvent& event);
     void OnAddToSelectToggle(wxCommandEvent& event);
     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& );
 
     void OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );


@@ -78,6 +90,7 @@ class GridFrame : public wxFrame
     void OnSelectCell( wxGridEvent& );
     void OnRangeSelected( wxGridRangeSelectEvent& );
     void OnCellValueChanged( wxGridEvent& );
     void OnSelectCell( wxGridEvent& );
     void OnRangeSelected( wxGridRangeSelectEvent& );
     void OnCellValueChanged( wxGridEvent& );

+    void OnCellBeginDrag( wxGridEvent& );

 
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
 
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);


@@ -94,6 +107,7 @@ public:
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
     void OnSmallGrid( wxCommandEvent& );
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
     void OnSmallGrid( wxCommandEvent& );

+    void OnTabularGrid( wxCommandEvent& );

 
     enum
     {
 
     enum
     {


@@ -102,7 +116,9 @@ public:
         ID_TOGGLEEDIT,
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEEDIT,
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,

+        ID_TOGGLECOLMOVING,

         ID_TOGGLEGRIDSIZING,
         ID_TOGGLEGRIDSIZING,

+        ID_TOGGLEGRIDDRAGCELL,

         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,


@@ -128,11 +144,12 @@ public:
         ID_SELCOLS,
         ID_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,
         ID_SELCOLS,
         ID_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,

-        ID_ABOUT,

         ID_VTABLE,
         ID_BUGS_TABLE,
         ID_SMALL_GRID,
         ID_VTABLE,
         ID_BUGS_TABLE,
         ID_SMALL_GRID,

+        ID_TABULAR_GRID,

         ID_SELECT_UNSELECT,
         ID_SELECT_UNSELECT,

+        ID_SHOW_SELECTION,

         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,


@@ -141,6 +158,13 @@ public:
         ID_DESELECT_ROW,
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
         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,
 
         ID_SET_HIGHLIGHT_WIDTH,
         ID_SET_RO_HIGHLIGHT_WIDTH,


@@ -148,7 +172,9 @@ public:
         ID_TESTFUNC
     };
 
         ID_TESTFUNC
     };
 

+#if wxUSE_LOG

     wxLog *m_logOld;
     wxLog *m_logOld;

+#endif // wxUSE_LOG

 
     // add the cells to selection when using commands from select menu?
     bool m_addToSel;
 
     // add the cells to selection when using commands from select menu?
     bool m_addToSel;


@@ -185,7 +211,7 @@ public:
     }
 
     void SetValue( int , int , const wxString&  ) { /* ignore */ }
     }
 
     void SetValue( int , int , const wxString&  ) { /* ignore */ }

-    bool IsEmptyCell( int , int  ) { return FALSE; }
+    bool IsEmptyCell( int , int  ) { return false; }

 
 private:
     long m_sizeGrid;
 
 private:
     long m_sizeGrid;


@@ -225,7 +251,7 @@ private:
 class BugsGridTable : public wxGridTableBase
 {
 public:
 class BugsGridTable : public wxGridTableBase
 {
 public:

-    BugsGridTable();
+    BugsGridTable(){};

 
     virtual int GetNumberRows();
     virtual int GetNumberCols();
 
     virtual int GetNumberRows();
     virtual int GetNumberCols();