AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

modelbutton: Use dispose instead of destroy

Browse Source 
The destroy vfunc is going away.
This commit is contained in:
Matthias Clasen 2020-05-05 16:48:39 -04:00
parent 4c7cafdba8
commit 8683925fe0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkmodelbutton.c
View File

@ -932,13 +932,13 @@ gtk_model_button_set_property (GObject *object,
} }
static void static void
gtk_model_button_destroy (GtkWidget *widget) gtk_model_button_dispose (GObject *object)
{ {
GtkModelButton *model_button = GTK_MODEL_BUTTON (widget); GtkModelButton *model_button = GTK_MODEL_BUTTON (object);
g_clear_pointer (&model_button->menu_name, g_free); g_clear_pointer (&model_button->menu_name, g_free);
GTK_WIDGET_CLASS (gtk_model_button_parent_class)->destroy (widget); G_OBJECT_CLASS (gtk_model_button_parent_class)->dispose (object);
} }
static void static void
@ -1084,11 +1084,11 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
object_class->dispose = gtk_model_button_dispose;
object_class->finalize = gtk_model_button_finalize; object_class->finalize = gtk_model_button_finalize;
object_class->get_property = gtk_model_button_get_property; object_class->get_property = gtk_model_button_get_property;
object_class->set_property = gtk_model_button_set_property; object_class->set_property = gtk_model_button_set_property;
widget_class->destroy = gtk_model_button_destroy;
widget_class->state_flags_changed = gtk_model_button_state_flags_changed; widget_class->state_flags_changed = gtk_model_button_state_flags_changed;
widget_class->direction_changed = gtk_model_button_direction_changed; widget_class->direction_changed = gtk_model_button_direction_changed;
widget_class->focus = gtk_model_button_focus; widget_class->focus = gtk_model_button_focus;