Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / samples / newgrid / griddemo.h

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index b35d9cfc5922d5354f216da046a3636612a652e9..7ef57a40d5069fca976ccf9345604c704a122586 100644 (file)
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -44,6 +44,7 @@ class GridFrame : public wxFrame
     void AutoSizeCols( wxCommandEvent& );
     void SetLabelColour( wxCommandEvent& );
     void SetLabelTextColour( wxCommandEvent& );
+    void SetLabelFont(wxCommandEvent &);
     void SetRowLabelHorizAlignment( wxCommandEvent& );
     void SetRowLabelVertAlignment( wxCommandEvent& );
     void SetColLabelHorizAlignment( wxCommandEvent& );
@@ -94,6 +95,7 @@ public:
     void About( wxCommandEvent& );
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
+    void OnSmallGrid( wxCommandEvent& );
 
     enum
     {
@@ -107,6 +109,7 @@ public:
         ID_AUTOSIZECOLS,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,
+        ID_SETLABEL_FONT,
         ID_ROWLABELALIGN,
         ID_ROWLABELHORIZALIGN,
         ID_ROWLABELVERTALIGN,
@@ -128,6 +131,7 @@ public:
         ID_ABOUT,
         ID_VTABLE,
         ID_BUGS_TABLE,
+        ID_SMALL_GRID,
         ID_SELECT_UNSELECT,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
@@ -177,7 +181,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 */ }
@@ -207,7 +211,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;
@@ -247,5 +252,6 @@ public:
     BugsGridFrame();
 };
 
+
 #endif // griddemo_h