X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1b93ccbdce1d7b757f6d6180b710214e6277a00..e8508ea8a890c90e6e72b2579780ca2ccbf40270:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 07bc86620d..799f21d2b1 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -131,11 +131,11 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); + GtkEnableEvents(); + SetRange( minValue, maxValue ); SetValue( value ); - GtkEnableEvents(); - m_parent->DoAddChild( this ); PostCreation(); @@ -255,14 +255,15 @@ int wxSlider::GetLineSize() const bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) { GtkRange *range = GTK_RANGE(m_widget); +#ifdef __WXGTK20__ + return (range->event_window == window); +#else return ( (window == GTK_WIDGET(range)->window) -#ifndef __WXGTK20__ || (window == range->trough) || (window == range->slider) || (window == range->step_forw) - || (window == range->step_back) -#endif // GTK+ 1.x - ); + || (window == range->step_back) ); +#endif } void wxSlider::ApplyWidgetStyle()