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

Workaround for #10040: wxGrid scrolls back to the previous edit position

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-02-17 15:01:48 +00:00
parent 78f59cedf3
commit 8d2f00f251
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/grid.cpp
View File

@@ -8636,6 +8636,11 @@ void wxGrid::ShowCellEditControl()
editor->GetControl()->GetPosition().y ); editor->GetControl()->GetPosition().y );
editor->Show( true, attr ); editor->Show( true, attr );
#ifdef __WXGTK20__
int px, py;
GetViewStart(& px, & py);
#endif
// recalc dimensions in case we need to // recalc dimensions in case we need to
// expand the scrolled window to account for editor // expand the scrolled window to account for editor
CalcDimensions(); CalcDimensions();
@@ -8645,6 +8650,14 @@ void wxGrid::ShowCellEditControl()
editor->DecRef(); editor->DecRef();
attr->DecRef(); attr->DecRef();
#ifdef __WXGTK20__
// On GTK+, erroneous scrolling to the old control
// position can happen when the grid window gets a
// focus event and this is processed by wxScrollHelper.
// This line resets the scroll position.
Scroll(px, py);
#endif
} }
} }
} }