Added demonstration of insert/delete rows/cols

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

diff --git a/samples/newgrid/griddemo.cpp b/samples/newgrid/griddemo.cpp
index 66ccfe56443edfa7dbf9c1b73e8375c6a1eb5f6a..10e77f27fb0ffec46a36d087c66b234020397354 100644 (file)
--- a/samples/newgrid/griddemo.cpp
+++ b/samples/newgrid/griddemo.cpp
@@ -56,6 +56,10 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_COLLABELHORIZALIGN, GridFrame::SetColLabelHorizAlignment )    
     EVT_MENU( ID_COLLABELVERTALIGN, GridFrame::SetColLabelVertAlignment )    
     EVT_MENU( ID_GRIDLINECOLOUR, GridFrame::SetGridLineColour )
     EVT_MENU( ID_COLLABELHORIZALIGN, GridFrame::SetColLabelHorizAlignment )    
     EVT_MENU( ID_COLLABELVERTALIGN, GridFrame::SetColLabelVertAlignment )    
     EVT_MENU( ID_GRIDLINECOLOUR, GridFrame::SetGridLineColour )

+    EVT_MENU( ID_INSERTROW, GridFrame::InsertRow )
+    EVT_MENU( ID_INSERTCOL, GridFrame::InsertCol )
+    EVT_MENU( ID_DELETEROW, GridFrame::DeleteRow )
+    EVT_MENU( ID_DELETECOL, GridFrame::DeleteCol )

     EVT_MENU( ID_CLEARGRID, GridFrame::ClearGrid )
     EVT_MENU( ID_ABOUT, GridFrame::About )
     EVT_MENU( wxID_EXIT, GridFrame::OnQuit )
     EVT_MENU( ID_CLEARGRID, GridFrame::ClearGrid )
     EVT_MENU( ID_ABOUT, GridFrame::About )
     EVT_MENU( wxID_EXIT, GridFrame::OnQuit )


@@ -107,14 +111,21 @@ GridFrame::GridFrame()
     colLabelMenu->Append( ID_COLLABELVERTALIGN, "&Vertical" );
 
     viewMenu->Append( ID_GRIDLINECOLOUR, "&Grid line colour" );
     colLabelMenu->Append( ID_COLLABELVERTALIGN, "&Vertical" );
 
     viewMenu->Append( ID_GRIDLINECOLOUR, "&Grid line colour" );

-    viewMenu->Append( ID_CLEARGRID, "Cl&ear grid cell contents" );

 
 

+    wxMenu *editMenu = new wxMenu;
+    editMenu->Append( ID_INSERTROW, "Insert &row" );
+    editMenu->Append( ID_INSERTCOL, "Insert &column" );
+    editMenu->Append( ID_DELETEROW, "Delete ro&w" );
+    editMenu->Append( ID_DELETECOL, "Delete co&l" );
+    editMenu->Append( ID_CLEARGRID, "Cl&ear grid cell contents" );
+    

     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append( ID_ABOUT, "&About wxGrid demo" );
     
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append( fileMenu, "&File" );
     menuBar->Append( viewMenu, "&View" );
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append( ID_ABOUT, "&About wxGrid demo" );
     
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append( fileMenu, "&File" );
     menuBar->Append( viewMenu, "&View" );

+    menuBar->Append( editMenu, "&Edit" );

     menuBar->Append( helpMenu, "&Help" );
 
     SetMenuBar( menuBar );
     menuBar->Append( helpMenu, "&Help" );
 
     SetMenuBar( menuBar );


@@ -362,6 +373,30 @@ void GridFrame::SetGridLineColour( wxCommandEvent& WXUNUSED(ev) )
 }
 
 
 }
 
 

+void GridFrame::InsertRow( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->InsertRows( 0, 1 );
+}
+
+
+void GridFrame::InsertCol( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->InsertCols( 0, 1 );
+}
+
+
+void GridFrame::DeleteRow( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->DeleteRows( 0, 1 );
+}
+
+
+void GridFrame::DeleteCol( wxCommandEvent& WXUNUSED(ev) )
+{
+    grid->DeleteCols( 0, 1 );
+}
+
+

 void GridFrame::ClearGrid( wxCommandEvent& WXUNUSED(ev) )
 {
     grid->ClearGrid();
 void GridFrame::ClearGrid( wxCommandEvent& WXUNUSED(ev) )
 {
     grid->ClearGrid();


@@ -432,7 +467,7 @@ void GridFrame::OnCellLeftClick( wxGridEvent& ev )
     logBuf << "Cell at row " << ev.GetRow()
            << " col " << ev.GetCol();
     wxLogMessage( "%s", logBuf.c_str() );
     logBuf << "Cell at row " << ev.GetRow()
            << " col " << ev.GetCol();
     wxLogMessage( "%s", logBuf.c_str() );

-    
+

     // you must call event skip if you want default grid processing
     // (cell highlighting etc.)
     //
     // you must call event skip if you want default grid processing
     // (cell highlighting etc.)
     //

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index 4af4564ed2e6cb58f9057153b31cc1c50d7f921b..77510d31882087d4e0e53460c349a476945f2d65 100644 (file)
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -41,6 +41,11 @@ class GridFrame : public wxFrame
     void SetColLabelHorizAlignment( wxCommandEvent& );
     void SetColLabelVertAlignment( wxCommandEvent& );
     void SetGridLineColour( wxCommandEvent& );
     void SetColLabelHorizAlignment( wxCommandEvent& );
     void SetColLabelVertAlignment( wxCommandEvent& );
     void SetGridLineColour( wxCommandEvent& );

+
+    void InsertRow( wxCommandEvent& );    
+    void InsertCol( wxCommandEvent& );    
+    void DeleteRow( wxCommandEvent& );    
+    void DeleteCol( wxCommandEvent& );    

     void ClearGrid( wxCommandEvent& );
 
     void About( wxCommandEvent& );
     void ClearGrid( wxCommandEvent& );
 
     void About( wxCommandEvent& );


@@ -72,6 +77,10 @@ class GridFrame : public wxFrame
            ID_COLLABELHORIZALIGN,
            ID_COLLABELVERTALIGN,
            ID_GRIDLINECOLOUR,
            ID_COLLABELHORIZALIGN,
            ID_COLLABELVERTALIGN,
            ID_GRIDLINECOLOUR,

+           ID_INSERTROW,
+           ID_INSERTCOL,
+           ID_DELETEROW,
+           ID_DELETECOL,

            ID_CLEARGRID,
            ID_ABOUT,
 
            ID_CLEARGRID,
            ID_ABOUT,