X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/816be743e86d10387376fa87ddb2fc684eb1efd3..27d0ab24826ca90626a7417dcd8a4fff5d92e49a:/samples/newgrid/griddemo.h?ds=sidebyside

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index 3b27cf8f78..5140bfbbb4 100644
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -39,6 +39,7 @@ class GridFrame : public wxFrame
     void ToggleEditing( wxCommandEvent& );
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
+    void ToggleGridSizing( wxCommandEvent& );
     void SetLabelColour( wxCommandEvent& );
     void SetLabelTextColour( wxCommandEvent& );
     void SetRowLabelHorizAlignment( wxCommandEvent& );
@@ -55,6 +56,9 @@ class GridFrame : public wxFrame
     void DeleteSelectedRows( wxCommandEvent& );
     void DeleteSelectedCols( wxCommandEvent& );
     void ClearGrid( wxCommandEvent& );
+    void SelectCells( wxCommandEvent& );
+    void SelectRows( wxCommandEvent& );
+    void SelectCols( wxCommandEvent& );
 
     void OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );
@@ -83,6 +87,7 @@ public:
         ID_TOGGLEEDIT,
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
+        ID_TOGGLEGRIDSIZING,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,
         ID_ROWLABELALIGN,
@@ -97,6 +102,10 @@ public:
         ID_DELETEROW,
         ID_DELETECOL,
         ID_CLEARGRID,
+	ID_CHANGESEL,
+	ID_SELCELLS,
+	ID_SELROWS,
+	ID_SELCOLS,
         ID_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,
         ID_ABOUT,
@@ -106,6 +115,8 @@ public:
         ID_TESTFUNC
     };
 
+    wxLog *m_logOld;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -130,8 +141,8 @@ class BigGridTable : public wxGridTableBase
 public:
     BigGridTable(long sizeGrid) { m_sizeGrid = sizeGrid; }
 
-    long GetNumberRows() { return m_sizeGrid; }
-    long GetNumberCols() { return m_sizeGrid; }
+    int GetNumberRows() { return m_sizeGrid; }
+    int GetNumberCols() { return m_sizeGrid; }
     wxString GetValue( int row, int col )
     {
         return wxString::Format("(%d, %d)", row, col);
@@ -154,6 +165,22 @@ private:
     BigGridTable* m_table;
 };
 
+// ----------------------------------------------------------------------------
+// an example of custom attr provider: this one makes all odd rows appear grey
+// ----------------------------------------------------------------------------
+
+class MyGridCellAttrProvider : public wxGridCellAttrProvider
+{
+public:
+    MyGridCellAttrProvider();
+    virtual ~MyGridCellAttrProvider();
+
+    virtual wxGridCellAttr *GetAttr(int row, int col) const;
+
+private:
+    wxGridCellAttr *m_attrForOddRows;
+};
+
 // ----------------------------------------------------------------------------
 // another, more realistic, grid example: shows typed columns and more
 // ----------------------------------------------------------------------------
@@ -163,8 +190,8 @@ class BugsGridTable : public wxGridTableBase
 public:
     BugsGridTable();
 
-    virtual long GetNumberRows();
-    virtual long GetNumberCols();
+    virtual int GetNumberRows();
+    virtual int GetNumberCols();
     virtual bool IsEmptyCell( int row, int col );
     virtual wxString GetValue( int row, int col );
     virtual void SetValue( int row, int col, const wxString& value );