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

don't pass arrays by value (and also fixed signed/unsigned comparison warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-04-28 14:39:37 +00:00
parent 2245b2b2c3
commit 1af546bfc3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/grid.cpp
View File

@ -3510,7 +3510,7 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
// Internal helper macros for simpler use of that function // Internal helper macros for simpler use of that function
static int CoordToRowOrCol(int coord, int defaultDist, int minDist, static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
wxArrayInt BorderArray, bool maxOnOverflow); const wxArrayInt& BorderArray, bool maxOnOverflow);
#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \ #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
WXGRID_MIN_COL_WIDTH, \ WXGRID_MIN_COL_WIDTH, \
@ -6856,11 +6856,11 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
// of m_rowBottoms/m_ColRights to speed up the search! // of m_rowBottoms/m_ColRights to speed up the search!
static int CoordToRowOrCol(int coord, int defaultDist, int minDist, static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
wxArrayInt BorderArray, bool maxOnOverflow) const wxArrayInt& BorderArray, bool maxOnOverflow)
{ {
if (!defaultDist) if (!defaultDist)
defaultDist = 1; defaultDist = 1;
int i_max = coord / defaultDist, size_t i_max = coord / defaultDist,
i_min = 0; i_min = 0;
if (BorderArray.IsEmpty()) if (BorderArray.IsEmpty())
{ {
@ -6880,7 +6880,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 ? i_max : -1); return maxOnOverflow ? (int)i_max : -1;
if ( coord < BorderArray[0] ) if ( coord < BorderArray[0] )
return 0; return 0;