X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93521c94f544e3fe1db9bc3e2cc2c86aef18cfe7..3a7bfa067e9b19cffc9d523ba83f3f4c1ad56c73:/samples/newgrid/griddemo.h

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index 235ea69b58..bdbaf2db77 100644
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -83,6 +83,9 @@ class GridFrame : public wxFrame
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
 
+    void OnSetHighlightWidth(wxCommandEvent&);
+    void OnSetROHighlightWidth(wxCommandEvent&);
+
 public:
     GridFrame();
     ~GridFrame();
@@ -135,6 +138,9 @@ public:
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
 
+        ID_SET_HIGHLIGHT_WIDTH,
+        ID_SET_RO_HIGHLIGHT_WIDTH,
+
         ID_TESTFUNC
     };
 
@@ -171,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 */ }
@@ -201,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;
@@ -241,5 +248,6 @@ public:
     BugsGridFrame();
 };
 
+
 #endif // griddemo_h