1. more test code for drawing with ROPs/masks/bg brushes in drawing

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 88a2520a583aa5954bd8d49a5319c6528e687132..1af51feba4cce20a5e32cdbb89a2e335622409c3 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1133,7 +1133,7 @@ void wxGrid::CalcDimensions()
         GetViewStart( &x, &y );
         SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
                        right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
-                       x, y, TRUE );
+                       x, y );
     }
 }
 
@@ -1612,6 +1612,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             }
         }
 
+        m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
         m_dragLastPos  = -1;
     }
 
@@ -1800,6 +1801,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             }
         }
 
+        m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
         m_dragLastPos  = -1;
     }
 
@@ -2005,6 +2007,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 // no default action at the moment
             }
         }
+
+        // ------------ Moving and no button action
+        //
+        else if ( event.Moving() && !event.IsButton() )
+        {
+            m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+        }
     }
 }