X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5c70f96f5e06e1c8f8119f51b99dd019583d2b..0d045709bcd64c28a155a2a9fb29d95f56a0ff7b:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 5cde6b19f6..269d2c4921 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; @@ -181,7 +182,6 @@ gtk_value_changed(GtkRange* range, wxSlider* win) // If integral position has changed if (wxRound(oldPos) != pos) { - wxCHECK_RET(eventType != wxEVT_NULL, _T("Unknown slider scroll event type")); ProcessScrollEvent(win, eventType); win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK; }