AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 19:00:12 +00:00
Code Issues Projects Releases Wiki Activity

modelbutton: Replace map() with root()

Browse Source
This commit is contained in:
Timm Bäder 2019-09-28 10:30:35 +02:00
parent 722f8e825e
commit b8f37da911
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkmodelbutton.c
View File

@ -984,21 +984,25 @@ gtk_model_button_finalize (GObject *object)
} }
static void static void
gtk_model_button_map (GtkWidget *widget) gtk_model_button_root (GtkWidget *widget)
{ {
GtkModelButton *button = GTK_MODEL_BUTTON (widget); GtkModelButton *self = GTK_MODEL_BUTTON (widget);
GtkWindow *window; GtkRoot *root;
GtkApplication *app; GtkApplication *app;
const char *action_name; const char *action_name;
GVariant *action_target; GVariant *action_target;
GTK_WIDGET_CLASS (gtk_model_button_parent_class)->map (widget); GTK_WIDGET_CLASS (gtk_model_button_parent_class)->root (widget);
if (button->accel) if (!self->accel)
return; return;
window = GTK_WINDOW (gtk_widget_get_root (widget)); root = gtk_widget_get_root (widget);
app = gtk_window_get_application (window);
if (!GTK_IS_WINDOW (root))
return;
app = gtk_window_get_application (GTK_WINDOW (root));
if (!app) if (!app)
return; return;
@ -1014,7 +1018,7 @@ gtk_model_button_map (GtkWidget *widget)
detailed = g_action_print_detailed_name (action_name, action_target); detailed = g_action_print_detailed_name (action_name, action_target);
accels = gtk_application_get_accels_for_action (app, detailed); accels = gtk_application_get_accels_for_action (app, detailed);
update_accel (button, accels[0]); update_accel (self, accels[0]);
g_strfreev (accels); g_strfreev (accels);
g_free (detailed); g_free (detailed);
@ -1081,10 +1085,10 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
widget_class->measure = gtk_model_button_measure; widget_class->measure = gtk_model_button_measure;
widget_class->size_allocate = gtk_model_button_size_allocate; widget_class->size_allocate = gtk_model_button_size_allocate;
widget_class->destroy = gtk_model_button_destroy; widget_class->destroy = gtk_model_button_destroy;
widget_class->map = gtk_model_button_map;
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;
widget_class->root = gtk_model_button_root;
button_class->clicked = gtk_model_button_clicked; button_class->clicked = gtk_model_button_clicked;