From c83062ceb269fcf450daac10b35e6aa265dcc5fc Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 23 Jun 2007 16:26:28 +0000 Subject: [PATCH] Prevent wxScrollbar::SetThumbPos from sending any event, too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/scrolbar.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index 00ea880973..5abcdc5138 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/scrolbar.cpp @@ -32,11 +32,9 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win) if (eventType != wxEVT_NULL) { const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; - const int i = orient == wxVERTICAL; const int value = win->GetThumbPosition(); wxScrollEvent event(eventType, win->GetId(), value, orient); event.SetEventObject(win); - win->m_blockValueChanged[i] = true; win->GetEventHandler()->ProcessEvent(event); if (!win->m_isScrolling) { @@ -44,7 +42,6 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win) event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event); } - win->m_blockValueChanged[i] = false; } } } @@ -208,11 +205,14 @@ void wxScrollBar::SetThumbPosition( int viewStart ) m_scrollPos[i] = adj->value = viewStart; - // If a "value_changed" signal emission is not already in progress - if (!m_blockValueChanged[i]) - { - gtk_adjustment_value_changed(adj); - } + + g_signal_handlers_disconnect_by_func( m_widget, + (gpointer)gtk_value_changed, this); + + gtk_adjustment_value_changed(adj); + + g_signal_connect_after(m_widget, "value_changed", + G_CALLBACK(gtk_value_changed), this); } }