image handlers moved to separate headers (imagbmp.h etc.) This change is backward...

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 8850bc7742ff79e66edd4b5d752d9150c7c7fd67..4d9ee47b8025d026e98902f97921f51cc162000f 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1,4 +1,4 @@
-////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////

 // Name:        grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Name:        grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)


@@ -9,24 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#include "wx/defs.h"
-
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID) 
-#include "gridg.cpp"
-#else
-

 #ifdef __GNUG__
     #pragma implementation "grid.h"
 #endif
 
 #ifdef __GNUG__
     #pragma implementation "grid.h"
 #endif
 

+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID) 
+#include "gridg.cpp"
+#else
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"


@@ -64,8 +63,8 @@ wxGridTableBase::~wxGridTableBase()
 
 bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
 {
 
 bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
 {

-    wxLogWarning( "Called grid table class function InsertRows(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
+    wxLogWarning( wxT("Called grid table class function InsertRows(pos=%d, N=%d)\n"
+                  "but your derived table class does not override this function"),

                   pos, numRows );
     
     return FALSE;
                   pos, numRows );
     
     return FALSE;


@@ -73,8 +72,8 @@ bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
 
 bool wxGridTableBase::AppendRows( size_t numRows )
 {
 
 bool wxGridTableBase::AppendRows( size_t numRows )
 {

-    wxLogWarning( "Called grid table class function AppendRows(N=%d)\n"
-                  "but your derived table class does not override this function",
+    wxLogWarning( wxT("Called grid table class function AppendRows(N=%d)\n"
+                  "but your derived table class does not override this function"),

                   numRows );
     
     return FALSE;
                   numRows );
     
     return FALSE;


@@ -82,8 +81,8 @@ bool wxGridTableBase::AppendRows( size_t numRows )
 
 bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
 {
 
 bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
 {

-    wxLogWarning( "Called grid table class function DeleteRows(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
+    wxLogWarning( wxT("Called grid table class function DeleteRows(pos=%d, N=%d)\n"
+                  "but your derived table class does not override this function"),

                   pos, numRows );
     
     return FALSE;
                   pos, numRows );
     
     return FALSE;


@@ -91,8 +90,8 @@ bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
 
 bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
 {
 
 bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
 {

-    wxLogWarning( "Called grid table class function InsertCols(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
+    wxLogWarning( wxT("Called grid table class function InsertCols(pos=%d, N=%d)\n"
+                  "but your derived table class does not override this function"),

                   pos, numCols );
     
     return FALSE;
                   pos, numCols );
     
     return FALSE;


@@ -100,8 +99,8 @@ bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
 
 bool wxGridTableBase::AppendCols( size_t numCols )
 {
 
 bool wxGridTableBase::AppendCols( size_t numCols )
 {

-    wxLogWarning( "Called grid table class function AppendCols(N=%d)\n"
-                  "but your derived table class does not override this function",
+    wxLogWarning( wxT("Called grid table class function AppendCols(N=%d)\n"
+                  "but your derived table class does not override this function"),

                   numCols );
     
     return FALSE;
                   numCols );
     
     return FALSE;


@@ -109,8 +108,8 @@ bool wxGridTableBase::AppendCols( size_t numCols )
 
 bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
 {
 
 bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
 {

-    wxLogWarning( "Called grid table class function DeleteCols(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
+    wxLogWarning( wxT("Called grid table class function DeleteCols(pos=%d, N=%d)\n"
+                  "but your derived table class does not override this function"),

                   pos, numCols );
     
     return FALSE;
                   pos, numCols );
     
     return FALSE;


@@ -185,7 +184,7 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
 
 
 // this is a magic incantation which must be done!
 
 
 // this is a magic incantation which must be done!

-#include <wx/arrimpl.cpp>
+#include "wx/arrimpl.cpp"

 
 WX_DEFINE_OBJARRAY(wxGridStringArray)
 
 
 WX_DEFINE_OBJARRAY(wxGridStringArray)
 


@@ -355,8 +354,8 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
     
     if ( pos >= curNumRows )
     {
     
     if ( pos >= curNumRows )
     {

-        wxLogError( "Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n"
-                    "Pos value is invalid for present table with %d rows",
+        wxLogError( wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n"
+                    "Pos value is invalid for present table with %d rows"),

                     pos, numRows, curNumRows );
         return FALSE;
     }
                     pos, numRows, curNumRows );
         return FALSE;
     }


@@ -433,8 +432,8 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     {
         // TODO: something better than this ?
         //
     {
         // TODO: something better than this ?
         //

-        wxLogError( "Unable to append cols to a grid table with no rows.\n"
-                    "Call AppendRows() first" );
+        wxLogError( wxT("Unable to append cols to a grid table with no rows.\n"
+                    "Call AppendRows() first") );

         return FALSE;
     }
     
         return FALSE;
     }
     


@@ -467,8 +466,8 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
     
     if ( pos >= curNumCols )
     {
     
     if ( pos >= curNumCols )
     {

-       wxLogError( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
-                   "Pos value is invalid for present table with %d cols",
+       wxLogError( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
+                   "Pos value is invalid for present table with %d cols"),

                    pos, numCols, curNumCols );
        return FALSE;
     }
                    pos, numCols, curNumCols );
        return FALSE;
     }


@@ -602,6 +601,8 @@ void wxGridTextCtrl::OnKeyDown( wxKeyEvent& ev )
         case WXK_DOWN:
         case WXK_LEFT:
         case WXK_RIGHT:
         case WXK_DOWN:
         case WXK_LEFT:
         case WXK_RIGHT:

+        case WXK_PRIOR:
+        case WXK_NEXT:

         case WXK_RETURN:
             if ( m_isCellControl )
             {
         case WXK_RETURN:
             if ( m_isCellControl )
             {


@@ -739,20 +740,24 @@ void wxGrid::Init()
 
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );
 
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );

+    m_sumRowHeights = 0;

     for ( i = 0;  i < m_numRows;  i++ )
     {
         m_rowHeights.Add( m_defaultRowHeight );
         m_rowBottoms.Add( 0 );  // set by CalcDimensions()
     }
     for ( i = 0;  i < m_numRows;  i++ )
     {
         m_rowHeights.Add( m_defaultRowHeight );
         m_rowBottoms.Add( 0 );  // set by CalcDimensions()
     }

-
+    m_sumRowHeights = m_defaultRowHeight * m_numRows;
+        

     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numRows );
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numRows );

+    m_sumColWidths = 0;

     for ( i = 0;  i < m_numCols;  i++ )
     {
         m_colWidths.Add( m_defaultColWidth );
         m_colRights.Add( 0 );  // set by CalcDimensions()
     }
     for ( i = 0;  i < m_numCols;  i++ )
     {
         m_colWidths.Add( m_defaultColWidth );
         m_colRights.Add( 0 );  // set by CalcDimensions()
     }

-
+    m_sumColWidths = m_defaultColWidth * m_numCols;
+        

     // TODO: improve this ?
     //
     m_defaultCellFont = this->GetFont();
     // TODO: improve this ?
     //
     m_defaultCellFont = this->GetFont();


@@ -805,10 +810,9 @@ void wxGrid::Init()
                                          wxGRID_CELLCTRL,
                                          "",
                                          wxPoint(1,1),
                                          wxGRID_CELLCTRL,
                                          "",
                                          wxPoint(1,1),

-                                         wxSize(1,1),
-                                         wxNO_BORDER
+                                         wxSize(1,1)

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                                         | wxTE_MULTILINE | wxTE_NO_VSCROLL
+                                         , wxTE_MULTILINE | wxTE_NO_VSCROLL

 #endif
                                          );
                                          
 #endif
                                          );
                                          


@@ -816,9 +820,10 @@ void wxGrid::Init()
     m_cellEditCtrlEnabled = TRUE;
     m_editCtrlType = wxGRID_TEXTCTRL;    
     
     m_cellEditCtrlEnabled = TRUE;
     m_editCtrlType = wxGRID_TEXTCTRL;    
     

-    // Not really needed here, it gets called by OnSize()
+    // This is here in case OnSize does not get called when the grid is
+    // displayed

     //
     //

-    // CalcDimensions();
+    CalcDimensions();

 }
 
 
 }
 
 


@@ -838,23 +843,8 @@ void wxGrid::CalcDimensions()
         m_top = 0;
     }
 
         m_top = 0;
     }
 

-    int bottom =  m_top + m_colLabelHeight;
-    for ( i = m_scrollPosY;  i < m_numRows;  i++ )
-    {
-        bottom += m_rowHeights[i];
-        m_rowBottoms[i] = bottom;
-    }
-
-    int right = m_left + m_rowLabelWidth;
-    for ( i = m_scrollPosX;  i < m_numCols;  i++ )
-    {
-        right += m_colWidths[i];
-        m_colRights[i] = right;
-    }    
-
-    // adjust the scroll bars
+    // check to see if either of the scroll bars are required

     //
     //

-    

     int cw, ch;
     GetClientSize(&cw, &ch);
 
     int cw, ch;
     GetClientSize(&cw, &ch);
 


@@ -870,58 +860,84 @@ void wxGrid::CalcDimensions()
     int check;
     for ( check = 0;  check < 2;  check++ )
     {
     int check;
     for ( check = 0;  check < 2;  check++ )
     {

-        if ( m_numRows > 0  &&
-             m_rowBottoms[m_numRows-1] + horizScrollBarHeight > ch )
+        if ( m_top + m_colLabelHeight + m_sumRowHeights + horizScrollBarHeight > ch )

         {
             vertScrollBarWidth = m_scrollBarWidth;
         {
             vertScrollBarWidth = m_scrollBarWidth;

+        }

 
 

-            m_wholeRowsVisible = 0;
-            for ( i = m_scrollPosY; i < m_numRows; i++ )
-            {
-                // A partial row doesn't count, we still have to scroll to
-                // see the rest of it
-                if ( m_rowBottoms[i] + horizScrollBarHeight > ch ) break;
+        if ( m_left + m_rowLabelWidth + m_sumColWidths + vertScrollBarWidth > cw)
+        {
+            horizScrollBarHeight = m_scrollBarWidth;
+        }
+    }

 
 

-                m_wholeRowsVisible++ ;
-            }
+
+    // if the window has been resized while scrolled then the scroll
+    // position might need to be adjusted...
+    //
+    bool adjustScrollPos = FALSE;
+    if ( !vertScrollBarWidth )
+    {
+        if ( m_scrollPosY )
+        {
+            adjustScrollPos = TRUE;
+            m_scrollPosY = 0;

         }
         }

-        else  
+    }
+    if ( !horizScrollBarHeight )
+    {
+        if ( m_scrollPosX )

         {
         {

-            m_wholeRowsVisible = m_numRows - m_scrollPosY;
-            if ( m_scrollPosY )
-            {
-                vertScrollBarWidth = m_scrollBarWidth;
-            }
+            adjustScrollPos = TRUE;
+            m_scrollPosX = 0;

         }
         }

-        
+    }
+
+    
+    // calculate the coords of row bottom edges and col right edges
+    //
+    int bottom =  m_top + m_colLabelHeight;
+    for ( i = m_scrollPosY;  i < m_numRows;  i++ )
+    {
+        bottom += m_rowHeights[i];
+        m_rowBottoms[i] = bottom;
+    }
+
+    int right = m_left + m_rowLabelWidth;
+    for ( i = m_scrollPosX;  i < m_numCols;  i++ )
+    {
+        right += m_colWidths[i];
+        m_colRights[i] = right;
+    }    

 
 

-        if ( m_numCols  &&
-             m_colRights[m_numCols-1] + vertScrollBarWidth > cw)
+    
+    // check how many rows and cols are visible
+    //
+    m_wholeRowsVisible = 0;
+    if ( m_numRows > 0 )
+    {
+        for ( i = m_scrollPosY; i < m_numRows; i++ )

         {
         {

-            horizScrollBarHeight = m_scrollBarWidth;
+            // A partial row doesn't count, we still have to scroll to
+            // see the rest of it
+            if ( m_rowBottoms[i] + horizScrollBarHeight > ch ) break;

 
 

-            m_wholeColsVisible = 0;
-            for ( i = m_scrollPosX; i < m_numCols; i++ )
-            {
-                // A partial col doesn't count, we still have to scroll to
-                // see the rest of it
-                if ( m_colRights[i] + vertScrollBarWidth > cw ) break;
-                
-                m_wholeColsVisible++ ;
-            }
+            m_wholeRowsVisible++ ;

         }
         }

-        else
+    }
+
+    m_wholeColsVisible = 0;
+    if ( m_numCols )
+    {
+        for ( i = m_scrollPosX; i < m_numCols; i++ )

         {
         {

-            // we can see the right-most column
-            //
-            m_wholeColsVisible = m_numCols - m_scrollPosX;
-            if ( m_scrollPosX )
-            {
-                horizScrollBarHeight = m_scrollBarWidth;
-            }
+            // A partial col doesn't count, we still have to scroll to
+            // see the rest of it
+            if ( m_colRights[i] + vertScrollBarWidth > cw ) break;
+                
+            m_wholeColsVisible++ ;

         }
     }
         }
     }

-

     
     if ( m_vertScrollBar )
     {
     
     if ( m_vertScrollBar )
     {


@@ -979,6 +995,12 @@ void wxGrid::CalcDimensions()
         m_right = wxMin( m_colRights[m_numCols-1],
                          cw - vertScrollBarWidth );
     }
         m_right = wxMin( m_colRights[m_numCols-1],
                          cw - vertScrollBarWidth );
     }

+
+    // if the scroll position was adjusted (due to a window resize)
+    // ensure that the cell highlight and edit control are displayed
+    // correctly
+    //
+    if ( adjustScrollPos ) SelectCell( m_currentCellCoords );

 }
 
 
 }
 
 


@@ -1007,6 +1029,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             {
                 m_rowHeights.Insert( m_defaultRowHeight, pos );
                 m_rowBottoms.Insert( 0, pos );
             {
                 m_rowHeights.Insert( m_defaultRowHeight, pos );
                 m_rowBottoms.Insert( 0, pos );

+                m_sumRowHeights += m_defaultRowHeight;

             }
             m_numRows += numRows;
             CalcDimensions();
             }
             m_numRows += numRows;
             CalcDimensions();


@@ -1020,6 +1043,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             {
                 m_rowHeights.Add( m_defaultRowHeight );
                 m_rowBottoms.Add( 0 );
             {
                 m_rowHeights.Add( m_defaultRowHeight );
                 m_rowBottoms.Add( 0 );

+                m_sumRowHeights += m_defaultRowHeight;

             }
             m_numRows += numRows;
             CalcDimensions();
             }
             m_numRows += numRows;
             CalcDimensions();


@@ -1032,6 +1056,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numRows = msg.GetCommandInt2();
             for ( i = 0;  i < numRows;  i++ )
             {
             int numRows = msg.GetCommandInt2();
             for ( i = 0;  i < numRows;  i++ )
             {

+                m_sumRowHeights -= m_rowHeights[ pos ];

                 m_rowHeights.Remove( pos );
                 m_rowBottoms.Remove( pos );
             }
                 m_rowHeights.Remove( pos );
                 m_rowBottoms.Remove( pos );
             }


@@ -1065,6 +1090,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             {
                 m_colWidths.Insert( m_defaultColWidth, pos );
                 m_colRights.Insert( 0, pos );
             {
                 m_colWidths.Insert( m_defaultColWidth, pos );
                 m_colRights.Insert( 0, pos );

+                m_sumColWidths += m_defaultColWidth;

             }
             m_numCols += numCols;
             CalcDimensions();
             }
             m_numCols += numCols;
             CalcDimensions();


@@ -1078,6 +1104,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             {
                 m_colWidths.Add( m_defaultColWidth );
                 m_colRights.Add( 0 );
             {
                 m_colWidths.Add( m_defaultColWidth );
                 m_colRights.Add( 0 );

+                m_sumColWidths += m_defaultColWidth;

             }
             m_numCols += numCols;
             CalcDimensions();
             }
             m_numCols += numCols;
             CalcDimensions();


@@ -1090,6 +1117,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt2();
             for ( i = 0;  i < numCols;  i++ )
             {
             int numCols = msg.GetCommandInt2();
             for ( i = 0;  i < numCols;  i++ )
             {

+                m_sumColWidths -= m_colWidths[ pos ];

                 m_colWidths.Remove( pos );
                 m_colRights.Remove( pos );
             }
                 m_colWidths.Remove( pos );
                 m_colRights.Remove( pos );
             }


@@ -1133,8 +1161,8 @@ bool wxGrid::SendEvent( const wxEventType type,
                        int row, int col,
                        wxMouseEvent& mouseEv )
 {
                        int row, int col,
                        wxMouseEvent& mouseEv )
 {

-    if ( type == EVT_WXGRID_ROW_SIZE ||
-        type == EVT_WXGRID_COL_SIZE )
+    if ( type == EVT_GRID_ROW_SIZE ||
+        type == EVT_GRID_COL_SIZE )

     {
        int rowOrCol = (row == -1 ? col : row);
 
     {
        int rowOrCol = (row == -1 ? col : row);
 


@@ -1150,7 +1178,7 @@ bool wxGrid::SendEvent( const wxEventType type,
 
        return GetEventHandler()->ProcessEvent(gridEvt);
     }
 
        return GetEventHandler()->ProcessEvent(gridEvt);
     }

-    else if ( type == EVT_WXGRID_RANGE_SELECT )
+    else if ( type == EVT_GRID_RANGE_SELECT )

     {
        wxGridRangeSelectEvent gridEvt( GetId(),
                                        type,
     {
        wxGridRangeSelectEvent gridEvt( GetId(),
                                        type,


@@ -1187,8 +1215,8 @@ bool wxGrid::SendEvent( const wxEventType type,
 bool wxGrid::SendEvent( const wxEventType type,
                        int row, int col )
 {
 bool wxGrid::SendEvent( const wxEventType type,
                        int row, int col )
 {

-    if ( type == EVT_WXGRID_ROW_SIZE ||
-        type == EVT_WXGRID_COL_SIZE )
+    if ( type == EVT_GRID_ROW_SIZE ||
+        type == EVT_GRID_COL_SIZE )

     {
        int rowOrCol = (row == -1 ? col : row);
 
     {
        int rowOrCol = (row == -1 ? col : row);
 


@@ -1211,7 +1239,7 @@ bool wxGrid::SendEvent( const wxEventType type,
 }
 
 
 }
 
 

-void wxGrid::OnPaint( wxPaintEvent& ev )
+void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(ev) )

 {
     wxPaintDC dc( this );
 
 {
     wxPaintDC dc( this );
 


@@ -1259,9 +1287,9 @@ void wxGrid::OnPaint( wxPaintEvent& ev )
 }
 
 
 }
 
 

-void wxGrid::OnSize( wxSizeEvent& ev )
+void wxGrid::OnSize( wxSizeEvent& WXUNUSED(ev) )

 {
 {

-    CalcDimensions();
+    if ( m_created ) CalcDimensions();

 }
 
 
 }
 
 


@@ -1293,9 +1321,29 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                         {
                            SelectBlock( cellCoords, cellCoords );
                        }
                         {
                            SelectBlock( cellCoords, cellCoords );
                        }

-                       else if ( !IsInSelection( cellCoords ) )
+                       else 

                        {
                        {

-                           SelectBlock( m_currentCellCoords, cellCoords );
+                            // check for the mouse being outside the cell area
+                            // (we still want to let the user grow the selected block)
+                            //
+                            if ( cellCoords.GetCol() == -1 )
+                            {
+                                if ( x >= m_right )
+                                    cellCoords.SetCol( m_numCols-1 );
+                                else
+                                    cellCoords.SetCol( m_scrollPosX );
+                            }
+                            
+                            if ( cellCoords.GetRow() == -1 )
+                            {
+                                if ( y >= m_bottom )
+                                    cellCoords.SetRow( m_numRows-1 );
+                                else
+                                    cellCoords.SetRow( m_scrollPosY );
+                            }
+                            
+                            if ( !IsInSelection( cellCoords ) )
+                               SelectBlock( m_currentCellCoords, cellCoords );

                        }
                     }
                 }
                        }
                     }
                 }


@@ -1380,7 +1428,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                 if ( YToEdgeOfRow(y) < 0 )
                 {
                     row = YToRow(y);
                 if ( YToEdgeOfRow(y) < 0 )
                 {
                     row = YToRow(y);

-                    if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
+                    if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) )

                     {
                         SelectRow( row, ev.ShiftDown() );
                         m_cursorMode = WXGRID_CURSOR_SELECT_ROW;
                     {
                         SelectRow( row, ev.ShiftDown() );
                         m_cursorMode = WXGRID_CURSOR_SELECT_ROW;


@@ -1398,7 +1446,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                 if ( XToEdgeOfCol(x) < 0 )
                 {
                     col = XToCol(x);
                 if ( XToEdgeOfCol(x) < 0 )
                 {
                     col = XToCol(x);

-                    if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
+                    if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) )

                     {
                         SelectCol( col, ev.ShiftDown() );
                         m_cursorMode = WXGRID_CURSOR_SELECT_COL;
                     {
                         SelectCol( col, ev.ShiftDown() );
                         m_cursorMode = WXGRID_CURSOR_SELECT_COL;


@@ -1411,7 +1459,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             {
                 // leave both row and col as -1
                 //
             {
                 // leave both row and col as -1
                 //

-                if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
+                if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) )

                 {
                     SelectAll();
                 }
                 {
                     SelectAll();
                 }


@@ -1421,7 +1469,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );

-                if ( !SendEvent( EVT_WXGRID_CELL_LEFT_CLICK,
+                if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,

                                  cellCoords.GetRow(),
                                  cellCoords.GetCol(),
                                  ev ) )
                                  cellCoords.GetRow(),
                                  cellCoords.GetCol(),
                                  ev ) )


@@ -1460,7 +1508,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                 if ( YToEdgeOfRow(y) < 0 )
                 {
                     row = YToRow(y);
                 if ( YToEdgeOfRow(y) < 0 )
                 {
                     row = YToRow(y);

-                    SendEvent(  EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
+                    SendEvent(  EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev );

                 }
             }
             break;
                 }
             }
             break;


@@ -1474,7 +1522,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                 if ( XToEdgeOfCol(x) < 0 )
                 {
                     col = XToCol(x);
                 if ( XToEdgeOfCol(x) < 0 )
                 {
                     col = XToCol(x);

-                    SendEvent(  EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
+                    SendEvent(  EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev );

                 }
             }
             break;
                 }
             }
             break;


@@ -1483,14 +1531,14 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             {
                 // leave both row and col as -1
                 //
             {
                 // leave both row and col as -1
                 //

-                SendEvent(  EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );                
+                SendEvent(  EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev );                

             }
             break;
 
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );
             }
             break;
 
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );

-                SendEvent( EVT_WXGRID_CELL_LEFT_DCLICK,
+                SendEvent( EVT_GRID_CELL_LEFT_DCLICK,

                                  cellCoords.GetRow(),
                                  cellCoords.GetCol(),
                                  ev );
                                  cellCoords.GetRow(),
                                  cellCoords.GetCol(),
                                  ev );


@@ -1526,8 +1574,11 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                    int top = m_top + m_colLabelHeight;
                    if ( m_dragRowOrCol > 0 )
                        top = m_rowBottoms[m_dragRowOrCol-1];
                    int top = m_top + m_colLabelHeight;
                    if ( m_dragRowOrCol > 0 )
                        top = m_rowBottoms[m_dragRowOrCol-1];

+
+                    m_sumRowHeights -= m_rowHeights[ m_dragRowOrCol ];

                    m_rowHeights[m_dragRowOrCol] = wxMax( ev.GetY() - top,
                                                          WXGRID_MIN_ROW_HEIGHT );
                    m_rowHeights[m_dragRowOrCol] = wxMax( ev.GetY() - top,
                                                          WXGRID_MIN_ROW_HEIGHT );

+                    m_sumRowHeights += m_rowHeights[ m_dragRowOrCol ];

                    CalcDimensions();
                    ShowCellEditControl();
                    Refresh();
                    CalcDimensions();
                    ShowCellEditControl();
                    Refresh();


@@ -1535,7 +1586,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                    // Note: we are ending the event *after* doing
                    // default processing in this case
                    //
                    // Note: we are ending the event *after* doing
                    // default processing in this case
                    //

-                   SendEvent( EVT_WXGRID_ROW_SIZE, m_dragRowOrCol, -1, ev );
+                   SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, ev );

                }
            }
            break;
                }
            }
            break;


@@ -1554,8 +1605,12 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                    int left = m_left + m_rowLabelWidth;
                    if ( m_dragRowOrCol > 0 )
                        left = m_colRights[m_dragRowOrCol-1];
                    int left = m_left + m_rowLabelWidth;
                    if ( m_dragRowOrCol > 0 )
                        left = m_colRights[m_dragRowOrCol-1];

+
+                    m_sumColWidths -= m_colWidths[m_dragRowOrCol];

                    m_colWidths[m_dragRowOrCol] = wxMax( ev.GetX() - left,
                                                         WXGRID_MIN_COL_WIDTH );
                    m_colWidths[m_dragRowOrCol] = wxMax( ev.GetX() - left,
                                                         WXGRID_MIN_COL_WIDTH );

+                    m_sumColWidths += m_colWidths[m_dragRowOrCol];
+

                    CalcDimensions();
                    ShowCellEditControl();
                    Refresh();
                    CalcDimensions();
                    ShowCellEditControl();
                    Refresh();


@@ -1563,7 +1618,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                    // Note: we are ending the event *after* doing
                    // default processing in this case
                    //
                    // Note: we are ending the event *after* doing
                    // default processing in this case
                    //

-                   SendEvent( EVT_WXGRID_COL_SIZE, -1, m_dragRowOrCol, ev );
+                   SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, ev );

                }
            }
            break;
                }
            }
            break;


@@ -1575,7 +1630,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
                    // Note: we are ending the event *after* doing
                    // default processing in this case
                    //
                    // Note: we are ending the event *after* doing
                    // default processing in this case
                    //

-                   SendEvent( EVT_WXGRID_RANGE_SELECT, -1, -1, ev );
+                   SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, ev );

                }
            }
            break;
                }
            }
            break;


@@ -1599,7 +1654,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
            case WXGRID_ROWLABEL:
            {
                row = YToRow(y);
            case WXGRID_ROWLABEL:
            {
                row = YToRow(y);

-               if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
+               if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) )

                {
                     // TODO: default processing ?
                 }
                {
                     // TODO: default processing ?
                 }


@@ -1609,7 +1664,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             case WXGRID_COLLABEL:
             {
                 col = XToCol(x);
             case WXGRID_COLLABEL:
             {
                 col = XToCol(x);

-               if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
+               if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) )

                 {
                     // TODO: default processing ?
                 }
                 {
                     // TODO: default processing ?
                 }


@@ -1620,7 +1675,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             {
                 // leave both row and col as -1
                 //
             {
                 // leave both row and col as -1
                 //

-                if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
+                if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) )

                 {
                     // TODO: default processing ?
                 }
                 {
                     // TODO: default processing ?
                 }


@@ -1630,7 +1685,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );

-                if ( !SendEvent( EVT_WXGRID_CELL_RIGHT_CLICK,
+                if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,

                                 cellCoords.GetRow(),
                                 cellCoords.GetCol(),
                                 ev ) )
                                 cellCoords.GetRow(),
                                 cellCoords.GetCol(),
                                 ev ) )


@@ -1663,14 +1718,14 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
            case WXGRID_ROWLABEL:
            {
                row = YToRow(y);
            case WXGRID_ROWLABEL:
            {
                row = YToRow(y);

-               SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
+               SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev );

             }
             break;
 
             case WXGRID_COLLABEL:
             {
                 col = XToCol(x);
             }
             break;
 
             case WXGRID_COLLABEL:
             {
                 col = XToCol(x);

-               SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
+               SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev );

             }
             break;
 
             }
             break;
 


@@ -1678,14 +1733,14 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
             {
                 // leave both row and col as -1
                 //
             {
                 // leave both row and col as -1
                 //

-                SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
+                SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev );

             }
             break;
 
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );
             }
             break;
 
             case WXGRID_CELL:
             {
                 XYToCell( x, y, cellCoords );

-                SendEvent( EVT_WXGRID_CELL_RIGHT_DCLICK,
+                SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,

                            cellCoords.GetRow(),
                            cellCoords.GetCol(),
                            ev );
                            cellCoords.GetRow(),
                            cellCoords.GetCol(),
                            ev );


@@ -1771,7 +1826,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& ev )
     {
         // shouldn't be here - we are going round in circles...
         //
     {
         // shouldn't be here - we are going round in circles...
         //

-        wxLogFatalError( "wxGrid::OnKeyDown called while alread active" );
+        wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") );

     }
 
     m_inOnKeyDown = TRUE;
     }
 
     m_inOnKeyDown = TRUE;


@@ -1887,7 +1942,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& ev )
 // Text updated in an edit control - either a text control or a
 // combo box
 //
 // Text updated in an edit control - either a text control or a
 // combo box
 //

-void wxGrid::OnText( wxKeyEvent& ev )
+void wxGrid::OnText( wxCommandEvent& ev )

 {
     if ( !m_inOnText )
     {
 {
     if ( !m_inOnText )
     {


@@ -1912,20 +1967,38 @@ void wxGrid::OnText( wxKeyEvent& ev )
                     break;
             }
         }
                     break;
             }
         }

-        else if ( ctrl == m_topEditCtrl &&
-                  IsCellEditControlEnabled() )
+        else if ( ctrl == m_topEditCtrl )

         {
         {

-            switch ( m_editCtrlType )
+            if ( IsCellEditControlEnabled() )

             {
             {

-                case wxGRID_TEXTCTRL:
-                    ((wxTextCtrl *)m_cellEditCtrl)->
-                        SetValue(((wxTextCtrl *)ctrl)->GetValue());
-                    break;
-                
-                case wxGRID_COMBOBOX:
-                    ((wxComboBox *)m_cellEditCtrl)->
-                        SetValue(((wxComboBox *)ctrl)->GetValue());
-                    break;
+                switch ( m_editCtrlType )
+                {
+                    case wxGRID_TEXTCTRL:
+                        ((wxTextCtrl *)m_cellEditCtrl)->
+                            SetValue(((wxTextCtrl *)ctrl)->GetValue());
+                        break;
+                    
+                    case wxGRID_COMBOBOX:
+                        ((wxComboBox *)m_cellEditCtrl)->
+                            SetValue(((wxComboBox *)ctrl)->GetValue());
+                        break;
+                }
+            }
+            else
+            {
+                // in the case when in-place editing is turned off we just want to 
+                // echo the text changes in the cell but not yet update the grid table
+                //
+                switch ( m_editCtrlType )
+                {
+                    case wxGRID_TEXTCTRL:
+                        DrawCellValue( m_currentCellCoords, ((wxTextCtrl *)ctrl)->GetValue() );
+                        break;
+                    
+                    case wxGRID_COMBOBOX:
+                        DrawCellValue( m_currentCellCoords, ((wxComboBox *)ctrl)->GetValue() );
+                        break;
+                }

             }
         }
     }
             }
         }
     }


@@ -1964,6 +2037,12 @@ void wxGrid::OnGridScroll( wxScrollEvent& ev )
 
 void wxGrid::SelectCell( const wxGridCellCoords& coords )
 {
 
 void wxGrid::SelectCell( const wxGridCellCoords& coords )
 {

+    if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
+    {
+        // the event has been intercepted - do nothing
+        return;
+    }
+

     wxClientDC dc( this );
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     wxClientDC dc( this );
 
     if ( m_currentCellCoords != wxGridNoCellCoords )


@@ -2153,7 +2232,7 @@ void wxGrid::SaveEditControlValue()
         
         if ( valueChanged )
         {
         
         if ( valueChanged )
         {

-            SendEvent( EVT_WXGRID_CELL_CHANGE,
+            SendEvent( EVT_GRID_CELL_CHANGE,

                        m_currentCellCoords.GetRow(),
                        m_currentCellCoords.GetCol() );
         }
                        m_currentCellCoords.GetRow(),
                        m_currentCellCoords.GetCol() );
         }


@@ -2986,7 +3065,11 @@ void wxGrid::DrawCellBackground( wxDC& dc, const wxRect& rect, int row, int col
 }
 
 
 }
 
 

-void wxGrid::DrawCellValue( wxDC& dc, const wxRect& rect, int row, int col )
+// This draws a text value in the given cell.  If useValueArg is FALSE
+// (the default) then the grid table value will be used
+//
+void wxGrid::DrawCellValue( wxDC& dc, const wxRect& rect, int row, int col,
+                            const wxString& value, bool useValueArg )

 {
     wxRect rect2;
     rect2 = rect;
 {
     wxRect rect2;
     rect2 = rect;


@@ -3013,7 +3096,37 @@ void wxGrid::DrawCellValue( wxDC& dc, const wxRect& rect, int row, int col )
     
     int hAlign, vAlign;
     GetCellAlignment( row, col, &hAlign, &vAlign );
     
     int hAlign, vAlign;
     GetCellAlignment( row, col, &hAlign, &vAlign );

-    DrawTextRectangle( dc, GetCellValue( row, col ), rect2, hAlign, vAlign );
+    
+    if ( useValueArg )
+    {
+        DrawTextRectangle( dc, value, rect2, hAlign, vAlign );
+    }
+    else
+    {
+        DrawTextRectangle( dc, GetCellValue( row, col ), rect2, hAlign, vAlign );
+    }
+}
+
+
+// this is used to echo text being entered into the top edit control when 
+// in-place editing is turned off
+//
+void wxGrid::DrawCellValue( const wxGridCellCoords& coords, const wxString& value )
+{
+    if ( IsVisible( coords ) )
+    {
+        int row = coords.GetRow();
+        int col = coords.GetCol();
+        wxRect rect;
+        rect.x = m_colRights[ col ] - m_colWidths[ col ];
+        rect.y = m_rowBottoms[ row ] - m_rowHeights[ row ];
+        rect.width =  m_colWidths[ col ];
+        rect.height = m_rowHeights[ row ];
+
+        wxClientDC dc( this );
+        DrawCellBackground( dc, rect, row, col );
+        DrawCellValue( dc, rect, row, col, value, TRUE );
+    }

 }
 
 
 }
 
 


@@ -3035,13 +3148,13 @@ void wxGrid::DrawCellHighlight( wxDC& dc, int row, int col )
         y = m_rowBottoms[row] - m_rowHeights[row];
         if ( y >= ch ) return;
 
         y = m_rowBottoms[row] - m_rowHeights[row];
         if ( y >= ch ) return;
 

-        dc.SetLogicalFunction( wxXOR );
+        dc.SetLogicalFunction( wxINVERT );

         dc.SetPen( wxPen(GetCellHighlightColour(), 2, wxSOLID) );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
 
         dc.SetPen( wxPen(GetCellHighlightColour(), 2, wxSOLID) );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
 

-        dc.DrawRectangle( x, y,
-                          m_colWidths[col] + 2,
-                          m_rowHeights[row] + 2 );
+        dc.DrawRectangle( x-2, y-2,
+                          m_colWidths[col] + 6,
+                          m_rowHeights[row] + 6 );

 
         dc.SetLogicalFunction( wxCOPY );
     }
 
         dc.SetLogicalFunction( wxCOPY );
     }


@@ -3301,7 +3414,7 @@ bool wxGrid::CreateGrid( int numRows, int numCols )
 {
     if ( m_created )
     {
 {
     if ( m_created )
     {

-        wxLogError( "wxGrid::CreateGrid(numRows, numCols) called more than once" );
+        wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) called more than once") );

         return FALSE;
     }
     else
         return FALSE;
     }
     else


@@ -3341,7 +3454,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 
     if ( !m_created )
     {
 
     if ( !m_created )
     {

-        wxLogError( "Called wxGrid::InsertRows() before calling CreateGrid()" );
+        wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );

         return FALSE;
     }
     
         return FALSE;
     }
     


@@ -3389,7 +3502,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
     
     if ( !m_created )
     {
     
     if ( !m_created )
     {

-        wxLogError( "Called wxGrid::AppendRows() before calling CreateGrid()" );
+        wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );

         return FALSE;
     }
     
         return FALSE;
     }
     


@@ -3421,7 +3534,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 
     if ( !m_created )
     {
 
     if ( !m_created )
     {

-        wxLogError( "Called wxGrid::DeleteRows() before calling CreateGrid()" );
+        wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );

         return FALSE;
     }
     
         return FALSE;
     }
     


@@ -3450,7 +3563,7 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
     
     if ( !m_created )
     {
     
     if ( !m_created )
     {

-        wxLogError( "Called wxGrid::InsertCols() before calling CreateGrid()" );
+        wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -3490,7 +3603,7 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
 
     if ( !m_created )
     {
 
     if ( !m_created )
     {

-       wxLogError( "Called wxGrid::AppendCols() before calling CreateGrid()" );
+       wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );

        return FALSE;
     }
 
        return FALSE;
     }
 


@@ -3521,7 +3634,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
     
     if ( !m_created )
     {
     
     if ( !m_created )
     {

-        wxLogError( "Called wxGrid::DeleteCols() before calling CreateGrid()" );
+        wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );

         return FALSE;
     }
     
         return FALSE;
     }
     


@@ -3587,6 +3700,9 @@ void wxGrid::EnableCellEditControl( bool enable )
     if ( m_cellEditCtrl &&
          enable != m_cellEditCtrlEnabled )
     {
     if ( m_cellEditCtrl &&
          enable != m_cellEditCtrlEnabled )
     {

+        wxClientDC dc( this );
+        
+        HideCurrentCellHighlight( dc );

         HideCellEditControl();
         SaveEditControlValue();
         
         HideCellEditControl();
         SaveEditControlValue();
         


@@ -3594,6 +3710,7 @@ void wxGrid::EnableCellEditControl( bool enable )
 
         SetEditControlValue();
         ShowCellEditControl();
 
         SetEditControlValue();
         ShowCellEditControl();

+        ShowCurrentCellHighlight( dc );

     }
 }
 
     }
 }
 


@@ -3775,7 +3892,7 @@ wxColour wxGrid::GetDefaultCellBackgroundColour()
     return wxColour( 255, 255, 255 );
 }
 
     return wxColour( 255, 255, 255 );
 }
 

-wxColour wxGrid::GetCellBackgroundColour( int row, int col )
+wxColour wxGrid::GetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col) )

 {
     // TODO: replace this temp test code
     //
 {
     // TODO: replace this temp test code
     //


@@ -3789,7 +3906,7 @@ wxColour wxGrid::GetDefaultCellTextColour()
     return wxColour( 0, 0, 0 );    
 }
 
     return wxColour( 0, 0, 0 );    
 }
 

-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxColour wxGrid::GetCellTextColour( int WXUNUSED(row), int WXUNUSED(col) )

 {
     // TODO: replace this temp test code
     //
 {
     // TODO: replace this temp test code
     //


@@ -3810,7 +3927,7 @@ wxFont wxGrid::GetDefaultCellFont()
     return m_defaultCellFont;
 }
 
     return m_defaultCellFont;
 }
 

-wxFont wxGrid::GetCellFont( int row, int col )
+wxFont wxGrid::GetCellFont( int WXUNUSED(row), int WXUNUSED(col) )

 {
     // TODO: replace this temp test code
     //
 {
     // TODO: replace this temp test code
     //


@@ -3825,7 +3942,7 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
     *vert  = wxTOP;
 }
 
     *vert  = wxTOP;
 }
 

-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int *horiz, int *vert )

 {
     // TODO: replace this temp test code
     //
 {
     // TODO: replace this temp test code
     //


@@ -3847,6 +3964,7 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
         {
             m_rowHeights[row] = m_defaultRowHeight;
         }
         {
             m_rowHeights[row] = m_defaultRowHeight;
         }

+        m_sumRowHeights = m_defaultRowHeight * m_numRows;

         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
     }
         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
     }


@@ -3856,14 +3974,16 @@ void wxGrid::SetRowSize( int row, int height )
 {
     if ( row >= 0  &&  row < m_numRows )
     {
 {
     if ( row >= 0  &&  row < m_numRows )
     {

+        m_sumRowHeights -= m_rowHeights[row];

         m_rowHeights[row] = wxMax( 0, height );
         m_rowHeights[row] = wxMax( 0, height );

+        m_sumRowHeights += m_rowHeights[row];

         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
 
         // Note: we are ending the event *after* doing
         // default processing in this case
         //
         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
 
         // Note: we are ending the event *after* doing
         // default processing in this case
         //

-        SendEvent( EVT_WXGRID_ROW_SIZE,
+        SendEvent( EVT_GRID_ROW_SIZE,

                    row, -1 );
     }
     else
                    row, -1 );
     }
     else


@@ -3886,6 +4006,7 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
         {
             m_colWidths[col] = m_defaultColWidth;
         }
         {
             m_colWidths[col] = m_defaultColWidth;
         }

+        m_sumColWidths = m_defaultColWidth * m_numCols;

         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
     }
         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
     }


@@ -3895,14 +4016,16 @@ void wxGrid::SetColSize( int col, int width )
 {
     if ( col >= 0  &&  col < m_numCols )
     {
 {
     if ( col >= 0  &&  col < m_numCols )
     {

+        m_sumColWidths -= m_colWidths[col];

         m_colWidths[col] = wxMax( 0, width );
         m_colWidths[col] = wxMax( 0, width );

+        m_sumColWidths += m_colWidths[col];

         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
 
         // Note: we are ending the event *after* doing
         // default processing in this case
         //
         CalcDimensions();
         if ( !GetBatchCount() ) Refresh();
 
         // Note: we are ending the event *after* doing
         // default processing in this case
         //

-        SendEvent( EVT_WXGRID_COL_SIZE,
+        SendEvent( EVT_GRID_COL_SIZE,

                    -1, col );
     }
     else
                    -1, col );
     }
     else


@@ -3917,7 +4040,7 @@ void wxGrid::SetDefaultCellBackgroundColour( const wxColour& )
     //
 }
 
     //
 }
 

-void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& )
+void wxGrid::SetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& )

 {
     // TODO: everything !!!
     //
 {
     // TODO: everything !!!
     //


@@ -3929,7 +4052,7 @@ void wxGrid::SetDefaultCellTextColour( const wxColour& )
     //
 }
 
     //
 }
 

-void wxGrid::SetCellTextColour( int row, int col, const wxColour& )
+void wxGrid::SetCellTextColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& )

 {
     // TODO: everything !!!
     //
 {
     // TODO: everything !!!
     //


@@ -3947,19 +4070,19 @@ void wxGrid::SetDefaultCellFont( const wxFont& )
     //
 }
 
     //
 }
 

-void wxGrid::SetCellFont( int row, int col, const wxFont& )
+void wxGrid::SetCellFont( int WXUNUSED(row), int WXUNUSED(col), const wxFont& )

 {
     // TODO: everything !!!
     //
 }
 
 {
     // TODO: everything !!!
     //
 }
 

-void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
+void wxGrid::SetDefaultCellAlignment( int WXUNUSED(horiz), int WXUNUSED(vert) )

 {
     // TODO: everything !!!
     //
 }
 
 {
     // TODO: everything !!!
     //
 }
 

-void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
+void wxGrid::SetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(horiz), int WXUNUSED(vert) )

 {
     // TODO: everything !!!
     //
 {
     // TODO: everything !!!
     //


@@ -4141,7 +4264,7 @@ void wxGrid::SelectRow( int row, bool addToSelected )
     }
     
     wxGridRangeSelectEvent gridEvt( GetId(),
     }
     
     wxGridRangeSelectEvent gridEvt( GetId(),

-                                    EVT_WXGRID_RANGE_SELECT,
+                                    EVT_GRID_RANGE_SELECT,

                                     this,
                                     m_selectedTopLeft,
                                     m_selectedBottomRight );
                                     this,
                                     m_selectedTopLeft,
                                     m_selectedBottomRight );


@@ -4178,7 +4301,7 @@ void wxGrid::SelectCol( int col, bool addToSelected )
     }
 
     wxGridRangeSelectEvent gridEvt( GetId(),
     }
 
     wxGridRangeSelectEvent gridEvt( GetId(),

-                                    EVT_WXGRID_RANGE_SELECT,
+                                    EVT_GRID_RANGE_SELECT,

                                     this,
                                     m_selectedTopLeft,
                                     m_selectedBottomRight );
                                     this,
                                     m_selectedTopLeft,
                                     m_selectedBottomRight );


@@ -4220,7 +4343,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
     if ( !m_isDragging )
     {
         wxGridRangeSelectEvent gridEvt( GetId(),
     if ( !m_isDragging )
     {
         wxGridRangeSelectEvent gridEvt( GetId(),

-                                        EVT_WXGRID_RANGE_SELECT,
+                                        EVT_GRID_RANGE_SELECT,

                                         this,
                                         m_selectedTopLeft,
                                         m_selectedBottomRight );
                                         this,
                                         m_selectedTopLeft,
                                         m_selectedBottomRight );