GTK+ 2.0 compilation.

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 27f9bdd3936289402833a27dcf2461c8362b8dea..93ec5c8fffc9e3ae2340df3aa0dd518688f1495c 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -19,9 +19,7 @@
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"

-
-#include <math.h>
-
+#include "wx/math.h"

 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------


@@ -134,6 +132,11 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 

+#ifdef __WXGTK20__
+    if (style & wxSL_INVERSE)
+        gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
+#endif
+

     GtkEnableEvents();
 
     SetRange( minValue, maxValue );
     GtkEnableEvents();
 
     SetRange( minValue, maxValue );


@@ -141,11 +144,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -269,12 +268,6 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 #endif
 }
 
 #endif
 }
 

-void wxSlider::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-}
-

 void wxSlider::GtkDisableEvents()
 {
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
 void wxSlider::GtkDisableEvents()
 {
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),


@@ -290,4 +283,11 @@ void wxSlider::GtkEnableEvents()
                         (gpointer) this );
 }
 
                         (gpointer) this );
 }
 

+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
+}
+

 #endif
 #endif