X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f20a4018f428350c80b9c60b051e4f7606b90415..0d045709bcd64c28a155a2a9fb29d95f56a0ff7b:/src/gtk/slider.cpp

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 0a75a32c55..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;
     }
@@ -346,13 +346,6 @@ void wxSlider::SetValue( int value )
         BlockScrollEvent();
         gtk_range_set_value(GTK_RANGE (m_widget), value);
         UnblockScrollEvent();
-
-        // keep m_pos in sync in case the value_changed callback didn't didn't
-        // get called, such as when the widget is first created
-        if (GetValue() != value)
-        {
-            m_pos = gtk_range_get_value(GTK_RANGE(m_widget));
-        }
     }
 }