fixed bug with not taking background colour into account introduced in 1.24

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6d11973ad42dc5b3ee0306e7034cb8e04749a268..8c54f1eb9992ba51ec21b909e1c8f1e0dcb0ae64 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5138,7 +5138,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             if ( row >= 0 &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {
-                if ( !event.ShiftDown() && !event.ControlDown() )
+                if ( !event.ShiftDown() && !event.CmdDown() )
                     ClearSelection();
                 if ( m_selection )
                 {
@@ -5356,7 +5356,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             if ( col >= 0 &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {
-                if ( !event.ShiftDown() && !event.ControlDown() )
+                if ( !event.ShiftDown() && !event.CmdDown() )
                     ClearSelection();
                 if ( m_selection )
                 {
@@ -5634,7 +5634,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
             if ( coords != wxGridNoCellCoords )
             {
-                if ( event.ControlDown() )
+                if ( event.CmdDown() )
                 {
                     if ( m_selectingKeyboard == wxGridNoCellCoords)
                         m_selectingKeyboard = coords;
@@ -5737,7 +5737,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                        coords.GetCol(),
                        event ) )
         {
-            if ( !event.ControlDown() )
+            if ( !event.CmdDown() )
                 ClearSelection();
             if ( event.ShiftDown() )
             {
@@ -5759,7 +5759,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 DisableCellEditControl();
                 MakeCellVisible( coords );
 
-                if ( event.ControlDown() )
+                if ( event.CmdDown() )
                 {
                     if ( m_selection )
                     {
@@ -7290,7 +7290,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     return;
 #endif
 
-    if ( !m_gridLinesEnabled || m_numRows || !m_numCols )
+    if ( !m_gridLinesEnabled || !m_numRows || !m_numCols )
          return;
 
     int top, bottom, left, right;