diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-30 17:28:26 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2011-01-04 23:37:14 +0900 |
| commit | 4ff893979b7c99092910c2796f7701ece3914005 (patch) | |
| tree | 7cd3eeb01e203697298aebe5d4d22c78a30885fb /gtk/gtktreemenu.c | |
| parent | d681aa7977c7ee8144600f8b837d09720ef62f4b (diff) | |
| download | gtk+-4ff893979b7c99092910c2796f7701ece3914005.tar.gz | |
Fixed conflicts after rebasing master into combo-refactor branch.
Diffstat (limited to 'gtk/gtktreemenu.c')
| -rw-r--r-- | gtk/gtktreemenu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c index ddade3cb4c..bef19053f4 100644 --- a/gtk/gtktreemenu.c +++ b/gtk/gtktreemenu.c @@ -42,6 +42,7 @@ #include "gtkcellareacontext.h" #include "gtkcelllayout.h" #include "gtkcellview.h" +#include "gtkmenushellprivate.h" #include "gtkprivate.h" @@ -1035,7 +1036,7 @@ row_changed_cb (GtkTreeModel *model, { /* Destroy the header item and then the following separator */ gtk_widget_destroy (item); - gtk_widget_destroy (GTK_MENU_SHELL (menu)->children->data); + gtk_widget_destroy (GTK_MENU_SHELL (menu)->priv->children->data); priv->menu_with_header = FALSE; } @@ -1137,11 +1138,11 @@ area_apply_attributes_cb (GtkCellArea *area, /* For header items we need to set the sensitivity * of the following separator item */ - if (GTK_MENU_SHELL (menu)->children && - GTK_MENU_SHELL (menu)->children->next) + if (GTK_MENU_SHELL (menu)->priv->children && + GTK_MENU_SHELL (menu)->priv->children->next) { GtkWidget *separator = - GTK_MENU_SHELL (menu)->children->next->data; + GTK_MENU_SHELL (menu)->priv->children->next->data; gtk_widget_set_sensitive (separator, sensitive); } @@ -1188,7 +1189,7 @@ menu_occupied (GtkTreeMenu *menu, { GList *i; - for (i = GTK_MENU_SHELL (menu)->children; i; i = i->next) + for (i = GTK_MENU_SHELL (menu)->priv->children; i; i = i->next) { guint l, r, b, t; |