X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e32352cf6600deac48d15fe1ca2ba74f3352922c..3a7bfa067e9b19cffc9d523ba83f3f4c1ad56c73:/samples/newgrid/griddemo.h?ds=inline

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index 5140bfbbb4..bdbaf2db77 100644
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -40,6 +40,8 @@ class GridFrame : public wxFrame
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );
+    void ToggleGridLines( wxCommandEvent& );
+    void AutoSizeCols( wxCommandEvent& );
     void SetLabelColour( wxCommandEvent& );
     void SetLabelTextColour( wxCommandEvent& );
     void SetRowLabelHorizAlignment( wxCommandEvent& );
@@ -60,6 +62,16 @@ class GridFrame : public wxFrame
     void SelectRows( wxCommandEvent& );
     void SelectCols( wxCommandEvent& );
 
+    void DeselectCell(wxCommandEvent& event);
+    void DeselectCol(wxCommandEvent& event);
+    void DeselectRow(wxCommandEvent& event);
+    void DeselectAll(wxCommandEvent& event);
+    void SelectCell(wxCommandEvent& event);
+    void SelectCol(wxCommandEvent& event);
+    void SelectRow(wxCommandEvent& event);
+    void SelectAll(wxCommandEvent& event);
+    void OnAddToSelectToggle(wxCommandEvent& event);
+
     void OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );
     void OnRowSize( wxGridSizeEvent& );
@@ -71,6 +83,9 @@ class GridFrame : public wxFrame
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
 
+    void OnSetHighlightWidth(wxCommandEvent&);
+    void OnSetROHighlightWidth(wxCommandEvent&);
+
 public:
     GridFrame();
     ~GridFrame();
@@ -88,6 +103,8 @@ public:
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEGRIDSIZING,
+        ID_TOGGLEGRIDLINES,
+        ID_AUTOSIZECOLS,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,
         ID_ROWLABELALIGN,
@@ -102,21 +119,36 @@ public:
         ID_DELETEROW,
         ID_DELETECOL,
         ID_CLEARGRID,
-	ID_CHANGESEL,
-	ID_SELCELLS,
-	ID_SELROWS,
-	ID_SELCOLS,
+        ID_CHANGESEL,
+        ID_SELCELLS,
+        ID_SELROWS,
+        ID_SELCOLS,
         ID_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,
         ID_ABOUT,
         ID_VTABLE,
         ID_BUGS_TABLE,
+        ID_SELECT_UNSELECT,
+        ID_SELECT_ALL,
+        ID_SELECT_ROW,
+        ID_SELECT_COL,
+        ID_SELECT_CELL,
+        ID_DESELECT_ALL,
+        ID_DESELECT_ROW,
+        ID_DESELECT_COL,
+        ID_DESELECT_CELL,
+
+        ID_SET_HIGHLIGHT_WIDTH,
+        ID_SET_RO_HIGHLIGHT_WIDTH,
 
         ID_TESTFUNC
     };
 
     wxLog *m_logOld;
 
+    // add the cells to selection when using commands from select menu?
+    bool m_addToSel;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -145,7 +177,7 @@ public:
     int GetNumberCols() { return m_sizeGrid; }
     wxString GetValue( int row, int col )
     {
-        return wxString::Format("(%d, %d)", row, col);
+        return wxString::Format(wxT("(%d, %d)"), row, col);
     }
 
     void SetValue( int , int , const wxString&  ) { /* ignore */ }
@@ -175,7 +207,8 @@ public:
     MyGridCellAttrProvider();
     virtual ~MyGridCellAttrProvider();
 
-    virtual wxGridCellAttr *GetAttr(int row, int col) const;
+    virtual wxGridCellAttr *GetAttr(int row, int col,
+                                    wxGridCellAttr::wxAttrKind  kind) const;
 
 private:
     wxGridCellAttr *m_attrForOddRows;
@@ -215,5 +248,6 @@ public:
     BugsGridFrame();
 };
 
+
 #endif // griddemo_h