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

gtktearoffmenuitem: Move public members to private structure

Browse Source
This commit is contained in:
Javier Jardón 2010-07-13 20:09:59 +02:00
parent 5f1b5d2406
commit e69979f7b6
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtktearoffmenuitem.c
View File

@ -34,6 +34,11 @@
#define TEAR_LENGTH 5 #define TEAR_LENGTH 5
#define BORDER_SPACING 3 #define BORDER_SPACING 3
struct _GtkTearoffMenuItemPriv
{
guint torn_off : 1;
};
static void gtk_tearoff_menu_item_size_request (GtkWidget *widget, static void gtk_tearoff_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static gint gtk_tearoff_menu_item_expose (GtkWidget *widget, static gint gtk_tearoff_menu_item_expose (GtkWidget *widget,
@ -64,12 +69,21 @@ gtk_tearoff_menu_item_class_init (GtkTearoffMenuItemClass *klass)
widget_class->parent_set = gtk_tearoff_menu_item_parent_set; widget_class->parent_set = gtk_tearoff_menu_item_parent_set;
menu_item_class->activate = gtk_tearoff_menu_item_activate; menu_item_class->activate = gtk_tearoff_menu_item_activate;
g_type_class_add_private (klass, sizeof (GtkTearoffMenuItemPriv));
} }
static void static void
gtk_tearoff_menu_item_init (GtkTearoffMenuItem *tearoff_menu_item) gtk_tearoff_menu_item_init (GtkTearoffMenuItem *tearoff_menu_item)
{ {
tearoff_menu_item->torn_off = FALSE; GtkTearoffMenuItemPriv *priv;
tearoff_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (tearoff_menu_item,
GTK_TYPE_TEAROFF_MENU_ITEM,
GtkTearoffMenuItemPriv);
priv = tearoff_menu_item->priv;
priv->torn_off = FALSE;
} }
static void static void
@ -227,8 +241,9 @@ tearoff_state_changed (GtkMenu *menu,
gpointer data) gpointer data)
{ {
GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (data); GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (data);
GtkTearoffMenuItemPriv *priv = tearoff_menu_item->priv;
tearoff_menu_item->torn_off = gtk_menu_get_tearoff_state (menu); priv->torn_off = gtk_menu_get_tearoff_state (menu);
} }
static void static void
@ -236,6 +251,7 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
GtkWidget *previous) GtkWidget *previous)
{ {
GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (widget); GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (widget);
GtkTearoffMenuItemPriv *priv = tearoff_menu_item->priv;
GtkMenu *menu = GTK_IS_MENU (widget->parent) ? GTK_MENU (widget->parent) : NULL; GtkMenu *menu = GTK_IS_MENU (widget->parent) ? GTK_MENU (widget->parent) : NULL;
if (previous) if (previous)
@ -245,7 +261,7 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
if (menu) if (menu)
{ {
tearoff_menu_item->torn_off = gtk_menu_get_tearoff_state (menu); priv->torn_off = gtk_menu_get_tearoff_state (menu);
g_signal_connect (menu, "notify::tearoff-state", g_signal_connect (menu, "notify::tearoff-state",
G_CALLBACK (tearoff_state_changed), G_CALLBACK (tearoff_state_changed),
tearoff_menu_item); tearoff_menu_item);

4
gtk/gtktearoffmenuitem.h
View File

@ -46,13 +46,15 @@ G_BEGIN_DECLS
typedef struct _GtkTearoffMenuItem GtkTearoffMenuItem; typedef struct _GtkTearoffMenuItem GtkTearoffMenuItem;
typedef struct _GtkTearoffMenuItemPriv GtkTearoffMenuItemPriv;
typedef struct _GtkTearoffMenuItemClass GtkTearoffMenuItemClass; typedef struct _GtkTearoffMenuItemClass GtkTearoffMenuItemClass;
struct _GtkTearoffMenuItem struct _GtkTearoffMenuItem
{ {
GtkMenuItem menu_item; GtkMenuItem menu_item;
guint GSEAL (torn_off) : 1; /* <private> */
GtkTearoffMenuItemPriv *priv;
}; };
struct _GtkTearoffMenuItemClass struct _GtkTearoffMenuItemClass