* fix bug where editing of the bootom and right most cell is not
corectly completed. * Some tidying of end edit code paths. (such as in AutoSizeRowOrCol) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6280,8 +6280,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// at the bottom of a column
|
// at the bottom of a column
|
||||||
HideCellEditControl();
|
DisableCellEditControl();
|
||||||
SaveEditControlValue();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -6300,8 +6299,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// at left of grid
|
// at left of grid
|
||||||
HideCellEditControl();
|
DisableCellEditControl();
|
||||||
SaveEditControlValue();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -6313,8 +6311,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// at right of grid
|
// at right of grid
|
||||||
HideCellEditControl();
|
DisableCellEditControl();
|
||||||
SaveEditControlValue();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -6463,7 +6460,6 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
|
|||||||
|
|
||||||
if ( m_currentCellCoords != wxGridNoCellCoords )
|
if ( m_currentCellCoords != wxGridNoCellCoords )
|
||||||
{
|
{
|
||||||
HideCellEditControl();
|
|
||||||
DisableCellEditControl();
|
DisableCellEditControl();
|
||||||
|
|
||||||
if ( IsVisible( m_currentCellCoords, FALSE ) )
|
if ( IsVisible( m_currentCellCoords, FALSE ) )
|
||||||
@@ -9524,6 +9520,10 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
|
|||||||
{
|
{
|
||||||
wxClientDC dc(m_gridWin);
|
wxClientDC dc(m_gridWin);
|
||||||
|
|
||||||
|
//Cancel editting of cell
|
||||||
|
HideCellEditControl();
|
||||||
|
SaveEditControlValue();
|
||||||
|
|
||||||
// init both of them to avoid compiler warnings, even if weo nly need one
|
// init both of them to avoid compiler warnings, even if weo nly need one
|
||||||
int row = -1,
|
int row = -1,
|
||||||
col = -1;
|
col = -1;
|
||||||
|
Reference in New Issue
Block a user