Use same type in both results of A?B:C operator (Tinderbox build fix).

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index b09e79f0326d1d991ce4b2a91933e479277c4158..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));
+        }
     }
 }
 
@@ -370,7 +377,7 @@ int wxSlider::GetMax() const
 void wxSlider::SetPageSize( int pageSize )
 {
     BlockScrollEvent();
-    gtk_range_set_increments(GTK_RANGE (m_widget), 1, pageSize);
+    gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize);
     UnblockScrollEvent();
 }
 
@@ -389,19 +396,21 @@ int wxSlider::GetThumbLength() const
     return 0;
 }
 
-void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
+void wxSlider::SetLineSize( int lineSize )
 {
+    BlockScrollEvent();
+    gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize());
+    UnblockScrollEvent();
 }
 
 int wxSlider::GetLineSize() const
 {
-    return 0;
+    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