Don't cause scroll events for position changes from SetScrollbars, broken in r67326.

Fixes #13301

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-07-01 17:44:49 +00:00
parent e4e1626cbb
commit 3ca5da9357

View File

@@ -31,15 +31,12 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int xPos, int yPos, int xPos, int yPos,
bool noRefresh) bool noRefresh)
{ {
// prevent programmatic position changes from causing scroll events
m_win->SetScrollPos(wxHORIZONTAL, xPos);
m_win->SetScrollPos(wxVERTICAL, yPos);
base_type::SetScrollbars( base_type::SetScrollbars(
pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh); pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);
gtk_range_set_value(m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPosition);
gtk_range_set_value(m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPosition);
m_win->m_scrollPos[wxWindow::ScrollDir_Horz] =
gtk_range_get_value(m_win->m_scrollBar[wxWindow::ScrollDir_Horz]);
m_win->m_scrollPos[wxWindow::ScrollDir_Vert] =
gtk_range_get_value(m_win->m_scrollBar[wxWindow::ScrollDir_Vert]);
} }
void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,