Remove GtkOptionMenu completely

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 835f4a62cf628da4b1cde14dfe373aa1af1f1b33..b4c703b4e940e681aa14fb247cc591e6258c6113 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2617,27 +2617,6 @@ GTK_OFFSCREEN_WINDOW_GET_CLASS
 gtk_offscreen_window_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkoptionmenu</FILE>
-<TITLE>GtkOptionMenu</TITLE>
-GtkOptionMenu
-gtk_option_menu_new
-gtk_option_menu_get_menu
-gtk_option_menu_set_menu
-gtk_option_menu_remove_menu
-gtk_option_menu_set_history
-gtk_option_menu_get_history
-<SUBSECTION Standard>
-GTK_OPTION_MENU
-GTK_IS_OPTION_MENU
-GTK_TYPE_OPTION_MENU
-GTK_OPTION_MENU_CLASS
-GTK_IS_OPTION_MENU_CLASS
-GTK_OPTION_MENU_GET_CLASS
-<SUBSECTION Private>
-gtk_option_menu_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkpaned</FILE>
 <TITLE>GtkPaned</TITLE>

diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types
index a7a185bd95273f4311f48b75d2d44984feac729f..d85ae81fc33f2d0d18770553fe1a63cf73ab6f7d 100644 (file)
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -102,7 +102,6 @@ gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
 gtk_offscreen_window_get_type
-gtk_option_menu_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
 gtk_page_setup_unix_dialog_get_type

diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
deleted file mode 100644 (file)
index 3b58a49..0000000
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkOptionMenu
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget used to choose from a list of valid choices
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkOptionMenu is a widget that allows the user to choose from a
-list of valid choices.  The #GtkOptionMenu displays the selected 
-choice.  When activated the #GtkOptionMenu displays a popup #GtkMenu 
-which allows the user to make a new choice.
-</para>
-
-<para>
-Using a #GtkOptionMenu is simple; build a #GtkMenu, by calling
-gtk_menu_new(), then appending menu items to it with 
-gtk_menu_shell_append(). Set that menu on the option menu 
-with gtk_option_menu_set_menu(). Set the selected menu item with
-gtk_option_menu_set_history(); connect to the "changed" signal on
-the option menu; in the "changed" signal, check the new selected 
-menu item with gtk_option_menu_get_history().
-</para>
-
-<para>
-As of GTK+ 2.4, #GtkOptionMenu has been deprecated in favor of #GtkComboBox.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkOptionMenu ##### -->
-<para>
-The #GtkOptionMenu-struct struct contains private data only, and 
-should be accessed using the functions below.
-</para>
-
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-<!-- ##### SIGNAL GtkOptionMenu::changed ##### -->
-<para>
-
-</para>
-
-@optionmenu: the object which received the signal.
-
-<!-- ##### ARG GtkOptionMenu:menu ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_option_menu_new ##### -->
-<para>
-Creates a new #GtkOptionMenu.
-</para>
-
-@Returns: a new #GtkOptionMenu.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_option_menu_get_menu ##### -->
-<para>
-Returns the #GtkMenu associated with the #GtkOptionMenu.
-</para>
-
-@option_menu: a #GtkOptionMenu.
-@Returns: the #GtkMenu associated with the #GtkOptionMenu.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_option_menu_set_menu ##### -->
-<para>
-Provides the #GtkMenu that is popped up to allow the user to choose
-a new value.  You should provide a simple menu avoiding the
-use of tearoff menu items, submenus, and accelerators.
-</para>
-
-@option_menu: a #GtkOptionMenu.
-@menu: the #GtkMenu to associate with the #GtkOptionMenu.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_option_menu_remove_menu ##### -->
-<para>
-Removes the menu from the option menu.
-</para>
-
-@option_menu: a #GtkOptionMenu.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_option_menu_set_history ##### -->
-<para>
-Selects the menu item specified by @index_ making it the newly
-selected value for the option menu.
-</para>
-
-@option_menu: a #GtkOptionMenu.
-@index_: the index of the menu item to select.  Index values are from 0 to n-1.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_option_menu_get_history ##### -->
-<para>
-
-</para>
-
-@option_menu: 
-@Returns: 
-
-

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a17b027aea046064b0f3600793836633d81931a2..3d04a2153e2da363b55a413edef72566976737d4 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2199,18 +2199,6 @@ gtk_orientable_set_orientation
 #endif
 #endif
 
-#if IN_HEADER(__GTK_OPTION_MENU_H__)
-#if IN_FILE(__GTK_OPTION_MENU_C__)
-gtk_option_menu_get_history
-gtk_option_menu_get_menu
-gtk_option_menu_get_type G_GNUC_CONST
-gtk_option_menu_new
-gtk_option_menu_remove_menu
-gtk_option_menu_set_history
-gtk_option_menu_set_menu
-#endif
-#endif
-
 #if IN_HEADER(__GTK_PANED_H__)
 #if IN_FILE(__GTK_PANED_C__)
 gtk_paned_add1