don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index b450ef6e00d8e445cab60d5e7f15fc952ac5071c..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 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& );


@@ -70,6 +71,7 @@ class GridFrame : public wxFrame
     void SelectCol(wxCommandEvent& event);
     void SelectRow(wxCommandEvent& event);
     void SelectAll(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 OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );


@@ -82,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();


@@ -90,6 +95,7 @@ public:
     void About( wxCommandEvent& );
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
     void About( wxCommandEvent& );
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );

+    void OnSmallGrid( wxCommandEvent& );

 
     enum
     {
 
     enum
     {


@@ -103,6 +109,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,


@@ -115,15 +122,17 @@ public:
         ID_DELETEROW,
         ID_DELETECOL,
         ID_CLEARGRID,
         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_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,
         ID_ABOUT,
         ID_VTABLE,
         ID_BUGS_TABLE,

+        ID_SMALL_GRID,
+        ID_SELECT_UNSELECT,

         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,


@@ -133,11 +142,17 @@ public:
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
 
         ID_DESELECT_COL,
         ID_DESELECT_CELL,
 

+        ID_SET_HIGHLIGHT_WIDTH,
+        ID_SET_RO_HIGHLIGHT_WIDTH,
+

         ID_TESTFUNC
     };
 
     wxLog *m_logOld;
 
         ID_TESTFUNC
     };
 
     wxLog *m_logOld;
 

+    // add the cells to selection when using commands from select menu?
+    bool m_addToSel;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -166,7 +181,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 */ }


@@ -196,7 +211,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;


@@ -236,5 +252,6 @@ public:
     BugsGridFrame();
 };
 
     BugsGridFrame();
 };
 

+

 #endif // griddemo_h
 
 #endif // griddemo_h