X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f02438455eb15e03039d701adaec56ddf2fb97c..959b1a338e3b7c0e237b53ef3d7c9b51f4063eb6:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 6d11973ad4..8c54f1eb99 100644 --- 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;