X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d10f4bf950c4ad064b982fe8fe07d5ca5e3af7ba..90aaa86507f004720d761a737478a99c19689078:/samples/newgrid/griddemo.h

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index d10a53a2f3..3fa91e0ce5 100644
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -42,8 +42,11 @@ class GridFrame : public wxFrame
     void ToggleGridSizing( wxCommandEvent& );
     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
+    void CellOverflow( wxCommandEvent& );
+    void ResizeCell( wxCommandEvent& );
     void SetLabelColour( wxCommandEvent& );
     void SetLabelTextColour( wxCommandEvent& );
+    void SetLabelFont(wxCommandEvent &);
     void SetRowLabelHorizAlignment( wxCommandEvent& );
     void SetRowLabelVertAlignment( wxCommandEvent& );
     void SetColLabelHorizAlignment( wxCommandEvent& );
@@ -94,6 +97,7 @@ public:
     void About( wxCommandEvent& );
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
+    void OnSmallGrid( wxCommandEvent& );
 
     enum
     {
@@ -105,8 +109,11 @@ public:
         ID_TOGGLEGRIDSIZING,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
+        ID_CELLOVERFLOW,
+        ID_RESIZECELL,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,
+        ID_SETLABEL_FONT,
         ID_ROWLABELALIGN,
         ID_ROWLABELHORIZALIGN,
         ID_ROWLABELVERTALIGN,
@@ -128,6 +135,7 @@ public:
         ID_ABOUT,
         ID_VTABLE,
         ID_BUGS_TABLE,
+        ID_SMALL_GRID,
         ID_SELECT_UNSELECT,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
@@ -177,7 +185,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 */ }