don't make wxGridTableBase::IsEmptyCell() pure virtual, there is really no point...

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 075bd336fdde1edf88f750e809ae06351664616b..5e1c924ca2f23147503df33b731b290f6eabd02f 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -918,7 +918,10 @@ public:
         { return const_cast<wxGridTableBase *>(this)->GetNumberCols(); }
 
 
         { return const_cast<wxGridTableBase *>(this)->GetNumberCols(); }
 
 

-    virtual bool IsEmptyCell( int row, int col ) = 0;
+    virtual bool IsEmptyCell( int row, int col )
+    {
+        return GetValue(row, col).empty();
+    }

 
     bool IsEmpty(const wxGridCellCoords& coord)
     {
 
     bool IsEmpty(const wxGridCellCoords& coord)
     {


@@ -1071,7 +1074,6 @@ public:
     int GetNumberCols();
     wxString GetValue( int row, int col );
     void SetValue( int row, int col, const wxString& s );
     int GetNumberCols();
     wxString GetValue( int row, int col );
     void SetValue( int row, int col, const wxString& s );

-    bool IsEmptyCell( int row, int col );

 
     // overridden functions from wxGridTableBase
     //
 
     // overridden functions from wxGridTableBase
     //

diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 057ef18b7f11dd8aae7ce7dc274a0359c806e093..3f04db61a8c06ba779283534c2c69ebbcc9be361 100644 (file)
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -673,9 +673,14 @@ public:
     //@{
 
     /**
     //@{
 
     /**

-        Must be overridden to implement testing for empty cells.
+        May be overridden to implement testing for empty cells.
+
+        This method is used by the grid to test if the given cell is not used
+        and so whether a neighbouring cell may overflow into it. By default it
+        only returns true if the value of the given cell, as returned by
+        GetValue(), is empty.

      */
      */

-    virtual bool IsEmptyCell(int row, int col) = 0;
+    virtual bool IsEmptyCell(int row, int col);

 
     /**
         Same as IsEmptyCell() but taking wxGridCellCoords.
 
     /**
         Same as IsEmptyCell() but taking wxGridCellCoords.