Deprecate GtkAction and GtkUIManager

It is recommended to use GAction et al and GtkBuilder.

1 files changed, 23 insertions, 2 deletions

diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index 90ba2fd744..81484526d8 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -153,9 +153,11 @@ static void gtk_tool_item_set_use_action_appearance  (GtkToolItem          *item
 
 static guint toolitem_signals[LAST_SIGNAL] = { 0 };
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
 G_DEFINE_TYPE_WITH_CODE (GtkToolItem, gtk_tool_item, GTK_TYPE_BIN,
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
 						gtk_tool_item_activatable_interface_init))
+G_GNUC_END_IGNORE_DEPRECATIONS;
 
 static void
 gtk_tool_item_class_init (GtkToolItemClass *klass)
@@ -314,7 +316,9 @@ gtk_tool_item_dispose (GObject *object)
 
   if (item->priv->action)
     {
+      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (item), NULL);      
+      G_GNUC_END_IGNORE_DEPRECATIONS;
       item->priv->action = NULL;
     }
   G_OBJECT_CLASS (gtk_tool_item_parent_class)->dispose (object);
@@ -559,6 +563,9 @@ _gtk_tool_item_create_menu_proxy (GtkToolItem *item)
 {
   GtkWidget *menu_item;
   gboolean visible_overflown;
+  gboolean ret = FALSE;
+
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
 
   if (item->priv->action)
     {
@@ -575,10 +582,12 @@ _gtk_tool_item_create_menu_proxy (GtkToolItem *item)
       else
 	gtk_tool_item_set_proxy_menu_item (item, "gtk-action-menu-item", NULL);
 
-      return TRUE;
+      ret = TRUE;
     }
 
-  return FALSE;
+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
+  return ret;
 }
 
 static void
@@ -593,6 +602,8 @@ gtk_tool_item_update (GtkActivatable *activatable,
 		      GtkAction      *action,
 	     	      const gchar    *property_name)
 {
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
   if (strcmp (property_name, "visible") == 0)
     {
       if (gtk_action_is_visible (action))
@@ -614,6 +625,8 @@ gtk_tool_item_update (GtkActivatable *activatable,
   else if (strcmp (property_name, "is-important") == 0)
     gtk_tool_item_set_is_important (GTK_TOOL_ITEM (activatable),
 				    gtk_action_get_is_important (action));
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
 static void
@@ -623,6 +636,8 @@ gtk_tool_item_sync_action_properties (GtkActivatable *activatable,
   if (!action)
     return;
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
   if (gtk_action_is_visible (action))
     gtk_widget_show (GTK_WIDGET (activatable));
   else
@@ -638,6 +653,8 @@ gtk_tool_item_sync_action_properties (GtkActivatable *activatable,
 				      gtk_action_get_visible_vertical (action));
   gtk_tool_item_set_is_important (GTK_TOOL_ITEM (activatable),
 				  gtk_action_get_is_important (action));
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
 static void
@@ -647,7 +664,9 @@ gtk_tool_item_set_related_action (GtkToolItem *item,
   if (item->priv->action == action)
     return;
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (item), action);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   item->priv->action = action;
 
@@ -665,7 +684,9 @@ gtk_tool_item_set_use_action_appearance (GtkToolItem *item,
     {
       item->priv->use_action_appearance = use_appearance;
 
+      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (item), item->priv->action);
+      G_GNUC_END_IGNORE_DEPRECATIONS;
     }
 }