diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-03-26 13:02:59 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-03-28 23:18:58 +0100 |
| commit | 030c65f299ace029a77baee9adeedcd803a237dd (patch) | |
| tree | 87dcc9b860e4ab4663a9f2860fa37e62b2c8c98d /gtk/deprecated/gtktearoffmenuitem.c | |
| parent | b8ed3e9ef52bb45ff9a3836e50fd7b90936c2c97 (diff) | |
| download | gtk+-030c65f299ace029a77baee9adeedcd803a237dd.tar.gz | |
tearoffmenuitem: Use public API, don't poke GtkMenuPrivate
Diffstat (limited to 'gtk/deprecated/gtktearoffmenuitem.c')
| -rw-r--r-- | gtk/deprecated/gtktearoffmenuitem.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/deprecated/gtktearoffmenuitem.c b/gtk/deprecated/gtktearoffmenuitem.c index d5528bbc32..49c8e60f93 100644 --- a/gtk/deprecated/gtktearoffmenuitem.c +++ b/gtk/deprecated/gtktearoffmenuitem.c @@ -24,7 +24,7 @@ #include "config.h" -#include "gtkmenuprivate.h" +#include "gtkmenu.h" #include "gtkmenuitemprivate.h" #include "gtkstylecontext.h" #include "gtktearoffmenuitem.h" @@ -167,7 +167,7 @@ gtk_tearoff_menu_item_get_preferred_height (GtkWidget *widget, *minimum = *natural = (border_width * 2) + padding.top + padding.bottom; parent = gtk_widget_get_parent (widget); - if (GTK_IS_MENU (parent) && GTK_MENU (parent)->priv->torn_off) + if (GTK_IS_MENU (parent) && gtk_menu_get_tearoff_state (GTK_MENU (parent))) { *minimum += ARROW_SIZE; *natural += ARROW_SIZE; @@ -217,7 +217,7 @@ gtk_tearoff_menu_item_draw (GtkWidget *widget, } parent = gtk_widget_get_parent (widget); - if (GTK_IS_MENU (parent) && GTK_MENU (parent)->priv->torn_off) + if (GTK_IS_MENU (parent) && gtk_menu_get_tearoff_state (GTK_MENU (parent))) { gint arrow_x; @@ -292,8 +292,7 @@ gtk_tearoff_menu_item_activate (GtkMenuItem *menu_item) GtkMenu *menu = GTK_MENU (parent); gtk_widget_queue_resize (GTK_WIDGET (menu_item)); - gtk_menu_set_tearoff_state (GTK_MENU (parent), - !menu->priv->torn_off); + gtk_menu_set_tearoff_state (menu, !gtk_menu_get_tearoff_state (menu)); } } |