Use gtk_init_check instead of gtk_init so that we can racefully exit

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index a5fbd38b54b15b55c334525d4c95d87bb539d4e3..e7079c5c1018e46500b5fa262d1190f1bb368a49 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slider.h"
 #endif
 
 #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/slider.h"
 
 #if wxUSE_SLIDER


@@ -131,21 +134,14 @@ 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) );
 

-    gtk_signal_connect( GTK_OBJECT(m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_slider_callback,
-                        (gpointer) this );
+    GtkEnableEvents();

 
     SetRange( minValue, maxValue );
     SetValue( value );
 
     m_parent->DoAddChild( this );
 
 
     SetRange( minValue, maxValue );
     SetValue( value );
 
     m_parent->DoAddChild( this );
 

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

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -166,7 +162,11 @@ void wxSlider::SetValue( int value )
 
     m_adjust->value = fpos;
 
 
     m_adjust->value = fpos;
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

+    
+    GtkEnableEvents();

 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )


@@ -185,7 +185,11 @@ void wxSlider::SetRange( int minValue, int maxValue )
     m_adjust->step_increment = 1.0;
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 
     m_adjust->step_increment = 1.0;
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 int wxSlider::GetMin() const
 }
 
 int wxSlider::GetMin() const


@@ -206,7 +210,11 @@ void wxSlider::SetPageSize( int pageSize )
 
     m_adjust->page_increment = fpage;
 
 
     m_adjust->page_increment = fpage;
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 int wxSlider::GetPageSize() const
 }
 
 int wxSlider::GetPageSize() const


@@ -222,7 +230,11 @@ void wxSlider::SetThumbLength( int len )
 
     m_adjust->page_size = flen;
 
 
     m_adjust->page_size = flen;
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 int wxSlider::GetThumbLength() const
 }
 
 int wxSlider::GetThumbLength() const


@@ -242,14 +254,15 @@ int wxSlider::GetLineSize() const
 bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);
 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)
     return ( (window == GTK_WIDGET(range)->window)

-#ifndef __WXGTK20__

                 || (window == range->trough)
                 || (window == range->slider)
                 || (window == range->step_forw)
                 || (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()
 }
 
 void wxSlider::ApplyWidgetStyle()


@@ -258,4 +271,26 @@ void wxSlider::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+void wxSlider::GtkDisableEvents()
+{
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
+}
+
+void wxSlider::GtkEnableEvents()
+{
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
+}
+
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
+}
+

 #endif
 #endif