Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - reformat

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-02 22:45:50 +00:00
parent ad4e3f7be6
commit a0bd314786
1 changed files with 182 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/generic/gridsel.cpp
View File

@@ -30,6 +30,7 @@
#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
@@ -107,6 +108,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
return true;
}
}
return false;
}
@@ -144,8 +146,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,6 +155,7 @@ 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 )
@@ -176,6 +179,7 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
}
}
}
m_selectionMode = selmode;
}
}
@@ -186,6 +190,7 @@ void wxGridSelection::SelectRow( int row,
{
if ( m_selectionMode == wxGrid::wxGridSelectColumns )
return;
size_t count, n;
// Remove single cells contained in newly selected block.
@@ -199,7 +204,8 @@ void wxGridSelection::SelectRow( int row,
coords.GetRow(), coords.GetCol() ) )
{
m_cellSelection.RemoveAt(n);
n--; count--;
n--;
count--;
}
}
}
@@ -207,6 +213,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 +224,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 )
@@ -294,7 +302,8 @@ void wxGridSelection::SelectCol( int col,
coords.GetRow(), coords.GetCol() ) )
{
m_cellSelection.RemoveAt(n);
n--; count--;
n--;
count--;
}
}
}
@@ -312,7 +321,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 )
@@ -387,6 +397,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
topRow = 0;
bottomRow = m_grid->GetNumberRows() - 1;
}
if ( topRow > bottomRow )
{
int temp = topRow;
@@ -407,10 +418,13 @@ 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 );
}
size_t count, n;
// Remove single cells contained in newly selected block.
if ( m_selectionMode == wxGrid::wxGridSelectCells )
{
@@ -422,7 +436,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
coords.GetRow(), coords.GetCol() ) )
{
m_cellSelection.RemoveAt(n);
n--; count--;
n--;
count--;
}
}
}
@@ -435,6 +450,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 +461,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
case -1:
m_blockSelectionTopLeft.RemoveAt(n);
m_blockSelectionBottomRight.RemoveAt(n);
n--; count--;
n--;
count--;
break;
default:
@@ -469,7 +486,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
case -1:
m_rowSelection.RemoveAt(n);
n--; count--;
n--;
count--;
break;
default:
@@ -477,6 +495,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
}
}
}
if ( m_selectionMode != wxGrid::wxGridSelectRows )
{
count = m_colSelection.GetCount();
@@ -491,7 +510,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
case -1:
m_colSelection.RemoveAt(n);
n--; count--;
n--;
count--;
break;
default:
@@ -499,6 +519,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
}
}
}
m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) );
m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
@@ -534,22 +555,26 @@ void wxGridSelection::SelectCell( int row, int col,
{
SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1,
ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
return;
}
else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
{
SelectBlock(0, col, m_grid->GetNumberRows() - 1, col,
ControlDown, ShiftDown, AltDown, MetaDown, 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 ),
wxRect r = m_grid->BlockToDeviceRect(
wxGridCellCoords( row, col ),
wxGridCellCoords( row, col ) );
((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
}
@@ -576,8 +601,8 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
// if the cell is not selected, select it
if ( !IsInSelection ( row, col ) )
{
SelectCell( row, col, ControlDown, ShiftDown,
AltDown, MetaDown );
SelectCell( row, col, ControlDown, ShiftDown, AltDown, MetaDown );
return;
}
@@ -616,6 +641,7 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
ControlDown, ShiftDown,
AltDown, MetaDown );
m_grid->GetEventHandler()->ProcessEvent( gridEvt );
return;
}
}
@@ -649,13 +675,15 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
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 )
{
@@ -666,6 +694,7 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
SelectBlock( row + 1, leftCol, bottomRow, rightCol,
false, false, false, false, false );
}
if ( m_selectionMode != wxGrid::wxGridSelectRows )
{
if ( leftCol < col )
@@ -687,7 +716,9 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
if ( m_rowSelection[n] == row )
{
m_rowSelection.RemoveAt(n);
n--; count--;
n--;
count--;
if (m_selectionMode == wxGrid::wxGridSelectCells)
{
if ( col > 0 )
@@ -711,7 +742,9 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
if ( m_colSelection[n] == col )
{
m_colSelection.RemoveAt(n);
n--; count--;
n--;
count--;
if (m_selectionMode == wxGrid::wxGridSelectCells)
{
if ( row > 0 )
@@ -735,7 +768,8 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
{
if ( !m_grid->GetBatchCount() )
{
r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
r = m_grid->BlockToDeviceRect(
wxGridCellCoords( row, col ),
wxGridCellCoords( row, col ) );
((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
}
@@ -749,13 +783,15 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
ControlDown, ShiftDown,
AltDown, MetaDown );
m_grid->GetEventHandler()->ProcessEvent( gridEvt );
break;
}
break;
case wxGrid::wxGridSelectRows:
{
if ( !m_grid->GetBatchCount() )
{
r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
r = m_grid->BlockToDeviceRect(
wxGridCellCoords( row, 0 ),
wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
}
@@ -769,13 +805,15 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
ControlDown, ShiftDown,
AltDown, MetaDown );
m_grid->GetEventHandler()->ProcessEvent( gridEvt );
break;
}
break;
case wxGrid::wxGridSelectColumns:
{
if ( !m_grid->GetBatchCount() )
{
r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
r = m_grid->BlockToDeviceRect(
wxGridCellCoords( 0, col ),
wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
}
@@ -789,8 +827,11 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
ControlDown, ShiftDown,
AltDown, MetaDown );
m_grid->GetEventHandler()->ProcessEvent( gridEvt );
break;
}
break;
default:
break;
}
}
@@ -812,6 +853,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
@@ -831,6 +873,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
@@ -850,6 +893,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
@@ -870,6 +914,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,7 +929,8 @@ void wxGridSelection::ClearSelection()
wxEVT_GRID_RANGE_SELECT,
m_grid,
wxGridCellCoords( 0, 0 ),
wxGridCellCoords( m_grid->GetNumberRows() - 1,
wxGridCellCoords(
m_grid->GetNumberRows() - 1,
m_grid->GetNumberCols() - 1 ),
false );
@@ -919,7 +965,8 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
{
// ...or remove the attribute
m_cellSelection.RemoveAt(n);
n--; count--;
n--;
count--;
}
}
}
@@ -932,6 +979,7 @@ 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)
@@ -959,7 +1007,8 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
// ...or remove the attribute
m_blockSelectionTopLeft.RemoveAt(n);
m_blockSelectionBottomRight.RemoveAt(n);
n--; count--;
n--;
count--;
}
else
coords2.SetRow( pos );
@@ -1004,6 +1053,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 +1077,8 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
{
// ...or remove the attribute
m_cellSelection.RemoveAt(n);
n--; count--;
n--;
count--;
}
}
}
@@ -1040,6 +1091,7 @@ 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)
@@ -1067,7 +1119,8 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
// ...or remove the attribute
m_blockSelectionTopLeft.RemoveAt(n);
m_blockSelectionBottomRight.RemoveAt(n);
n--; count--;
n--;
count--;
}
else
coords2.SetCol(pos);
@@ -1079,8 +1132,8 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
count = m_colSelection.GetCount();
for ( n = 0; n < count; n++ )
{
int rowOrCol = m_colSelection[n];
if ((size_t)rowOrCol >= pos)
{
if ( numCols > 0 )
@@ -1097,7 +1150,6 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
}
}
}
}
// No need to touch selected rows, unless we removed _all_
@@ -1106,7 +1158,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 +1172,7 @@ int wxGridSelection::BlockContain( int topRow1, int leftCol1,
else if ( topRow2 <= topRow1 && bottomRow1 <= bottomRow2 &&
leftCol2 <= leftCol1 && rightCol1 <= rightCol2 )
return -1;
return 0;
}