Committing in .

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

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index 235ea69b58ecc9e78f09f13022fee74df4be26e7..8be1e673776c75157f6f538662403766ab3ca850 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 AutoSizeCols( wxCommandEvent& );
     void SetLabelColour( wxCommandEvent& );
     void SetLabelTextColour( wxCommandEvent& );

+    void SetLabelFont(wxCommandEvent &);

     void SetRowLabelHorizAlignment( wxCommandEvent& );
     void SetRowLabelVertAlignment( wxCommandEvent& );
     void SetColLabelHorizAlignment( wxCommandEvent& );
     void SetRowLabelHorizAlignment( wxCommandEvent& );
     void SetRowLabelVertAlignment( wxCommandEvent& );
     void SetColLabelHorizAlignment( wxCommandEvent& );


@@ -83,6 +84,9 @@ class GridFrame : public wxFrame
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
 
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
 

+    void OnSetHighlightWidth(wxCommandEvent&);
+    void OnSetROHighlightWidth(wxCommandEvent&);
+

 public:
     GridFrame();
     ~GridFrame();
 public:
     GridFrame();
     ~GridFrame();


@@ -104,6 +108,7 @@ public:
         ID_AUTOSIZECOLS,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,
         ID_AUTOSIZECOLS,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,

+        ID_SETLABEL_FONT,

         ID_ROWLABELALIGN,
         ID_ROWLABELHORIZALIGN,
         ID_ROWLABELVERTALIGN,
         ID_ROWLABELALIGN,
         ID_ROWLABELHORIZALIGN,
         ID_ROWLABELVERTALIGN,


@@ -135,6 +140,9 @@ public:
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
 
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
 

+        ID_SET_HIGHLIGHT_WIDTH,
+        ID_SET_RO_HIGHLIGHT_WIDTH,
+

         ID_TESTFUNC
     };
 
         ID_TESTFUNC
     };
 


@@ -171,7 +179,7 @@ public:
     int GetNumberCols() { return m_sizeGrid; }
     wxString GetValue( int row, int col )
     {
     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 */ }
     }
 
     void SetValue( int , int , const wxString&  ) { /* ignore */ }


@@ -201,7 +209,8 @@ public:
     MyGridCellAttrProvider();
     virtual ~MyGridCellAttrProvider();
 
     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;
 
 private:
     wxGridCellAttr *m_attrForOddRows;


@@ -241,5 +250,6 @@ public:
     BugsGridFrame();
 };
 
     BugsGridFrame();
 };
 

+

 #endif // griddemo_h
 
 #endif // griddemo_h