X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98a0564ea6d3dd3d4e97c204546e284ba7753356..c7c6e54baed01937426239dd38164ee0326fa172:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 5e8098e47c..dc964e0153 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -126,13 +126,14 @@ gtk_value_changed(GtkRange* range, wxSlider* win) { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; - if (g_blockEventsOnDrag) return; - GtkAdjustment* adj = gtk_range_get_adjustment (range); const int pos = wxRound(adj->value); const double oldPos = win->m_pos; win->m_pos = adj->value; + + if (!win->m_hasVMT || g_blockEventsOnDrag) + return; + if (win->m_blockScrollEvent) { win->m_scrollEventType = GTK_SCROLL_NONE; @@ -401,10 +402,9 @@ int wxSlider::GetLineSize() const return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->step_increment); } -bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - GtkRange *range = GTK_RANGE(m_widget); - return (range->event_window == window); + return GTK_RANGE(m_widget)->event_window; } // static