From 3ca5da93574aa49577e7938bda7127d86947aaed Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 1 Jul 2011 17:44:49 +0000 Subject: [PATCH] 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 --- src/gtk/scrolwin.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index 291b30a49d..2ce5843e92 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -31,15 +31,12 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int xPos, int yPos, bool noRefresh) { + // prevent programmatic position changes from causing scroll events + m_win->SetScrollPos(wxHORIZONTAL, xPos); + m_win->SetScrollPos(wxVERTICAL, yPos); + base_type::SetScrollbars( 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, -- 2.45.2