From 84f623f883ff674c7d5df5cf20affd3bfb3a4bfc Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 2 Oct 2012 16:19:33 +0000 Subject: [PATCH] remove some unnecessary casts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/assertdlg_gtk.cpp | 2 +- src/gtk/dataview.cpp | 4 ++-- src/gtk/dirdlg.cpp | 2 +- src/gtk/spinctrl.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index 0ed3a239bd..bdcd83c086 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -298,7 +298,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg) /* 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); } diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 625f4bd28e..cf97ded419 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -1810,7 +1810,7 @@ wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable { 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 ); @@ -1842,7 +1842,7 @@ void wxDataViewRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) 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); } diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp index a877cbabfe..df9bdef8e2 100644 --- a/src/gtk/dirdlg.cpp +++ b/src/gtk/dirdlg.cpp @@ -140,7 +140,7 @@ bool wxDirDialog::Create(wxWindow* parent, // 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); diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index e28cc7a686..aed0313357 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -413,17 +413,17 @@ bool wxSpinCtrl::SetBase(int base) 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); } -- 2.45.2