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

Copied main branch fixes for caret not showing in first row (wxmsw)

Browse Source 
and highlight not being cleared when a cell is only partially visible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-07-27 06:47:09 +00:00
parent 0855205063
commit 2c33291c88
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/grid.cpp
View File

@@ -538,7 +538,15 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
} }
#else // !GTK #else // !GTK
int extra_x = ( rect.x > 2 )? 2 : 1; int extra_x = ( rect.x > 2 )? 2 : 1;
// MB: treat MSW separately here otherwise the caret doesn't show
// when the editor is in the first row.
#if defined(__WXMSW__)
int extra_y = 2;
#else
int extra_y = ( rect.y > 2 )? 2 : 1; int extra_y = ( rect.y > 2 )? 2 : 1;
#endif // MSW
#if defined(__WXMOTIF__) #if defined(__WXMOTIF__)
extra_x *= 2; extra_x *= 2;
extra_y *= 2; extra_y *= 2;
@@ -5586,7 +5594,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
HideCellEditControl(); HideCellEditControl();
DisableCellEditControl(); DisableCellEditControl();
if ( IsVisible( m_currentCellCoords ) ) if ( IsVisible( m_currentCellCoords, FALSE ) )
{ {
wxRect r; wxRect r;
r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);