Reverted patch [ 746201 ] (partially) because of unwanted side-effects

        to grids with 0 rows _or_ 0 columns.

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 511bed5c935016481e9c6984b8504de19d674d7f..45562e16be4ebb0058a563a9c7a8b5635ba4d314 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5770,7 +5770,6 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
             DisableCellEditControl();
 
         bool done = m_table->InsertRows( pos, numRows );
             DisableCellEditControl();
 
         bool done = m_table->InsertRows( pos, numRows );

-        m_numRows = m_table->GetNumberRows();

         return done;
 
         // the table will have sent the results of the insert row
         return done;
 
         // the table will have sent the results of the insert row


@@ -5793,7 +5792,6 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
     if ( m_table )
     {
         bool done = m_table && m_table->AppendRows( numRows );
     if ( m_table )
     {
         bool done = m_table && m_table->AppendRows( numRows );

-        m_numRows = m_table->GetNumberRows();

         return done;
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
         return done;
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message


@@ -5818,7 +5816,6 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
             DisableCellEditControl();
 
         bool done = m_table->DeleteRows( pos, numRows );
             DisableCellEditControl();
 
         bool done = m_table->DeleteRows( pos, numRows );

-        m_numRows = m_table->GetNumberRows();

         return done;
         // the table will have sent the results of the delete row
         // operation to this view object as a grid table message
         return done;
         // the table will have sent the results of the delete row
         // operation to this view object as a grid table message


@@ -5843,7 +5840,6 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
             DisableCellEditControl();
 
         bool done = m_table->InsertCols( pos, numCols );
             DisableCellEditControl();
 
         bool done = m_table->InsertCols( pos, numCols );

-        m_numCols = m_table->GetNumberCols();

         return done;
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
         return done;
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message


@@ -5865,7 +5861,6 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
     if ( m_table )
     {
         bool done = m_table->AppendCols( numCols );
     if ( m_table )
     {
         bool done = m_table->AppendCols( numCols );

-        m_numCols = m_table->GetNumberCols();

         return done;
         // the table will have sent the results of the append col
         // operation to this view object as a grid table message
         return done;
         // the table will have sent the results of the append col
         // operation to this view object as a grid table message


@@ -5890,7 +5885,6 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
             DisableCellEditControl();
 
         bool done = m_table->DeleteCols( pos, numCols );
             DisableCellEditControl();
 
         bool done = m_table->DeleteCols( pos, numCols );

-        m_numCols = m_table->GetNumberCols();

         return done;
         // the table will have sent the results of the delete col
         // operation to this view object as a grid table message
         return done;
         // the table will have sent the results of the delete col
         // operation to this view object as a grid table message