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

Fixes to my last commit.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2002-04-27 10:37:15 +00:00
parent cf760e4c30
commit 68c5a31c6c
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/generic/grid.cpp
View File

@@ -6724,8 +6724,13 @@ void wxGrid::ShowCellEditControl()
#endif // 0 #endif // 0
// cell is shifted by one pixel // cell is shifted by one pixel
rect.x--; // However, don't allow x or y to become negative
rect.y--; // since the SetSize() method interprets that as
// "don't change."
if (rect.x > 0)
rect.x--;
if (rect.y > 0)
rect.y--;
wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col);
@@ -6857,17 +6862,17 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
if ( i_max >= BorderArray.GetCount()) if ( i_max >= BorderArray.GetCount())
i_max = BorderArray.GetCount() - 1; i_max = BorderArray.GetCount() - 1;
} }
if ( coord > BorderArray[i_max]) if ( coord > BorderArray[i_max])
return -1; return -1;
if ( coord < BorderArray[0] )
return 0;
while ( i_max - i_min > 1 ) while ( i_max - i_min > 0 )
{ {
wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max], wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max],
-1, _T("wxGrid: internal error in CoordToRowOrCol")); -1, _T("wxGrid: internal error in CoordToRowOrCol"));
if (coord >= BorderArray[ i_max - 1]) if (coord >= BorderArray[ i_max - 1])
{
return i_max; return i_max;
}
else else
i_max--; i_max--;
int median = i_min + (i_max - i_min + 1) / 2; int median = i_min + (i_max - i_min + 1) / 2;
@@ -6899,8 +6904,10 @@ int wxGrid::XToCol( int x )
int wxGrid::YToEdgeOfRow( int y ) int wxGrid::YToEdgeOfRow( int y )
{ {
int i, d; int i, d;
i = YToRow(y);
for ( i = YToRow( y ) - 1; i < m_numRows; i++ ) if ( i > 0 )
i--;
for ( ; i < m_numRows; i++ )
{ {
if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE ) if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
{ {
@@ -6920,8 +6927,10 @@ int wxGrid::YToEdgeOfRow( int y )
int wxGrid::XToEdgeOfCol( int x ) int wxGrid::XToEdgeOfCol( int x )
{ {
int i, d; int i, d;
i = XToCol(x);
for (i = XToCol( x ) - 1; i < m_numCols; i++ ) if ( i > 0 )
i--;
for ( ; i < m_numCols; i++ )
{ {
if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE ) if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
{ {