X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6678c7f83894bc750cebb129d9575f5768eda174..1667f96a859a4c21606e8a30d792c333dd0adaa3:/samples/grid/griddemo.h?ds=sidebyside diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h index 94d923e417..15e8b88223 100644 --- a/samples/grid/griddemo.h +++ b/samples/grid/griddemo.h @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: griddemo.h -// Purpose: Grid control wxWindows sample +// Purpose: Grid control wxWidgets sample // Author: Michael Bedward // Modified by: // RCS-ID: $Id$ // Copyright: (c) Michael Bedward, Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,9 +24,10 @@ public: class GridFrame : public wxFrame { wxGrid *grid; +#if wxUSE_LOG wxTextCtrl *logWin; wxLogTextCtrl *logger; - wxString logBuf; +#endif // wxUSE_LOG void SetDefaults(); @@ -35,7 +36,12 @@ class GridFrame : public wxFrame void ToggleEditing( wxCommandEvent& ); void ToggleRowSizing( wxCommandEvent& ); void ToggleColSizing( wxCommandEvent& ); + void ToggleColMoving( wxCommandEvent& ); void ToggleGridSizing( wxCommandEvent& ); + void ToggleGridDragCell ( wxCommandEvent& ); + void SetNativeColHeader ( wxCommandEvent& ); + void SetCustomColHeader( wxCommandEvent& ); + void SetDefaultColHeader( wxCommandEvent& ); void ToggleGridLines( wxCommandEvent& ); void AutoSizeCols( wxCommandEvent& ); void CellOverflow( wxCommandEvent& ); @@ -60,6 +66,7 @@ class GridFrame : public wxFrame void SelectCells( wxCommandEvent& ); void SelectRows( wxCommandEvent& ); void SelectCols( wxCommandEvent& ); + void SelectRowsOrCols( wxCommandEvent& ); void DeselectCell(wxCommandEvent& event); void DeselectCol(wxCommandEvent& event); @@ -71,13 +78,23 @@ class GridFrame : public wxFrame void SelectAll(wxCommandEvent& event); void OnAddToSelectToggle(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 OnRowSize( wxGridSizeEvent& ); void OnColSize( wxGridSizeEvent& ); void OnSelectCell( wxGridEvent& ); void OnRangeSelected( wxGridRangeSelectEvent& ); + void OnCellValueChanging( wxGridEvent& ); void OnCellValueChanged( wxGridEvent& ); + void OnCellBeginDrag( wxGridEvent& ); void OnEditorShown(wxGridEvent&); void OnEditorHidden(wxGridEvent&); @@ -93,7 +110,7 @@ public: void About( wxCommandEvent& ); void OnVTable( wxCommandEvent& ); void OnBugsTable( wxCommandEvent& ); - void OnSmallGrid( wxCommandEvent& ); + void OnTabularTable( wxCommandEvent& ); enum { @@ -102,7 +119,9 @@ public: ID_TOGGLEEDIT, ID_TOGGLEROWSIZING, ID_TOGGLECOLSIZING, + ID_TOGGLECOLMOVING, ID_TOGGLEGRIDSIZING, + ID_TOGGLEGRIDDRAGCELL, ID_TOGGLEGRIDLINES, ID_AUTOSIZECOLS, ID_CELLOVERFLOW, @@ -116,6 +135,9 @@ public: ID_COLLABELALIGN, ID_COLLABELHORIZALIGN, ID_COLLABELVERTALIGN, + ID_COLDEFAULTHEADER, + ID_COLNATIVEHEADER, + ID_COLCUSTOMHEADER, ID_GRIDLINECOLOUR, ID_INSERTROW, ID_INSERTCOL, @@ -126,12 +148,12 @@ public: ID_SELCELLS, ID_SELROWS, ID_SELCOLS, + ID_SELROWSORCOLS, ID_SET_CELL_FG_COLOUR, ID_SET_CELL_BG_COLOUR, - ID_ABOUT, ID_VTABLE, ID_BUGS_TABLE, - ID_SMALL_GRID, + ID_TABULAR_TABLE, ID_SELECT_UNSELECT, ID_SELECT_ALL, ID_SELECT_ROW, @@ -141,6 +163,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, @@ -148,7 +177,9 @@ public: ID_TESTFUNC }; +#if wxUSE_LOG wxLog *m_logOld; +#endif // wxUSE_LOG // add the cells to selection when using commands from select menu? bool m_addToSel; @@ -185,7 +216,7 @@ public: } void SetValue( int , int , const wxString& ) { /* ignore */ } - bool IsEmptyCell( int , int ) { return FALSE; } + bool IsEmptyCell( int , int ) { return false; } private: long m_sizeGrid; @@ -225,7 +256,7 @@ private: class BugsGridTable : public wxGridTableBase { public: - BugsGridTable(); + BugsGridTable() { } virtual int GetNumberRows(); virtual int GetNumberCols();