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

* rename maxOnOverflow parameter to CoordToRowOrCol() to clipToMinMax

Browse Source 
* ensure CoordToRowOrCol() range is  0 -> nMax if clipOnMinMax is set
                                and -1 -> nMax if clipOnMinMax is not set

 * check on uses of YToRow() / XToCol() and replace with
   calls internalYToRow() / internalXToCol() removing any external
   overflow handling where appropriate.

* Add tests for overflow to prevent sending 'off grid' label events,
   would be indistinguishable from CornerLabel events.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roger Gammans
2003-04-03 21:08:43 +00:00
parent 8ac35652ba
commit 09e6ff8c42
1 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/generic/grid.cpp
View File

@@ -3678,7 +3678,7 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
static int CoordToRowOrCol(int coord, int defaultDist, int minDist, static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
const wxArrayInt& BorderArray, int nMax, const wxArrayInt& BorderArray, int nMax,
bool maxOnOverflow); bool clipToMinMax);
#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \ #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
WXGRID_MIN_COL_WIDTH, \ WXGRID_MIN_COL_WIDTH, \
@@ -4728,7 +4728,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
if ( YToEdgeOfRow(y) < 0 ) if ( YToEdgeOfRow(y) < 0 )
{ {
row = YToRow(y); row = YToRow(y);
SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); if ( row >=0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
{
// no default action at the moment
}
} }
} }
@@ -4757,7 +4761,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
else if ( event.RightDown() ) else if ( event.RightDown() )
{ {
row = YToRow(y); row = YToRow(y);
if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) if ( row >=0 &&
!SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
{ {
// no default action at the moment // no default action at the moment
} }
@@ -4769,7 +4774,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
else if ( event.RightDClick() ) else if ( event.RightDClick() )
{ {
row = YToRow(y); row = YToRow(y);
if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) if ( row >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
{ {
// no default action at the moment // no default action at the moment
} }
@@ -4934,7 +4940,11 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
if ( XToEdgeOfCol(x) < 0 ) if ( XToEdgeOfCol(x) < 0 )
{ {
col = XToCol(x); col = XToCol(x);
SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); if ( col >= 0 &&
! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
{
// no default action at the moment
}
} }
} }
@@ -4963,7 +4973,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
else if ( event.RightDown() ) else if ( event.RightDown() )
{ {
col = XToCol(x); col = XToCol(x);
if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
{ {
// no default action at the moment // no default action at the moment
} }
@@ -4975,7 +4986,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
else if ( event.RightDClick() ) else if ( event.RightDClick() )
{ {
col = XToCol(x); col = XToCol(x);
if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
{ {
// no default action at the moment // no default action at the moment
} }
@@ -5530,10 +5542,9 @@ void wxGrid::DoEndDragResizeRow()
{ {
int i, cell_rows, cell_cols, subtract_rows = 0; int i, cell_rows, cell_cols, subtract_rows = 0;
int leftCol = XToCol(left); int leftCol = XToCol(left);
int rightCol = XToCol(left+cw); int rightCol = internalXToCol(left+cw);
if (leftCol >= 0) if (leftCol >= 0)
{ {
if (rightCol < 0) rightCol = m_numCols;
for (i=leftCol; i<rightCol; i++) for (i=leftCol; i<rightCol; i++)
{ {
GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols); GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
@@ -5590,10 +5601,9 @@ void wxGrid::DoEndDragResizeCol()
{ {
int i, cell_rows, cell_cols, subtract_cols = 0; int i, cell_rows, cell_cols, subtract_cols = 0;
int topRow = YToRow(top); int topRow = YToRow(top);
int bottomRow = YToRow(top+cw); int bottomRow = internalYToRow(top+cw);
if (topRow >= 0) if (topRow >= 0)
{ {
if (bottomRow < 0) bottomRow = m_numRows;
for (i=topRow; i<bottomRow; i++) for (i=topRow; i<bottomRow; i++)
{ {
GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols); GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
@@ -6837,37 +6847,32 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) ); bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
// no gridlines inside multicells, clip them out // no gridlines inside multicells, clip them out
int leftCol = XToCol(left); int leftCol = internalXToCol(left);
int topRow = YToRow(top); int topRow = internalYToRow(top);
int rightCol = XToCol(right); int rightCol = internalXToCol(right);
int bottomRow = YToRow(bottom); int bottomRow = internalYToRow(bottom);
wxRegion clippedcells(0, 0, cw, ch); wxRegion clippedcells(0, 0, cw, ch);
if ((leftCol >= 0) && (topRow >= 0))
int i, j, cell_rows, cell_cols;
wxRect rect;
for (j=topRow; j<bottomRow; j++)
{ {
if (rightCol < 0) rightCol = m_numCols; for (i=leftCol; i<rightCol; i++)
if (bottomRow < 0) bottomRow = m_numRows;
int i, j, cell_rows, cell_cols;
wxRect rect;
for (j=topRow; j<bottomRow; j++)
{ {
for (i=leftCol; i<rightCol; i++) GetCellSize( j, i, &cell_rows, &cell_cols );
if ((cell_rows > 1) || (cell_cols > 1))
{ {
GetCellSize( j, i, &cell_rows, &cell_cols ); rect = CellToRect(j,i);
if ((cell_rows > 1) || (cell_cols > 1)) CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
{ clippedcells.Subtract(rect);
rect = CellToRect(j,i); }
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); else if ((cell_rows < 0) || (cell_cols < 0))
clippedcells.Subtract(rect); {
} rect = CellToRect(j+cell_rows, i+cell_cols);
else if ((cell_rows < 0) || (cell_cols < 0)) CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
{ clippedcells.Subtract(rect);
rect = CellToRect(j+cell_rows, i+cell_cols);
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
clippedcells.Subtract(rect);
}
} }
} }
} }
@@ -6877,7 +6882,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
// horizontal grid lines // horizontal grid lines
// //
int i; // already declared above - int i;
for ( i = internalYToRow(top); i < m_numRows; i++ ) for ( i = internalYToRow(top); i < m_numRows; i++ )
{ {
int bot = GetRowBottom(i) - 1; int bot = GetRowBottom(i) - 1;
@@ -7477,10 +7482,16 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
static int CoordToRowOrCol(int coord, int defaultDist, int minDist, static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
const wxArrayInt& BorderArray, int nMax, const wxArrayInt& BorderArray, int nMax,
bool maxOnOverflow) bool clipToMinMax)
{ {
if (coord < 0)
return clipToMinMax && (nMax > 0) ? 0 : -1;
if (!defaultDist) if (!defaultDist)
defaultDist = 1; defaultDist = 1;
size_t i_max = coord / defaultDist, size_t i_max = coord / defaultDist,
i_min = 0; i_min = 0;
@@ -7488,7 +7499,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
{ {
if((int) i_max < nMax) if((int) i_max < nMax)
return i_max; return i_max;
return maxOnOverflow ? nMax - 1 : -1; return clipToMinMax ? nMax - 1 : -1;
} }
if ( i_max >= BorderArray.GetCount()) if ( i_max >= BorderArray.GetCount())
@@ -7504,7 +7515,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
i_max = BorderArray.GetCount() - 1; i_max = BorderArray.GetCount() - 1;
} }
if ( coord >= BorderArray[i_max]) if ( coord >= BorderArray[i_max])
return maxOnOverflow ? (int)i_max : -1; return clipToMinMax ? (int)i_max : -1;
if ( coord < BorderArray[0] ) if ( coord < BorderArray[0] )
return 0; return 0;
@@ -7887,13 +7898,11 @@ bool wxGrid::MovePageUp()
m_gridWin->GetClientSize( &cw, &ch ); m_gridWin->GetClientSize( &cw, &ch );
int y = GetRowTop(row); int y = GetRowTop(row);
int newRow = YToRow( y - ch + 1 ); int newRow = internalYToRow( y - ch + 1 );
if ( newRow < 0 )
{ if ( newRow == row )
newRow = 0;
}
else if ( newRow == row )
{ {
//row > 0 , so newrow can never be less than 0 here.
newRow = row - 1; newRow = row - 1;
} }
@@ -7917,14 +7926,11 @@ bool wxGrid::MovePageDown()
m_gridWin->GetClientSize( &cw, &ch ); m_gridWin->GetClientSize( &cw, &ch );
int y = GetRowTop(row); int y = GetRowTop(row);
int newRow = YToRow( y + ch ); int newRow = internalYToRow( y + ch );
if ( newRow == -1 ) if ( newRow == row )
{ {
newRow = m_numRows - 1; // row < m_numRows , so newrow can't overflow here.
} newRow = row + 1;
else if ( newRow == row )
{
newRow = row + 1;
} }
MakeCellVisible( newRow, m_currentCellCoords.GetCol() ); MakeCellVisible( newRow, m_currentCellCoords.GetCol() );