X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..05d8deda209e232835c7de64b821f569c9711df8:/src/gtk1/slider.cpp diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 799f21d2b1..93ec5c8fff 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -7,18 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "slider.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/slider.h" #if wxUSE_SLIDER #include "wx/utils.h" - -#include - +#include "wx/math.h" #include "wx/gtk/private.h" //----------------------------------------------------------------------------- @@ -131,6 +132,11 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, 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 ); @@ -138,11 +144,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); + PostCreation(size); return TRUE; } @@ -266,12 +268,6 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) #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), @@ -287,4 +283,11 @@ void wxSlider::GtkEnableEvents() (gpointer) this ); } +// static +wxVisualAttributes +wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_vscale_new); +} + #endif