don't let def window proc start another drag operation if we just started one ourselv...

[wxWidgets.git] / src / gtk / slider.cpp

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 0a75a32c556ea8d2781a649f99ef71266a552101..14e4c386598c45c460235a346124d0c8f0888804 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -19,7 +19,7 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // data
@@ -124,15 +124,14 @@ extern "C" {
 static void
 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 +180,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;
     }
@@ -288,7 +286,6 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {
-    m_acceptsFocus = true;
     m_needParent = true;
 
     if (!PreCreation( parent, pos, size ) ||
@@ -346,13 +343,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));
-        }
     }
 }