More experimenting

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 8cdeb4cc19c9a1bea88c840cbc57efd357c6efe7..42de0259367c19ac8779e41bd4ba7303884ed6a5 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -79,7 +79,6 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
 
 extern "C" {
 static void gtk_slider_callback( GtkAdjustment *adjust,
 
 extern "C" {
 static void gtk_slider_callback( GtkAdjustment *adjust,

-                                 SCROLLBAR_CBACK_ARG

                                  wxSlider *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
                                  wxSlider *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -202,14 +201,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
 
     GtkEnableEvents();
         gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
 
     GtkEnableEvents();

-    gtk_signal_connect( GTK_OBJECT(m_widget),
-                        "button_press_event",
-                        (GtkSignalFunc)gtk_slider_button_press_callback,
-                        (gpointer) this );
-    gtk_signal_connect( GTK_OBJECT(m_widget),
-                        "button_release_event",
-                        (GtkSignalFunc)gtk_slider_button_release_callback,
-                        (gpointer) this );
+    g_signal_connect (m_widget, "button_press_event",
+                      G_CALLBACK (gtk_slider_button_press_callback),
+                      this);
+    g_signal_connect (m_widget, "button_release_event",
+                      G_CALLBACK (gtk_slider_button_release_callback),
+                      this);

 
     SetRange( minValue, maxValue );
     SetValue( value );
 
     SetRange( minValue, maxValue );
     SetValue( value );


@@ -237,7 +234,7 @@ void wxSlider::SetValue( int value )
 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    g_signal_emit_by_name (m_adjust, "value_changed");

 
     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }


@@ -260,7 +257,7 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    g_signal_emit_by_name (m_adjust, "changed");

 
     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }


@@ -285,7 +282,7 @@ void wxSlider::SetPageSize( int pageSize )
 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    g_signal_emit_by_name (m_adjust, "changed");

 
     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }


@@ -305,7 +302,7 @@ void wxSlider::SetThumbLength( int len )
 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    g_signal_emit_by_name (m_adjust, "changed");

 
     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }


@@ -332,17 +329,15 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 
 void wxSlider::GtkDisableEvents()
 {
 
 void wxSlider::GtkDisableEvents()
 {

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
-                        GTK_SIGNAL_FUNC(gtk_slider_callback),
-                        (gpointer) this );
+    g_signal_handlers_disconnect_by_func (m_adjust,
+                                          (gpointer) gtk_slider_callback,
+                                          this);

 }
 
 void wxSlider::GtkEnableEvents()
 {
 }
 
 void wxSlider::GtkEnableEvents()
 {

-    gtk_signal_connect( GTK_OBJECT (m_adjust),
-                        "value_changed",
-                        GTK_SIGNAL_FUNC(gtk_slider_callback),
-                        (gpointer) this );
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_slider_callback), this);

 }
 
 // static
 }
 
 // static