/* add the expander */
         dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:");
         gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
-        g_signal_connect (GTK_EXPANDER(dlg->expander), "activate",
+        g_signal_connect (dlg->expander, "activate",
                             G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
     }
 
 
     {
         s_user_data = item.GetID();
 
-        g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
+        g_signal_connect (editable, "editing_done",
             G_CALLBACK (wxgtk_cell_editable_editing_done),
             (gpointer) wxrenderer );
 
 void wxDataViewRenderer::GtkInitHandlers()
 {
     {
-        g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started",
+        g_signal_connect (m_renderer, "editing_started",
             G_CALLBACK (wxgtk_renderer_editing_started),
             this);
     }
 
     // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys
     // the dialog when the user press ESC on the dialog: in that case a second call to
     // ShowModal() would result in a bunch of Gtk-CRITICAL errors...
-    g_signal_connect (G_OBJECT(m_widget),
+    g_signal_connect (m_widget,
                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     (gpointer)this);
 
 
     if ( m_base != 10 )
     {
-        g_signal_connect( GTK_SPIN_BUTTON(m_widget), "input",
+        g_signal_connect( m_widget, "input",
                               G_CALLBACK(wx_gtk_spin_input), this);
-        g_signal_connect( GTK_SPIN_BUTTON(m_widget), "output",
+        g_signal_connect( m_widget, "output",
                               G_CALLBACK(wx_gtk_spin_output), this);
     }
     else
     {
-        g_signal_handlers_disconnect_by_func(GTK_SPIN_BUTTON(m_widget),
+        g_signal_handlers_disconnect_by_func(m_widget,
                                              (gpointer)wx_gtk_spin_input,
                                              this);
-        g_signal_handlers_disconnect_by_func(GTK_SPIN_BUTTON(m_widget),
+        g_signal_handlers_disconnect_by_func(m_widget,
                                              (gpointer)wx_gtk_spin_output,
                                              this);
     }