diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-05-24 22:31:36 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-07-13 19:40:47 +0200 |
| commit | 4427760bcc330f60ec5778be04274f9f8073a84d (patch) | |
| tree | 3ffb76a88d357ea094b1287b1fcfdfe078271f90 /gtk/gtkmenu.c | |
| parent | 2de1f3f88c661f2b932f9ab36a3b22ca35df1635 (diff) | |
| download | gtk+-4427760bcc330f60ec5778be04274f9f8073a84d.tar.gz | |
Use GtkBin accessors
Diffstat (limited to 'gtk/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 55497e3b98..3534937618 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1783,7 +1783,7 @@ gtk_menu_popdown (GtkMenu *menu) { gtk_widget_set_size_request (menu->tearoff_window, -1, -1); - if (GTK_BIN (menu->toplevel)->child) + if (gtk_bin_get_child (GTK_BIN (menu->toplevel))) { gtk_menu_reparent (menu, menu->tearoff_hbox, TRUE); } @@ -1843,7 +1843,7 @@ gtk_menu_get_active (GtkMenu *menu) child = children->data; children = children->next; - if (GTK_BIN (child)->child) + if (gtk_bin_get_child (GTK_BIN (child))) break; child = NULL; } @@ -1869,7 +1869,7 @@ gtk_menu_set_active (GtkMenu *menu, if (tmp_list) { child = tmp_list->data; - if (GTK_BIN (child)->child) + if (gtk_bin_get_child (GTK_BIN (child))) { if (menu->old_active_menu_item) g_object_unref (menu->old_active_menu_item); @@ -2080,7 +2080,7 @@ gtk_menu_update_title (GtkMenu *menu) attach_widget = gtk_menu_get_attach_widget (menu); if (GTK_IS_MENU_ITEM (attach_widget)) { - GtkWidget *child = GTK_BIN (attach_widget)->child; + GtkWidget *child = gtk_bin_get_child (GTK_BIN (attach_widget)); if (GTK_IS_LABEL (child)) title = gtk_label_get_text (GTK_LABEL (child)); } @@ -3147,7 +3147,7 @@ get_accel_path (GtkWidget *menu_item, { *locked = TRUE; - label = GTK_BIN (menu_item)->child; + label = gtk_bin_get_child (GTK_BIN (menu_item)); if (GTK_IS_ACCEL_LABEL (label)) { @@ -3250,7 +3250,7 @@ gtk_menu_key_press (GtkWidget *widget, /* Modify the accelerators */ if (can_change_accels && menu_shell->active_menu_item && - GTK_BIN (menu_shell->active_menu_item)->child && /* no separators */ + gtk_bin_get_child (GTK_BIN (menu_shell->active_menu_item)) && /* no separators */ GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL && /* no submenus */ (delete || gtk_accelerator_valid (accel_key, accel_mods))) { |