Fix SetItemCount bug with adding items, a blind fix for generic control dnd issues...

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 5e8098e47c84ee77c901b60749e153ceb3c6c49d..0a75a32c556ea8d2781a649f99ef71266a552101 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -346,6 +346,13 @@ 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));
+        }
     }
 }
 
@@ -401,10 +408,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