Weekly catch up.

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index f480ab69114ef5744bb4780dbd0bce95be981866..024de20fb01792a6209215ed5a6a001f5105b106 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3510,7 +3510,7 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 // Internal helper macros for simpler use of that function
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
 // Internal helper macros for simpler use of that function
 
 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, \
                                           WXGRID_MIN_COL_WIDTH, \
 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
                                           WXGRID_MIN_COL_WIDTH, \


@@ -6856,12 +6856,12 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
 // of m_rowBottoms/m_ColRights to speed up the search!
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
 // of m_rowBottoms/m_ColRights to speed up the search!
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,

-                           wxArrayInt BorderArray, bool maxOnOverflow)
+                           const wxArrayInt& BorderArray, bool maxOnOverflow)

 {
     if (!defaultDist)
         defaultDist = 1;
 {
     if (!defaultDist)
         defaultDist = 1;

-    int i_max = coord / defaultDist,
-        i_min = 0;
+    size_t i_max = coord / defaultDist,
+           i_min = 0;

     if (BorderArray.IsEmpty())
     {
         return i_max;
     if (BorderArray.IsEmpty())
     {
         return i_max;


@@ -6880,7 +6880,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
             i_max = BorderArray.GetCount() - 1;
     }
     if ( coord >= BorderArray[i_max])
             i_max = BorderArray.GetCount() - 1;
     }
     if ( coord >= BorderArray[i_max])

-        return (maxOnOverflow ? i_max : -1);
+        return maxOnOverflow ? (int)i_max : -1;

     if ( coord < BorderArray[0] )
         return 0;
 
     if ( coord < BorderArray[0] )
         return 0;