test all selection methods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/newgrid/griddemo.cpp b/samples/newgrid/griddemo.cpp
index 1c4e4a2841baa84a822974342aed51a3c5568696..cfc2de54a5dd13e37ca4ea7fec93028e328a24ce 100644 (file)
--- a/samples/newgrid/griddemo.cpp
+++ b/samples/newgrid/griddemo.cpp
@@ -105,6 +105,7 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_SELECT_COL, GridFrame::SelectCol)
     EVT_MENU( ID_SELECT_ROW, GridFrame::SelectRow)
     EVT_MENU( ID_SELECT_ALL, GridFrame::SelectAll)
+    EVT_MENU( ID_SELECT_UNSELECT, GridFrame::OnAddToSelectToggle)
 
     EVT_GRID_LABEL_LEFT_CLICK( GridFrame::OnLabelLeftClick )
     EVT_GRID_CELL_LEFT_CLICK( GridFrame::OnCellLeftClick )
@@ -176,6 +177,9 @@ GridFrame::GridFrame()
     editMenu->Append( ID_CLEARGRID, "Cl&ear grid cell contents" );
 
     wxMenu *selectMenu = new wxMenu;
+    selectMenu->Append( ID_SELECT_UNSELECT, "Add new cells to the selection",
+                        "When off, old selection is deselected before "
+                        "selecting the new cells", TRUE );
     selectMenu->Append( ID_SELECT_ALL, "Select all");
     selectMenu->Append( ID_SELECT_ROW, "Select row 2");
     selectMenu->Append( ID_SELECT_COL, "Select col 2");
@@ -207,6 +211,8 @@ GridFrame::GridFrame()
 
     SetMenuBar( menuBar );
 
+    m_addToSel = FALSE;
+
     grid = new wxGrid( this,
                        -1,
                        wxPoint( 0, 0 ),
@@ -623,17 +629,17 @@ void GridFrame::DeselectAll(wxCommandEvent& WXUNUSED(event))
 
 void GridFrame::SelectCell(wxCommandEvent& WXUNUSED(event))
 {
-      grid->SelectBlock(3, 1, 3, 1);
+      grid->SelectBlock(3, 1, 3, 1, m_addToSel);
 }
 
 void GridFrame::SelectCol(wxCommandEvent& WXUNUSED(event))
 {
-      grid->SelectCol(2, TRUE);
+      grid->SelectCol(2, m_addToSel);
 }
 
 void GridFrame::SelectRow(wxCommandEvent& WXUNUSED(event))
 {
-      grid->SelectRow(2, TRUE);
+      grid->SelectRow(2, m_addToSel);
 }
 
 void GridFrame::SelectAll(wxCommandEvent& WXUNUSED(event))
@@ -641,6 +647,11 @@ void GridFrame::SelectAll(wxCommandEvent& WXUNUSED(event))
       grid->SelectAll();
 }
 
+void GridFrame::OnAddToSelectToggle(wxCommandEvent& event)
+{
+    m_addToSel = event.IsChecked();
+}
+
 void GridFrame::OnLabelLeftClick( wxGridEvent& ev )
 {
     logBuf = "";

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index b450ef6e00d8e445cab60d5e7f15fc952ac5071c..235ea69b58ecc9e78f09f13022fee74df4be26e7 100644 (file)
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -70,6 +70,7 @@ class GridFrame : public wxFrame
     void SelectCol(wxCommandEvent& event);
     void SelectRow(wxCommandEvent& event);
     void SelectAll(wxCommandEvent& event);
+    void OnAddToSelectToggle(wxCommandEvent& event);
 
     void OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );
@@ -115,15 +116,16 @@ public:
         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_SELECT_UNSELECT,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,
@@ -138,6 +140,9 @@ public:
 
     wxLog *m_logOld;
 
+    // add the cells to selection when using commands from select menu?
+    bool m_addToSel;
+
     DECLARE_EVENT_TABLE()
 };