gtk: Use new macros for defining private data

https://bugzilla.gnome.org/show_bug.cgi?id=702996

1 files changed, 4 insertions, 34 deletions

diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c
index 8fef02e6f9..5bdf729159 100644
--- a/gtk/gtktreemenu.c
+++ b/gtk/gtktreemenu.c
@@ -197,44 +197,16 @@ static guint   tree_menu_signals[N_SIGNALS] = { 0 };
 static GQuark  tree_menu_path_quark = 0;
 
 G_DEFINE_TYPE_WITH_CODE (GtkTreeMenu, _gtk_tree_menu, GTK_TYPE_MENU,
+                         G_ADD_PRIVATE (GtkTreeMenu)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT,
                                                 gtk_tree_menu_cell_layout_init));
 
 static void
 _gtk_tree_menu_init (GtkTreeMenu *menu)
 {
-  GtkTreeMenuPrivate *priv;
-
-  menu->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu,
-                                            GTK_TYPE_TREE_MENU,
-                                            GtkTreeMenuPrivate);
-  priv = menu->priv;
-
-  priv->model     = NULL;
-  priv->root      = NULL;
-  priv->area      = NULL;
-  priv->context   = NULL;
-
-  priv->size_changed_id  = 0;
-  priv->row_inserted_id  = 0;
-  priv->row_deleted_id   = 0;
-  priv->row_reordered_id = 0;
-  priv->row_changed_id   = 0;
-
-  priv->wrap_width   = 0;
-  priv->row_span_col = -1;
-  priv->col_span_col = -1;
-
-  priv->menu_with_header = FALSE;
-  priv->tearoff          = FALSE;
-
-  priv->row_separator_func    = NULL;
-  priv->row_separator_data    = NULL;
-  priv->row_separator_destroy = NULL;
-
-  priv->header_func    = NULL;
-  priv->header_data    = NULL;
-  priv->header_destroy = NULL;
+  menu->priv = _gtk_tree_menu_get_instance_private (menu);
+  menu->priv->row_span_col = -1;
+  menu->priv->col_span_col = -1;
 
   gtk_menu_set_reserve_toggle_size (GTK_MENU (menu), FALSE);
 }
@@ -410,8 +382,6 @@ _gtk_tree_menu_class_init (GtkTreeMenuClass *class)
                                                      G_MAXINT,
                                                      -1,
                                                      GTK_PARAM_READWRITE));
-
-  g_type_class_add_private (object_class, sizeof (GtkTreeMenuPrivate));
 }
 
 /****************************************************************