X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e115ed2c71e11ea37c83ed44f3553523ec16560..4d51143c5e77949c4633eae3f083d40f608cf387:/src/generic/gridsel.cpp diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp index f1d62b07f6..495478bb05 100644 --- a/src/generic/gridsel.cpp +++ b/src/generic/gridsel.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// Name: generic/gridsel.cpp +// Name: src/generic/gridsel.cpp // Purpose: wxGridSelection // Author: Stefan Neis // Modified by: @@ -9,6 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + // ============================================================================ // declarations // ============================================================================ @@ -17,19 +24,11 @@ // headers // ---------------------------------------------------------------------------- -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#include "wx/defs.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - #if wxUSE_GRID #include "wx/generic/gridsel.h" + // Some explanation for the members of the class: // m_cellSelection stores individual selected cells // -- this is only used if m_selectionMode == wxGridSelectCells @@ -52,7 +51,7 @@ bool wxGridSelection::IsSelection() m_rowSelection.GetCount() || m_colSelection.GetCount() ); } -bool wxGridSelection::IsInSelection ( int row, int col ) +bool wxGridSelection::IsInSelection( int row, int col ) { size_t count; @@ -107,11 +106,12 @@ bool wxGridSelection::IsInSelection ( int row, int col ) return true; } } + return false; } // Change the selection mode -void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) +void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode ) { // if selection mode is unchanged return immediately if (selmode == m_selectionMode) @@ -144,8 +144,8 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) SelectCol( col ); } - for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++) // Note that m_blockSelectionTopLeft's size may be changing! + for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++) { wxGridCellCoords& coords = m_blockSelectionTopLeft[n]; int topRow = coords.GetRow(); @@ -153,15 +153,15 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) coords = m_blockSelectionBottomRight[n]; int bottomRow = coords.GetRow(); int rightCol = coords.GetCol(); + if (selmode == wxGrid::wxGridSelectRows) { if (leftCol != 0 || rightCol != m_grid->GetNumberCols() - 1 ) { m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - SelectBlock( topRow, 0, - bottomRow, m_grid->GetNumberCols() - 1, - false, false, false, false, false ); + SelectBlockNoEvent( topRow, 0, + bottomRow, m_grid->GetNumberCols() - 1); } } else // selmode == wxGridSelectColumns) @@ -170,22 +170,21 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) { m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - SelectBlock( 0, leftCol, - m_grid->GetNumberRows() - 1, rightCol, - false, false, false, false, false ); + SelectBlockNoEvent(0, leftCol, + m_grid->GetNumberRows() - 1, rightCol); } } } + m_selectionMode = selmode; } } -void wxGridSelection::SelectRow( int row, - bool ControlDown, bool ShiftDown, - bool AltDown, bool MetaDown ) +void wxGridSelection::SelectRow(int row, const wxKeyboardState& kbd) { if ( m_selectionMode == wxGrid::wxGridSelectColumns ) return; + size_t count, n; // Remove single cells contained in newly selected block. @@ -199,7 +198,8 @@ void wxGridSelection::SelectRow( int row, coords.GetRow(), coords.GetCol() ) ) { m_cellSelection.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -207,6 +207,7 @@ void wxGridSelection::SelectRow( int row, // Simplify list of selected blocks (if possible) count = m_blockSelectionTopLeft.GetCount(); bool done = false; + for ( n = 0; n < count; n++ ) { wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; @@ -217,7 +218,8 @@ void wxGridSelection::SelectRow( int row, { m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - n--; count--; + n--; + count--; } else if ( coords1.GetCol() == 0 && coords2.GetCol() == m_grid->GetNumberCols() - 1 ) @@ -269,15 +271,12 @@ void wxGridSelection::SelectRow( int row, wxGridCellCoords( row, 0 ), wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ), true, - ControlDown, ShiftDown, - AltDown, MetaDown ); + kbd); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); } -void wxGridSelection::SelectCol( int col, - bool ControlDown, bool ShiftDown, - bool AltDown, bool MetaDown ) +void wxGridSelection::SelectCol(int col, const wxKeyboardState& kbd) { if ( m_selectionMode == wxGrid::wxGridSelectRows ) return; @@ -294,7 +293,8 @@ void wxGridSelection::SelectCol( int col, coords.GetRow(), coords.GetCol() ) ) { m_cellSelection.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -312,7 +312,8 @@ void wxGridSelection::SelectCol( int col, { m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - n--; count--; + n--; + count--; } else if ( coords1.GetRow() == 0 && coords2.GetRow() == m_grid->GetNumberRows() - 1 ) @@ -364,29 +365,43 @@ void wxGridSelection::SelectCol( int col, wxGridCellCoords( 0, col ), wxGridCellCoords( m_grid->GetNumberRows() - 1, col ), true, - ControlDown, ShiftDown, - AltDown, MetaDown ); + kbd ); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); } void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, - bool ControlDown, bool ShiftDown, - bool AltDown, bool MetaDown, + const wxKeyboardState& kbd, bool sendEvent ) { // Fix the coordinates of the block if needed. - if ( m_selectionMode == wxGrid::wxGridSelectRows ) + switch ( m_selectionMode ) { - leftCol = 0; - rightCol = m_grid->GetNumberCols() - 1; - } - else if ( m_selectionMode == wxGrid::wxGridSelectColumns ) - { - topRow = 0; - bottomRow = m_grid->GetNumberRows() - 1; + default: + wxFAIL_MSG( "unknown selection mode" ); + // fall through + + case wxGrid::wxGridSelectCells: + // nothing to do -- in this mode arbitrary blocks can be selected + break; + + case wxGrid::wxGridSelectRows: + leftCol = 0; + rightCol = m_grid->GetNumberCols() - 1; + break; + + case wxGrid::wxGridSelectColumns: + topRow = 0; + bottomRow = m_grid->GetNumberRows() - 1; + break; + + case wxGrid::wxGridSelectRowsOrColumns: + // block selection doesn't make sense for this mode, we could only + // select the entire grid but this wouldn't be useful + return; } + if ( topRow > bottomRow ) { int temp = topRow; @@ -407,10 +422,12 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, // grid only has 1 col) if ( m_selectionMode == wxGrid::wxGridSelectCells && topRow == bottomRow && leftCol == rightCol ) - SelectCell( topRow, leftCol, ControlDown, ShiftDown, - AltDown, MetaDown, sendEvent ); + { + SelectCell( topRow, leftCol, kbd, sendEvent ); + } size_t count, n; + // Remove single cells contained in newly selected block. if ( m_selectionMode == wxGrid::wxGridSelectCells ) { @@ -422,7 +439,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, coords.GetRow(), coords.GetCol() ) ) { m_cellSelection.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -435,6 +453,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, { wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; + switch ( BlockContain( coords1.GetRow(), coords1.GetCol(), coords2.GetRow(), coords2.GetCol(), topRow, leftCol, bottomRow, rightCol ) ) @@ -445,7 +464,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, case -1: m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - n--; count--; + n--; + count--; break; default: @@ -461,7 +481,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, for ( n = 0; n < count; n++ ) { switch ( BlockContain( m_rowSelection[n], 0, - m_rowSelection[n], m_grid->GetNumberCols()-1, + m_rowSelection[n], m_grid->GetNumberCols() - 1, topRow, leftCol, bottomRow, rightCol ) ) { case 1: @@ -469,7 +489,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, case -1: m_rowSelection.RemoveAt(n); - n--; count--; + n--; + count--; break; default: @@ -477,13 +498,14 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, } } } + if ( m_selectionMode != wxGrid::wxGridSelectRows ) { count = m_colSelection.GetCount(); for ( n = 0; n < count; n++ ) { switch ( BlockContain( 0, m_colSelection[n], - m_grid->GetNumberRows()-1, m_colSelection[n], + m_grid->GetNumberRows() - 1, m_colSelection[n], topRow, leftCol, bottomRow, rightCol ) ) { case 1: @@ -491,7 +513,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, case -1: m_colSelection.RemoveAt(n); - n--; count--; + n--; + count--; break; default: @@ -499,6 +522,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, } } } + m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) ); m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) ); @@ -514,43 +538,43 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, if ( sendEvent ) { wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( topRow, leftCol ), - wxGridCellCoords( bottomRow, rightCol ), - true, - ControlDown, ShiftDown, - AltDown, MetaDown ); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); + wxEVT_GRID_RANGE_SELECT, + m_grid, + wxGridCellCoords( topRow, leftCol ), + wxGridCellCoords( bottomRow, rightCol ), + true, + kbd); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); } } void wxGridSelection::SelectCell( int row, int col, - bool ControlDown, bool ShiftDown, - bool AltDown, bool MetaDown, + const wxKeyboardState& kbd, bool sendEvent ) { if ( m_selectionMode == wxGrid::wxGridSelectRows ) { - SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1, - ControlDown, ShiftDown, AltDown, MetaDown, sendEvent); + SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1, kbd, sendEvent); + return; } else if ( m_selectionMode == wxGrid::wxGridSelectColumns ) { - SelectBlock(0, col, m_grid->GetNumberRows() - 1, col, - ControlDown, ShiftDown, AltDown, MetaDown, sendEvent); + SelectBlock(0, col, m_grid->GetNumberRows() - 1, col, kbd, sendEvent); + return; } else if ( IsInSelection ( row, col ) ) return; + m_cellSelection.Add( wxGridCellCoords( row, col ) ); // Update View: if ( !m_grid->GetBatchCount() ) { - wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ) ); + wxRect r = m_grid->BlockToDeviceRect( + wxGridCellCoords( row, col ), + wxGridCellCoords( row, col ) ); ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); } @@ -558,26 +582,25 @@ void wxGridSelection::SelectCell( int row, int col, if (sendEvent) { wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ), - true, - ControlDown, ShiftDown, - AltDown, MetaDown); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); + wxEVT_GRID_RANGE_SELECT, + m_grid, + wxGridCellCoords( row, col ), + wxGridCellCoords( row, col ), + true, + kbd); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); } } -void wxGridSelection::ToggleCellSelection( int row, int col, - bool ControlDown, bool ShiftDown, - bool AltDown, bool MetaDown ) +void +wxGridSelection::ToggleCellSelection(int row, int col, + const wxKeyboardState& kbd) { // if the cell is not selected, select it if ( !IsInSelection ( row, col ) ) { - SelectCell( row, col, ControlDown, ShiftDown, - AltDown, MetaDown ); + SelectCell(row, col, kbd); + return; } @@ -613,9 +636,9 @@ void wxGridSelection::ToggleCellSelection( int row, int col, wxGridCellCoords( row, col ), wxGridCellCoords( row, col ), false, - ControlDown, ShiftDown, - AltDown, MetaDown ); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); + kbd ); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); + return; } } @@ -642,42 +665,42 @@ void wxGridSelection::ToggleCellSelection( int row, int col, count = m_blockSelectionTopLeft.GetCount(); for ( n = 0; n < count; n++ ) - { + { wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; int topRow = coords1.GetRow(); int leftCol = coords1.GetCol(); int bottomRow = coords2.GetRow(); int rightCol = coords2.GetCol(); - if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, - row, col ) ) + + if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, row, col ) ) { // remove the block m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - n--; count--; + n--; + count--; + // add up to 4 smaller blocks and set update region if ( m_selectionMode != wxGrid::wxGridSelectColumns ) { if ( topRow < row ) - SelectBlock( topRow, leftCol, row - 1, rightCol, - false, false, false, false, false ); + SelectBlockNoEvent(topRow, leftCol, row - 1, rightCol); if ( bottomRow > row ) - SelectBlock( row + 1, leftCol, bottomRow, rightCol, - false, false, false, false, false ); + SelectBlockNoEvent(row + 1, leftCol, bottomRow, rightCol); } + if ( m_selectionMode != wxGrid::wxGridSelectRows ) { if ( leftCol < col ) - SelectBlock( row, leftCol, row, col - 1, - false, false, false, false, false ); + SelectBlockNoEvent(row, leftCol, row, col - 1); if ( rightCol > col ) - SelectBlock( row, col + 1, row, rightCol, - false, false, false, false, false ); + SelectBlockNoEvent(row, col + 1, row, rightCol); } } } + bool rowSelectionWasChanged = false; // remove a cell from a row, adding up to two new blocks if ( m_selectionMode != wxGrid::wxGridSelectColumns ) { @@ -687,21 +710,24 @@ void wxGridSelection::ToggleCellSelection( int row, int col, if ( m_rowSelection[n] == row ) { m_rowSelection.RemoveAt(n); - n--; count--; + n--; + count--; + + rowSelectionWasChanged = true; + if (m_selectionMode == wxGrid::wxGridSelectCells) { if ( col > 0 ) - SelectBlock( row, 0, row, col - 1, - false, false, false, false, false ); + SelectBlockNoEvent(row, 0, row, col - 1); if ( col < m_grid->GetNumberCols() - 1 ) - SelectBlock( row, col + 1, - row, m_grid->GetNumberCols() - 1, - false, false, false, false, false ); + SelectBlockNoEvent( row, col + 1, + row, m_grid->GetNumberCols() - 1); } } } } + bool colSelectionWasChanged = false; // remove a cell from a column, adding up to two new blocks if ( m_selectionMode != wxGrid::wxGridSelectRows ) { @@ -711,16 +737,18 @@ void wxGridSelection::ToggleCellSelection( int row, int col, if ( m_colSelection[n] == col ) { m_colSelection.RemoveAt(n); - n--; count--; + n--; + count--; + + colSelectionWasChanged = true; + if (m_selectionMode == wxGrid::wxGridSelectCells) { if ( row > 0 ) - SelectBlock( 0, col, row - 1, col, - false, false, false, false, false ); + SelectBlockNoEvent(0, col, row - 1, col); if ( row < m_grid->GetNumberRows() - 1 ) - SelectBlock( row + 1, col, - m_grid->GetNumberRows() - 1, col, - false, false, false, false, false ); + SelectBlockNoEvent(row + 1, col, + m_grid->GetNumberRows() - 1, col); } } } @@ -729,68 +757,92 @@ void wxGridSelection::ToggleCellSelection( int row, int col, // Refresh the screen and send the event; according to m_selectionMode, // we need to either update only the cell, or the whole row/column. wxRect r; - switch (m_selectionMode) + if ( m_selectionMode == wxGrid::wxGridSelectCells ) { - case wxGrid::wxGridSelectCells: - { - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } + if ( !m_grid->GetBatchCount() ) + { + r = m_grid->BlockToDeviceRect( + wxGridCellCoords( row, col ), + wxGridCellCoords( row, col ) ); + ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + } - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ), - false, - ControlDown, ShiftDown, - AltDown, MetaDown ); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); - break; - } - case wxGrid::wxGridSelectRows: - { - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ), - wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } + wxGridRangeSelectEvent gridEvt( m_grid->GetId(), + wxEVT_GRID_RANGE_SELECT, + m_grid, + wxGridCellCoords( row, col ), + wxGridCellCoords( row, col ), + false, + kbd ); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); + } + else // rows/columns selection mode + { + if ( m_selectionMode != wxGrid::wxGridSelectColumns && + rowSelectionWasChanged ) + { + int numCols = m_grid->GetNumberCols(); + for ( int colFrom = 0, colTo = 0; colTo <= numCols; ++colTo ) + { + if ( m_colSelection.Index(colTo) >= 0 || colTo == numCols ) + { + if ( colFrom < colTo ) + { + if ( !m_grid->GetBatchCount() ) + { + r = m_grid->BlockToDeviceRect( + wxGridCellCoords( row, colFrom ), + wxGridCellCoords( row, colTo-1 ) ); + ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + } + + wxGridRangeSelectEvent gridEvt( m_grid->GetId(), + wxEVT_GRID_RANGE_SELECT, + m_grid, + wxGridCellCoords( row, colFrom ), + wxGridCellCoords( row, colTo - 1 ), + false, + kbd ); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); + } - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, 0 ), - wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ), - false, - ControlDown, ShiftDown, - AltDown, MetaDown ); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); - break; - } - case wxGrid::wxGridSelectColumns: - { - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ), - wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } + colFrom = colTo + 1; + } + } + } - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( 0, col ), - wxGridCellCoords( m_grid->GetNumberRows() - 1, col ), - false, - ControlDown, ShiftDown, - AltDown, MetaDown ); - m_grid->GetEventHandler()->ProcessEvent(gridEvt); - break; - } + if ( m_selectionMode != wxGrid::wxGridSelectRows && + colSelectionWasChanged ) + { + int numRows = m_grid->GetNumberRows(); + for ( int rowFrom = 0, rowTo = 0; rowTo <= numRows; ++rowTo ) + { + if ( m_rowSelection.Index(rowTo) >= 0 || rowTo == numRows ) + { + if (rowFrom < rowTo) + { + if ( !m_grid->GetBatchCount() ) + { + r = m_grid->BlockToDeviceRect( + wxGridCellCoords( rowFrom, col ), + wxGridCellCoords( rowTo - 1, col ) ); + ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + } + + wxGridRangeSelectEvent gridEvt( m_grid->GetId(), + wxEVT_GRID_RANGE_SELECT, + m_grid, + wxGridCellCoords( rowFrom, col ), + wxGridCellCoords( rowTo - 1, col ), + false, + kbd ); + m_grid->GetEventHandler()->ProcessEvent( gridEvt ); + } + + rowFrom = rowTo + 1; + } + } + } } } @@ -800,10 +852,10 @@ void wxGridSelection::ClearSelection() wxRect r; wxGridCellCoords coords1, coords2; - // deselect all invidiual cells and update the screen + // deselect all individual cells and update the screen if ( m_selectionMode == wxGrid::wxGridSelectCells ) { - while( ( n = m_cellSelection.GetCount() ) > 0) + while ( ( n = m_cellSelection.GetCount() ) > 0) { n--; coords1 = m_cellSelection[n]; @@ -812,6 +864,7 @@ void wxGridSelection::ClearSelection() { r = m_grid->BlockToDeviceRect( coords1, coords1 ); ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + #ifdef __WXMAC__ ((wxWindow *)m_grid->m_gridWin)->Update(); #endif @@ -820,7 +873,7 @@ void wxGridSelection::ClearSelection() } // deselect all blocks and update the screen - while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0) + while ( ( n = m_blockSelectionTopLeft.GetCount() ) > 0) { n--; coords1 = m_blockSelectionTopLeft[n]; @@ -831,6 +884,7 @@ void wxGridSelection::ClearSelection() { r = m_grid->BlockToDeviceRect( coords1, coords2 ); ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + #ifdef __WXMAC__ ((wxWindow *)m_grid->m_gridWin)->Update(); #endif @@ -840,7 +894,7 @@ void wxGridSelection::ClearSelection() // deselect all rows and update the screen if ( m_selectionMode != wxGrid::wxGridSelectColumns ) { - while( ( n = m_rowSelection.GetCount() ) > 0) + while ( ( n = m_rowSelection.GetCount() ) > 0) { n--; int row = m_rowSelection[n]; @@ -850,6 +904,7 @@ void wxGridSelection::ClearSelection() r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ), wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) ); ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + #ifdef __WXMAC__ ((wxWindow *)m_grid->m_gridWin)->Update(); #endif @@ -860,7 +915,7 @@ void wxGridSelection::ClearSelection() // deselect all columns and update the screen if ( m_selectionMode != wxGrid::wxGridSelectRows ) { - while( ( n = m_colSelection.GetCount() ) > 0) + while ( ( n = m_colSelection.GetCount() ) > 0) { n--; int col = m_colSelection[n]; @@ -870,6 +925,7 @@ void wxGridSelection::ClearSelection() r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ), wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) ); ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); + #ifdef __WXMAC__ ((wxWindow *)m_grid->m_gridWin)->Update(); #endif @@ -884,8 +940,9 @@ void wxGridSelection::ClearSelection() wxEVT_GRID_RANGE_SELECT, m_grid, wxGridCellCoords( 0, 0 ), - wxGridCellCoords( m_grid->GetNumberRows() - 1, - m_grid->GetNumberCols() - 1 ), + wxGridCellCoords( + m_grid->GetNumberRows() - 1, + m_grid->GetNumberCols() - 1 ), false ); m_grid->GetEventHandler()->ProcessEvent(gridEvt); @@ -919,7 +976,8 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows ) { // ...or remove the attribute m_cellSelection.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -932,14 +990,15 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows ) wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; wxCoord row1 = coords1.GetRow(); wxCoord row2 = coords2.GetRow(); + if ((size_t)row2 >= pos) { if (numRows > 0) { // If rows inserted, increase row counter where necessary - coords2.SetRow(row2 + numRows); - if ( (size_t)row1 >= pos ) - coords1.SetRow(row1 + numRows); + coords2.SetRow( row2 + numRows ); + if ((size_t)row1 >= pos) + coords1.SetRow( row1 + numRows ); } else if (numRows < 0) { @@ -947,22 +1006,23 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows ) if ((size_t)row2 >= pos - numRows) { // ...either decrement row counter (if row still exists)... - coords2.SetRow(row2 + numRows); - if ( (size_t) row1 >= pos) - coords1.SetRow( wxMax(row1 + numRows, (int) pos) ); + coords2.SetRow( row2 + numRows ); + if ((size_t)row1 >= pos) + coords1.SetRow( wxMax(row1 + numRows, (int)pos) ); } else { - if ( (size_t) row1 >= pos) + if ((size_t)row1 >= pos) { // ...or remove the attribute m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - n--; count--; + n--; + count--; } else - coords2.SetRow(pos); + coords2.SetRow( pos ); } } } @@ -971,21 +1031,21 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows ) count = m_rowSelection.GetCount(); for ( n = 0; n < count; n++ ) { - int rowOrCol_ = m_rowSelection [ n ]; + int rowOrCol_ = m_rowSelection[n]; - if ( ( size_t ) rowOrCol_ >= pos ) + if ((size_t) rowOrCol_ >= pos) { if ( numRows > 0 ) { - m_rowSelection [ n ] += numRows; + m_rowSelection[n] += numRows; } else if ( numRows < 0 ) { - if ( ( size_t ) rowOrCol_ >= ( pos - numRows ) ) - m_rowSelection [ n ] += numRows; + if ((size_t)rowOrCol_ >= (pos - numRows)) + m_rowSelection[n] += numRows; else { - m_rowSelection.RemoveAt ( n ); + m_rowSelection.RemoveAt( n ); n--; count--; } @@ -1004,6 +1064,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols ) { size_t count = m_cellSelection.GetCount(); size_t n; + for ( n = 0; n < count; n++ ) { wxGridCellCoords& coords = m_cellSelection[n]; @@ -1027,7 +1088,8 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols ) { // ...or remove the attribute m_cellSelection.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -1040,13 +1102,14 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols ) wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; wxCoord col1 = coords1.GetCol(); wxCoord col2 = coords2.GetCol(); + if ((size_t)col2 >= pos) { if (numCols > 0) { // If rows inserted, increase row counter where necessary coords2.SetCol(col2 + numCols); - if ( (size_t)col1 >= pos ) + if ((size_t)col1 >= pos) coords1.SetCol(col1 + numCols); } else if (numCols < 0) @@ -1057,17 +1120,18 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols ) // ...either decrement col counter (if col still exists)... coords2.SetCol(col2 + numCols); if ( (size_t) col1 >= pos) - coords1.SetCol( wxMax(col1 + numCols, (int) pos) ); + coords1.SetCol( wxMax(col1 + numCols, (int)pos) ); } else { - if ( (size_t) col1 >= pos) + if ((size_t)col1 >= pos) { // ...or remove the attribute m_blockSelectionTopLeft.RemoveAt(n); m_blockSelectionBottomRight.RemoveAt(n); - n--; count--; + n--; + count--; } else coords2.SetCol(pos); @@ -1079,25 +1143,24 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols ) count = m_colSelection.GetCount(); for ( n = 0; n < count; n++ ) { + int rowOrCol = m_colSelection[n]; - int rowOrCol = m_colSelection [ n ]; - if ( ( size_t ) rowOrCol >= pos ) + if ((size_t)rowOrCol >= pos) { if ( numCols > 0 ) - m_colSelection [ n ] += numCols; + m_colSelection[n] += numCols; else if ( numCols < 0 ) { - if ( ( size_t ) rowOrCol >= ( pos -numCols ) ) - m_colSelection [ n ] += numCols; + if ((size_t)rowOrCol >= (pos - numCols)) + m_colSelection[n] += numCols; else { - m_colSelection.RemoveAt ( n ); + m_colSelection.RemoveAt( n ); n--; count--; } } } - } // No need to touch selected rows, unless we removed _all_ @@ -1106,7 +1169,6 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols ) m_rowSelection.Clear(); } - int wxGridSelection::BlockContain( int topRow1, int leftCol1, int bottomRow1, int rightCol1, int topRow2, int leftCol2, @@ -1121,6 +1183,7 @@ int wxGridSelection::BlockContain( int topRow1, int leftCol1, else if ( topRow2 <= topRow1 && bottomRow1 <= bottomRow2 && leftCol2 <= leftCol1 && rightCol1 <= rightCol2 ) return -1; + return 0; }