Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct signature for callback

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-12-11 06:43:19 +00:00
parent 26ec6be735
commit faad53d187
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/assertdlg_gtk.cpp
View File

@@ -231,8 +231,9 @@ static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg
GtkAssertDialogClass implementation GtkAssertDialogClass implementation
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static void gtk_assert_dialog_init (GtkAssertDialog *self); extern "C" {
static void gtk_assert_dialog_class_init (GtkAssertDialogClass *klass); static void gtk_assert_dialog_init(GTypeInstance* instance, void*);
}
GType gtk_assert_dialog_get_type() GType gtk_assert_dialog_get_type()
{ {
@@ -245,12 +246,12 @@ GType gtk_assert_dialog_get_type()
sizeof (GtkAssertDialogClass), sizeof (GtkAssertDialogClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
(GClassInitFunc) gtk_assert_dialog_class_init, NULL,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkAssertDialog), sizeof (GtkAssertDialog),
16, /* n_preallocs */ 16, /* n_preallocs */
(GInstanceInitFunc) gtk_assert_dialog_init, gtk_assert_dialog_init,
NULL NULL
}; };
assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0); assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0);
@@ -259,13 +260,10 @@ GType gtk_assert_dialog_get_type()
return assert_dialog_type; return assert_dialog_type;
} }
static void gtk_assert_dialog_class_init(GtkAssertDialogClass*) extern "C" {
{ static void gtk_assert_dialog_init(GTypeInstance* instance, void*)
/* no special initializations required */
}
static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
{ {
GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance);
GtkWidget *continuebtn; GtkWidget *continuebtn;
{ {
@@ -373,6 +371,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
gtk_widget_pop_composite_child (); gtk_widget_pop_composite_child ();
gtk_widget_show_all (GTK_WIDGET(dlg)); gtk_widget_show_all (GTK_WIDGET(dlg));
} }
}
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
GtkAssertDialog public API GtkAssertDialog public API