[gtk+/gtk-2-90: 137/161] Remove deprecated GtkMenu stuff.



commit b61e80e843d65450278b37df1f2b291e5100ebdf
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Nov 24 17:33:48 2009 +0100

    Remove deprecated GtkMenu stuff.
    
    Also, substitute the deprecated functions with the new ones in
    documentation.

 docs/refcounting.txt                 |    2 +-
 docs/reference/gtk/gtk-sections.txt  |    3 ---
 docs/reference/gtk/tmpl/gtkmenu.sgml |   33 ---------------------------------
 gtk/gtkmenu.h                        |    6 ------
 4 files changed, 1 insertions(+), 43 deletions(-)
---
diff --git a/docs/refcounting.txt b/docs/refcounting.txt
index 5ebf818..8069400 100644
--- a/docs/refcounting.txt
+++ b/docs/refcounting.txt
@@ -197,7 +197,7 @@ GtkOptionMenu looks like this:
   /* menu_item->ref_count == 1 and it is flagged as `floating'.
    */
 
-  gtk_menu_append (GTK_MENU (menu), menu_item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
   /* menu_item->ref_count still == 1, but it is no longer `floating'.
    */
   
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index a0ebb7f..585bc37 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2363,9 +2363,6 @@ gtk_list_item_get_type
 GtkMenu
 gtk_menu_new
 gtk_menu_set_screen
-gtk_menu_append
-gtk_menu_prepend
-gtk_menu_insert
 gtk_menu_reorder_child
 gtk_menu_attach
 gtk_menu_popup
diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index c8d8376..fc4b42e 100644
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -206,39 +206,6 @@ Creates a new #GtkMenu.
 @screen: 
 
 
-<!-- ##### MACRO gtk_menu_append ##### -->
-<para>
-Adds a new #GtkMenuItem to the end of the menu's item list.
-</para>
-
- menu: a #GtkMenu.
- child: The #GtkMenuItem to add.
- Deprecated: Use gtk_menu_shell_append() instead.
-
-
-<!-- ##### MACRO gtk_menu_prepend ##### -->
-<para>
-Adds a new #GtkMenuItem to the beginning of the menu's item list.
-</para>
-
- menu: a #GtkMenu.
- child: The #GtkMenuItem to add.
- Deprecated: Use gtk_menu_shell_prepend() instead.
-
-
-<!-- ##### MACRO gtk_menu_insert ##### -->
-<para>
-Adds a new #GtkMenuItem to the menu's item list at the position
-indicated by @position. 
-</para>
-
- menu: a #GtkMenu.
- child: The #GtkMenuItem to add.
- pos: The position in the item list where @child is added.
-      Positions are numbered from 0 to n-1.
- Deprecated: Use gtk_menu_shell_insert() instead.
-
-
 <!-- ##### FUNCTION gtk_menu_reorder_child ##### -->
 <para>
 Moves a #GtkMenuItem to a new position within the #GtkMenu.
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 8a59ae0..6a944c0 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -203,12 +203,6 @@ void       gtk_menu_set_monitor           (GtkMenu             *menu,
 gint       gtk_menu_get_monitor           (GtkMenu             *menu);
 GList*     gtk_menu_get_for_attach_widget (GtkWidget           *widget); 
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_append(menu,child)	gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_prepend(menu,child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_insert(menu,child,pos)	gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
-#endif /* GTK_DISABLE_DEPRECATED */
-
 void     gtk_menu_set_reserve_toggle_size (GtkMenu  *menu,
                                           gboolean   reserve_toggle_size);
 gboolean gtk_menu_get_reserve_toggle_size (GtkMenu  *menu);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]