[gtk/kill-tree-menu: 49/52] gtk: Remove menu code
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/kill-tree-menu: 49/52] gtk: Remove menu code
- Date: Sat, 28 Dec 2019 16:26:26 +0000 (UTC)
commit cda6ee31b464749e6b5ac03f01c3b93fe6804d86
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Dec 27 08:46:08 2019 -0500
gtk: Remove menu code
GtkMenu, GtkMenuBar, and its supporting classes
are replaced by popover equivalents.
docs/reference/gtk/gtk4-docs.xml | 7 -
docs/reference/gtk/gtk4-sections.txt | 195 ---
docs/reference/gtk/gtk4.types.in | 7 -
docs/reference/gtk/meson.build | 4 -
gtk/a11y/gtk-a11y-autocleanups.h | 5 -
gtk/a11y/gtkcheckmenuitemaccessible.c | 128 --
gtk/a11y/gtkcheckmenuitemaccessible.h | 57 -
gtk/a11y/gtkmenuaccessible.c | 99 --
gtk/a11y/gtkmenuaccessible.h | 57 -
gtk/a11y/gtkmenuitemaccessible.c | 926 -----------
gtk/a11y/gtkmenuitemaccessible.h | 57 -
gtk/a11y/gtkmenushellaccessible.c | 199 ---
gtk/a11y/gtkmenushellaccessible.h | 57 -
gtk/a11y/gtkradiomenuitemaccessible.c | 117 --
gtk/a11y/gtkradiomenuitemaccessible.h | 57 -
gtk/a11y/gtktoplevelaccessible.c | 25 +-
gtk/a11y/meson.build | 10 -
gtk/gtk-a11y.h | 5 -
gtk/gtk-autocleanups.h | 5 -
gtk/gtk.h | 7 -
gtk/gtkcheckmenuitem.c | 623 --------
gtk/gtkcheckmenuitem.h | 102 --
gtk/gtkcheckmenuitemprivate.h | 31 -
gtk/gtkcombobox.c | 3 -
gtk/gtkentry.c | 1 -
gtk/gtkfilechooserwidget.c | 2 -
gtk/gtklabel.c | 3 -
gtk/gtklabel.h | 1 -
gtk/gtkmain.c | 1 -
gtk/gtkmenu.c | 2792 ---------------------------------
gtk/gtkmenu.h | 140 --
gtk/gtkmenubar.c | 489 ------
gtk/gtkmenubar.h | 56 -
gtk/gtkmenubarprivate.h | 43 -
gtk/gtkmenuitem.c | 1951 -----------------------
gtk/gtkmenuitem.h | 158 --
gtk/gtkmenuitemprivate.h | 63 -
gtk/gtkmenuprivate.h | 96 --
gtk/gtkmenushell.c | 1947 -----------------------
gtk/gtkmenushell.h | 135 --
gtk/gtkmenushellprivate.h | 98 --
gtk/gtkmenutoolbutton.c | 1 -
gtk/gtkmodelmenuitem.c | 505 ------
gtk/gtkmodelmenuitemprivate.h | 40 -
gtk/gtkmountoperation.c | 1 -
gtk/gtkpasswordentry.c | 1 -
gtk/gtkplacessidebar.c | 6 -
gtk/gtkradiomenuitem.c | 616 --------
gtk/gtkradiomenuitem.h | 75 -
gtk/gtkseparatormenuitem.c | 94 --
gtk/gtkseparatormenuitem.h | 53 -
gtk/gtkseparatortoolitem.c | 1 -
gtk/gtktext.c | 1 -
gtk/gtktextview.c | 1 -
gtk/gtktoggletoolbutton.c | 1 -
gtk/gtktoolbar.c | 3 -
gtk/gtktoolitem.c | 1 -
gtk/gtktoolitem.h | 1 -
gtk/gtkwidget.c | 1 -
gtk/inspector/object-tree.c | 1 -
gtk/meson.build | 15 -
po-properties/POTFILES.in | 5 -
62 files changed, 1 insertion(+), 12181 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index 13bbfe4228..577f229ca9 100644
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -217,12 +217,6 @@
<title>Menus, Combo Box, Toolbar</title>
<xi:include href="xml/gtkcombobox.xml" />
<xi:include href="xml/gtkcomboboxtext.xml" />
- <xi:include href="xml/gtkmenu.xml" />
- <xi:include href="xml/gtkmenubar.xml" />
- <xi:include href="xml/gtkmenuitem.xml" />
- <xi:include href="xml/gtkradiomenuitem.xml" />
- <xi:include href="xml/gtkcheckmenuitem.xml" />
- <xi:include href="xml/gtkseparatormenuitem.xml" />
<xi:include href="xml/gtktoolshell.xml" />
<xi:include href="xml/gtktoolbar.xml" />
<xi:include href="xml/gtktoolitem.xml" />
@@ -311,7 +305,6 @@
<xi:include href="xml/gtkwidget.xml" />
<xi:include href="xml/gtkcontainer.xml" />
<xi:include href="xml/gtkbin.xml" />
- <xi:include href="xml/gtkmenushell.xml" />
<xi:include href="xml/gtkrange.xml" />
<xi:include href="xml/gtkimcontext.xml" />
<xi:include href="xml/gtknativedialog.xml" />
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index fc58477346..d011835273 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -674,34 +674,6 @@ GTK_CHECK_BUTTON_GET_CLASS
gtk_check_button_get_type
</SECTION>
-<SECTION>
-<FILE>gtkcheckmenuitem</FILE>
-GtkCheckMenuItem
-GtkCheckMenuItemClass
-<TITLE>GtkCheckMenuItem</TITLE>
-gtk_check_menu_item_new
-gtk_check_menu_item_new_with_label
-gtk_check_menu_item_new_with_mnemonic
-gtk_check_menu_item_get_active
-gtk_check_menu_item_set_active
-gtk_check_menu_item_toggled
-gtk_check_menu_item_get_inconsistent
-gtk_check_menu_item_set_inconsistent
-gtk_check_menu_item_set_draw_as_radio
-gtk_check_menu_item_get_draw_as_radio
-
-<SUBSECTION Standard>
-GTK_CHECK_MENU_ITEM
-GTK_IS_CHECK_MENU_ITEM
-GTK_TYPE_CHECK_MENU_ITEM
-GTK_CHECK_MENU_ITEM_CLASS
-GTK_IS_CHECK_MENU_ITEM_CLASS
-GTK_CHECK_MENU_ITEM_GET_CLASS
-<SUBSECTION Private>
-GtkCheckMenuItemPrivate
-gtk_check_menu_item_get_type
-</SECTION>
-
<SECTION>
<FILE>gtkcolorbutton</FILE>
<TITLE>GtkColorButton</TITLE>
@@ -1830,66 +1802,6 @@ GTK_MAP_LIST_MODEL_GET_CLASS
gtk_map_list_model_get_type
</SECTION>
-<SECTION>
-<FILE>gtkmenu</FILE>
-<TITLE>GtkMenu</TITLE>
-GtkMenu
-gtk_menu_new
-gtk_menu_new_from_model
-GtkPopoverMenuFlags
-gtk_menu_reorder_child
-gtk_menu_popup_at_rect
-gtk_menu_popup_at_widget
-gtk_menu_popup_at_pointer
-gtk_menu_set_accel_group
-gtk_menu_get_accel_group
-gtk_menu_set_accel_path
-gtk_menu_get_accel_path
-gtk_menu_set_monitor
-gtk_menu_get_monitor
-gtk_menu_place_on_monitor
-gtk_menu_set_reserve_toggle_size
-gtk_menu_get_reserve_toggle_size
-<SUBSECTION>
-gtk_menu_popdown
-gtk_menu_reposition
-gtk_menu_get_active
-gtk_menu_set_active
-gtk_menu_attach_to_widget
-gtk_menu_detach
-gtk_menu_get_attach_widget
-gtk_menu_get_for_attach_widget
-GtkMenuDetachFunc
-<SUBSECTION Standard>
-GTK_MENU
-GTK_IS_MENU
-GTK_TYPE_MENU
-GTK_MENU_CLASS
-GTK_IS_MENU_CLASS
-GTK_MENU_GET_CLASS
-<SUBSECTION Private>
-GtkMenuPrivate
-gtk_menu_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkmenubar</FILE>
-<TITLE>GtkMenuBar</TITLE>
-GtkMenuBar
-gtk_menu_bar_new
-gtk_menu_bar_new_from_model
-<SUBSECTION Standard>
-GTK_MENU_BAR
-GTK_IS_MENU_BAR
-GTK_TYPE_MENU_BAR
-GTK_MENU_BAR_CLASS
-GTK_IS_MENU_BAR_CLASS
-GTK_MENU_BAR_GET_CLASS
-<SUBSECTION Private>
-GtkMenuBarPrivate
-gtk_menu_bar_get_type
-</SECTION>
-
<SECTION>
<FILE>gtkmenubutton</FILE>
<TITLE>GtkMenuButton</TITLE>
@@ -1925,72 +1837,6 @@ GtkMenuButtonPrivate
gtk_menu_button_get_type
</SECTION>
-<SECTION>
-<FILE>gtkmenuitem</FILE>
-<TITLE>GtkMenuItem</TITLE>
-GtkMenuItem
-GtkMenuItemClass
-gtk_menu_item_new
-gtk_menu_item_new_with_label
-gtk_menu_item_new_with_mnemonic
-gtk_menu_item_get_label
-gtk_menu_item_set_label
-gtk_menu_item_get_use_underline
-gtk_menu_item_set_use_underline
-gtk_menu_item_set_submenu
-gtk_menu_item_get_submenu
-gtk_menu_item_set_accel_path
-gtk_menu_item_get_accel_path
-gtk_menu_item_select
-gtk_menu_item_deselect
-gtk_menu_item_activate
-gtk_menu_item_toggle_size_request
-gtk_menu_item_toggle_size_allocate
-gtk_menu_item_get_reserve_indicator
-gtk_menu_item_set_reserve_indicator
-<SUBSECTION Standard>
-GTK_MENU_ITEM
-GTK_IS_MENU_ITEM
-GTK_TYPE_MENU_ITEM
-GTK_MENU_ITEM_CLASS
-GTK_IS_MENU_ITEM_CLASS
-GTK_MENU_ITEM_GET_CLASS
-<SUBSECTION Private>
-GtkMenuItemPrivate
-gtk_menu_item_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkmenushell</FILE>
-<TITLE>GtkMenuShell</TITLE>
-GtkMenuShell
-gtk_menu_shell_append
-gtk_menu_shell_prepend
-gtk_menu_shell_insert
-gtk_menu_shell_deactivate
-gtk_menu_shell_select_item
-gtk_menu_shell_select_first
-gtk_menu_shell_deselect
-gtk_menu_shell_activate_item
-gtk_menu_shell_cancel
-gtk_menu_shell_set_take_focus
-gtk_menu_shell_get_take_focus
-gtk_menu_shell_get_selected_item
-gtk_menu_shell_get_parent_shell
-gtk_menu_shell_bind_model
-GtkMenuDirectionType
-<SUBSECTION Standard>
-GTK_MENU_SHELL
-GTK_IS_MENU_SHELL
-GTK_TYPE_MENU_SHELL
-GTK_MENU_SHELL_CLASS
-GTK_IS_MENU_SHELL_CLASS
-GTK_MENU_SHELL_GET_CLASS
-<SUBSECTION Private>
-GtkMenuShellPrivate
-gtk_menu_shell_get_type
-</SECTION>
-
<SECTION>
<FILE>gtkmessagedialog</FILE>
<TITLE>GtkMessageDialog</TITLE>
@@ -2253,31 +2099,6 @@ GtkRadioButtonPrivate
gtk_radio_button_get_type
</SECTION>
-<SECTION>
-<FILE>gtkradiomenuitem</FILE>
-<TITLE>GtkRadioMenuItem</TITLE>
-GtkRadioMenuItem
-gtk_radio_menu_item_new
-gtk_radio_menu_item_new_with_label
-gtk_radio_menu_item_new_with_mnemonic
-gtk_radio_menu_item_new_from_widget
-gtk_radio_menu_item_new_with_label_from_widget
-gtk_radio_menu_item_new_with_mnemonic_from_widget
-gtk_radio_menu_item_set_group
-gtk_radio_menu_item_get_group
-gtk_radio_menu_item_join_group
-<SUBSECTION Standard>
-GTK_RADIO_MENU_ITEM
-GTK_IS_RADIO_MENU_ITEM
-GTK_TYPE_RADIO_MENU_ITEM
-GTK_RADIO_MENU_ITEM_CLASS
-GTK_IS_RADIO_MENU_ITEM_CLASS
-GTK_RADIO_MENU_ITEM_GET_CLASS
-<SUBSECTION Private>
-GtkRadioMenuItemPrivate
-gtk_radio_menu_item_get_type
-</SECTION>
-
<SECTION>
<FILE>gtkrange</FILE>
<TITLE>GtkRange</TITLE>
@@ -2584,22 +2405,6 @@ gtk_separator_get_type
GtkSeparatorPrivate
</SECTION>
-<SECTION>
-<FILE>gtkseparatormenuitem</FILE>
-<TITLE>GtkSeparatorMenuItem</TITLE>
-GtkSeparatorMenuItem
-gtk_separator_menu_item_new
-<SUBSECTION Standard>
-GTK_SEPARATOR_MENU_ITEM
-GTK_SEPARATOR_MENU_ITEM_CLASS
-GTK_SEPARATOR_MENU_ITEM_GET_CLASS
-GTK_IS_SEPARATOR_MENU_ITEM
-GTK_IS_SEPARATOR_MENU_ITEM_CLASS
-GTK_TYPE_SEPARATOR_MENU_ITEM
-<SUBSECTION Private>
-gtk_separator_menu_item_get_type
-</SECTION>
-
<SECTION>
<FILE>gtksettings</FILE>
<TITLE>GtkSettings</TITLE>
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index 2db6ce2348..f758c3eee7 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -44,7 +44,6 @@ gtk_cell_renderer_text_get_type
gtk_cell_renderer_toggle_get_type
gtk_cell_view_get_type
gtk_check_button_get_type
-gtk_check_menu_item_get_type
gtk_color_button_get_type
gtk_color_chooser_get_type
gtk_color_chooser_dialog_get_type
@@ -119,11 +118,7 @@ gtk_map_list_model_get_type
gtk_media_controls_get_type
gtk_media_file_get_type
gtk_media_stream_get_type
-gtk_menu_bar_get_type
gtk_menu_button_get_type
-gtk_menu_get_type
-gtk_menu_item_get_type
-gtk_menu_shell_get_type
gtk_menu_tool_button_get_type
gtk_message_dialog_get_type
gtk_mount_operation_get_type
@@ -152,7 +147,6 @@ gtk_print_settings_get_type
@DISABLE_ON_W32@gtk_print_unix_dialog_get_type
gtk_progress_bar_get_type
gtk_radio_button_get_type
-gtk_radio_menu_item_get_type
gtk_radio_tool_button_get_type
gtk_range_get_type
gtk_recent_manager_get_type
@@ -167,7 +161,6 @@ gtk_search_bar_get_type
gtk_search_entry_get_type
gtk_selection_model_get_type
gtk_separator_get_type
-gtk_separator_menu_item_get_type
gtk_separator_tool_item_get_type
gtk_settings_get_type
gtk_shortcut_label_get_type
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index ea469faf16..0ee718a1c5 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -17,7 +17,6 @@ private_headers = [
'gtkbuttonprivate.h',
'gtkcellareaboxcontextprivate.h',
'gtkcheckbuttonprivate.h',
- 'gtkcheckmenuitemprivate.h',
'gtkcolorchooserprivate.h',
'gtkcoloreditorprivate.h',
'gtkcolorplaneprivate.h',
@@ -138,9 +137,6 @@ private_headers = [
'gtkmagnifierprivate.h',
'gtkmediafileprivate.h',
'gtkmenubuttonprivate.h',
- 'gtkmenuitemprivate.h',
- 'gtkmenuprivate.h',
- 'gtkmenushellprivate.h',
'gtkmodulesprivate.h',
'gtkmountoperationprivate.h',
'gtknativedialogprivate.h',
diff --git a/gtk/a11y/gtk-a11y-autocleanups.h b/gtk/a11y/gtk-a11y-autocleanups.h
index 7bc1a3bae5..ad64194238 100644
--- a/gtk/a11y/gtk-a11y-autocleanups.h
+++ b/gtk/a11y/gtk-a11y-autocleanups.h
@@ -25,7 +25,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBooleanCellAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkButtonAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellAccessibleParent, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCheckMenuItemAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkComboBoxAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkContainerAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkContainerCellAccessible, g_object_unref)
@@ -43,17 +42,13 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLinkButtonAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListBoxAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListBoxRowAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLockButtonAccessible, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuButtonAccessible, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuItemAccessible, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuShellAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkNotebookAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkNotebookPageAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPanedAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPopoverAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkProgressBarAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRadioButtonAccessible, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRadioMenuItemAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRangeAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRendererCellAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScaleAccessible, g_object_unref)
diff --git a/gtk/a11y/gtktoplevelaccessible.c b/gtk/a11y/gtktoplevelaccessible.c
index 1512d6fe75..a7d07fec2f 100644
--- a/gtk/a11y/gtktoplevelaccessible.c
+++ b/gtk/a11y/gtktoplevelaccessible.c
@@ -22,8 +22,6 @@
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkframe.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkwindow.h>
@@ -91,25 +89,6 @@ gtk_toplevel_accessible_get_name (AtkObject *obj)
return g_get_prgname ();
}
-static gboolean
-is_attached_menu_window (GtkWidget *widget)
-{
- GtkWidget *child;
-
- child = gtk_bin_get_child (GTK_BIN (widget));
- if (GTK_IS_MENU (child))
- {
- GtkWidget *attach;
-
- attach = gtk_menu_get_attach_widget (GTK_MENU (child));
- /* Allow for menu belonging to the Panel Menu, which is a GtkButton */
- if (GTK_IS_MENU_ITEM (attach) || GTK_IS_BUTTON (attach))
- return TRUE;
- }
-
- return FALSE;
-}
-
static void
gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass)
{
@@ -177,8 +156,7 @@ show_event_watcher (GSignalInvocationHint *ihint,
return TRUE;
widget = GTK_WIDGET (object);
- if (gtk_widget_get_parent (widget) ||
- is_attached_menu_window (widget))
+ if (gtk_widget_get_parent (widget))
return TRUE;
child = gtk_widget_get_accessible (widget);
@@ -236,7 +214,6 @@ gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel)
widget = GTK_WIDGET (window);
if (!window ||
!gtk_widget_get_visible (widget) ||
- is_attached_menu_window (widget) ||
gtk_widget_get_parent (GTK_WIDGET (window)))
{
GList *temp_l = l->next;
diff --git a/gtk/a11y/meson.build b/gtk/a11y/meson.build
index 4ea944d0fd..550e4e7173 100644
--- a/gtk/a11y/meson.build
+++ b/gtk/a11y/meson.build
@@ -5,7 +5,6 @@ a11y_sources = files([
'gtkbuttonaccessible.c',
'gtkcellaccessible.c',
'gtkcellaccessibleparent.c',
- 'gtkcheckmenuitemaccessible.c',
'gtkcolorswatchaccessible.c',
'gtkcomboboxaccessible.c',
'gtkcontaineraccessible.c',
@@ -24,10 +23,7 @@ a11y_sources = files([
'gtklistboxaccessible.c',
'gtklistboxrowaccessible.c',
'gtklockbuttonaccessible.c',
- 'gtkmenuaccessible.c',
'gtkmenubuttonaccessible.c',
- 'gtkmenuitemaccessible.c',
- 'gtkmenushellaccessible.c',
'gtknotebookaccessible.c',
'gtknotebookpageaccessible.c',
'gtkpanedaccessible.c',
@@ -35,7 +31,6 @@ a11y_sources = files([
'gtkpopoveraccessible.c',
'gtkprogressbaraccessible.c',
'gtkradiobuttonaccessible.c',
- 'gtkradiomenuitemaccessible.c',
'gtkrangeaccessible.c',
'gtkrenderercellaccessible.c',
'gtkscaleaccessible.c',
@@ -62,7 +57,6 @@ a11y_headers = files([
'gtkbuttonaccessible.h',
'gtkcellaccessible.h',
'gtkcellaccessibleparent.h',
- 'gtkcheckmenuitemaccessible.h',
'gtkcomboboxaccessible.h',
'gtkcontaineraccessible.h',
'gtkcontainercellaccessible.h',
@@ -80,17 +74,13 @@ a11y_headers = files([
'gtklistboxaccessible.h',
'gtklistboxrowaccessible.h',
'gtklockbuttonaccessible.h',
- 'gtkmenuaccessible.h',
'gtkmenubuttonaccessible.h',
- 'gtkmenuitemaccessible.h',
- 'gtkmenushellaccessible.h',
'gtknotebookaccessible.h',
'gtknotebookpageaccessible.h',
'gtkpanedaccessible.h',
'gtkpopoveraccessible.h',
'gtkprogressbaraccessible.h',
'gtkradiobuttonaccessible.h',
- 'gtkradiomenuitemaccessible.h',
'gtkrangeaccessible.h',
'gtkrenderercellaccessible.h',
'gtkscaleaccessible.h',
diff --git a/gtk/gtk-a11y.h b/gtk/gtk-a11y.h
index 8013c3a9df..7afaf753de 100644
--- a/gtk/gtk-a11y.h
+++ b/gtk/gtk-a11y.h
@@ -32,7 +32,6 @@
#include <gtk/a11y/gtkbuttonaccessible.h>
#include <gtk/a11y/gtkcellaccessible.h>
#include <gtk/a11y/gtkcellaccessibleparent.h>
-#include <gtk/a11y/gtkcheckmenuitemaccessible.h>
#include <gtk/a11y/gtkcomboboxaccessible.h>
#include <gtk/a11y/gtkcontaineraccessible.h>
#include <gtk/a11y/gtkcontainercellaccessible.h>
@@ -50,17 +49,13 @@
#include <gtk/a11y/gtklistboxaccessible.h>
#include <gtk/a11y/gtklistboxrowaccessible.h>
#include <gtk/a11y/gtklockbuttonaccessible.h>
-#include <gtk/a11y/gtkmenuaccessible.h>
#include <gtk/a11y/gtkmenubuttonaccessible.h>
-#include <gtk/a11y/gtkmenuitemaccessible.h>
-#include <gtk/a11y/gtkmenushellaccessible.h>
#include <gtk/a11y/gtknotebookaccessible.h>
#include <gtk/a11y/gtknotebookpageaccessible.h>
#include <gtk/a11y/gtkpanedaccessible.h>
#include <gtk/a11y/gtkpopoveraccessible.h>
#include <gtk/a11y/gtkprogressbaraccessible.h>
#include <gtk/a11y/gtkradiobuttonaccessible.h>
-#include <gtk/a11y/gtkradiomenuitemaccessible.h>
#include <gtk/a11y/gtkrangeaccessible.h>
#include <gtk/a11y/gtkrenderercellaccessible.h>
#include <gtk/a11y/gtkscaleaccessible.h>
diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 2e11f477d4..91889b0bdb 100644
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -53,7 +53,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererText, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererToggle, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellView, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCheckButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCheckMenuItem, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkClipboard, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorButton, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorChooser, g_object_unref)
@@ -105,9 +104,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLevelBar, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLinkButton, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListStore, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLockButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuBar, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuItem, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuToolButton, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMessageDialog, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMountOperation, g_object_unref)
@@ -124,7 +121,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintOperationPreview, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintSettings, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkProgressBar, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRadioButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRadioMenuItem, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRadioToolButton, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRange, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRecentManager, g_object_unref)
@@ -137,7 +133,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScrolledWindow, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSearchBar, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSearchEntry, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSeparator, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSeparatorMenuItem, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSeparatorToolItem, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSettings, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStackSidebar, g_object_unref)
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 1fd949bd5f..a64a2a826a 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -76,7 +76,6 @@
#include <gtk/gtkcenterbox.h>
#include <gtk/gtkcenterlayout.h>
#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkcolorbutton.h>
#include <gtk/gtkcolorchooser.h>
#include <gtk/gtkcolorchooserdialog.h>
@@ -156,11 +155,7 @@
#include <gtk/gtkmediacontrols.h>
#include <gtk/gtkmediafile.h>
#include <gtk/gtkmediastream.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
#include <gtk/gtkmenubutton.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
#include <gtk/gtkmenutoolbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkmountoperation.h>
@@ -185,7 +180,6 @@
#include <gtk/gtkprintsettings.h>
#include <gtk/gtkprogressbar.h>
#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkradiomenuitem.h>
#include <gtk/gtkradiotoolbutton.h>
#include <gtk/gtkrange.h>
#include <gtk/gtkrecentmanager.h>
@@ -202,7 +196,6 @@
#include <gtk/gtkselection.h>
#include <gtk/gtkselectionmodel.h>
#include <gtk/gtkseparator.h>
-#include <gtk/gtkseparatormenuitem.h>
#include <gtk/gtkseparatortoolitem.h>
#include <gtk/gtksettings.h>
#include <gtk/gtkshortcutlabel.h>
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index caf9a04f3e..bbb7dba9b1 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -32,9 +32,6 @@
#include "gtkliststore.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkmenuitem.h"
-#include "gtkmenuprivate.h"
-#include "gtkmenushellprivate.h"
#include "gtkprivate.h"
#include "gtktogglebutton.h"
#include "gtktreepopoverprivate.h"
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index ff6074a7df..e4e41bf535 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -55,7 +55,6 @@
#include "gtkpopover.h"
#include "gtkprivate.h"
#include "gtkprogressbar.h"
-#include "gtkseparatormenuitem.h"
#include "gtkselection.h"
#include "gtksettings.h"
#include "gtksnapshot.h"
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 7ac3e20889..9e29889813 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -28,7 +28,6 @@
#include "gtkcelllayout.h"
#include "gtkcellrendererpixbuf.h"
#include "gtkcellrenderertext.h"
-#include "gtkcheckmenuitem.h"
#include "gtkcomboboxtext.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkdragsource.h"
@@ -55,7 +54,6 @@
#include "gtkprivate.h"
#include "gtkrecentmanager.h"
#include "gtksearchentryprivate.h"
-#include "gtkseparatormenuitem.h"
#include "gtksettings.h"
#include "gtksizegroup.h"
#include "gtksizerequest.h"
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9d8c0c49d9..671f73d155 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -41,12 +41,9 @@
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkmenuitem.h"
-#include "gtkmenushellprivate.h"
#include "gtknotebook.h"
#include "gtkpango.h"
#include "gtkprivate.h"
-#include "gtkseparatormenuitem.h"
#include "gtkshow.h"
#include "gtksnapshot.h"
#include "gtkstylecontextprivate.h"
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 2116d79b0e..b00e8cc0ad 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -30,7 +30,6 @@
#endif
#include <gtk/gtkwindow.h>
-#include <gtk/gtkmenu.h>
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 7d3f43bc9b..fe5868a95d 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -119,7 +119,6 @@
#include "gtkdndprivate.h"
#include "gtkmain.h"
#include "gtkmediafileprivate.h"
-#include "gtkmenu.h"
#include "gtkmodulesprivate.h"
#include "gtkprivate.h"
#include "gtkrecentmanager.h"
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 0f7cd35cb9..d49e036734 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -25,7 +25,6 @@
#include "gtkmenubutton.h"
#include "gtkmenubuttonprivate.h"
#include "gtkbox.h"
-#include "gtkmenu.h"
#include "gtkpopover.h"
#include "gtkmain.h"
#include "gtksizerequest.h"
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 3d292e1378..b94d124818 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -48,7 +48,6 @@
#include "gtkcellrendererpixbuf.h"
#include "gtkscrolledwindow.h"
#include "gtkicontheme.h"
-#include "gtkmenuitem.h"
#include "gtkmain.h"
#include "gtksettings.h"
#include "gtkstylecontextprivate.h"
diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c
index 99717faf37..a2eeda7900 100644
--- a/gtk/gtkpasswordentry.c
+++ b/gtk/gtkpasswordentry.c
@@ -29,7 +29,6 @@
#include "gtkgestureclick.h"
#include "gtkbox.h"
#include "gtkimage.h"
-#include "gtkcheckmenuitem.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 6b2ec5596e..6af770161b 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -40,10 +40,8 @@
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkmenuitem.h"
#include "gtkmountoperation.h"
#include "gtkscrolledwindow.h"
-#include "gtkseparatormenuitem.h"
#include "gtksettings.h"
#include "gtktrashmonitor.h"
#include "gtktypebuiltins.h"
@@ -195,10 +193,6 @@ struct _GtkPlacesSidebarClass {
void (* open_location) (GtkPlacesSidebar *sidebar,
GFile *location,
GtkPlacesOpenFlags open_flags);
- void (* populate_popup) (GtkPlacesSidebar *sidebar,
- GtkMenu *menu,
- GFile *selected_item,
- GVolume *selected_volume);
void (* show_error_message) (GtkPlacesSidebar *sidebar,
const gchar *primary,
const gchar *secondary);
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index d85ab09891..2bd71cfd90 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -23,7 +23,6 @@
#include "gtkintl.h"
#include "gtkprivate.h"
-#include "gtkseparatormenuitem.h"
#include "gtkstylecontext.h"
#include "gtktoolbarprivate.h"
#include "gtkwidgetprivate.h"
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 736b2bc83e..3b49ef71ba 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -52,7 +52,6 @@
#include "gtkpango.h"
#include "gtkpopovermenu.h"
#include "gtkprivate.h"
-#include "gtkseparatormenuitem.h"
#include "gtkselection.h"
#include "gtksettings.h"
#include "gtksnapshot.h"
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 0c1282c011..ab55d08057 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -37,7 +37,6 @@
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkrenderbackgroundprivate.h"
-#include "gtkseparatormenuitem.h"
#include "gtksettings.h"
#include "gtktextiterprivate.h"
#include "gtkimmulticontext.h"
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index 36241a764f..a91642a9b2 100644
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -19,7 +19,6 @@
#include "config.h"
#include "gtktoggletoolbutton.h"
-#include "gtkcheckmenuitem.h"
#include "gtklabel.h"
#include "gtktogglebutton.h"
#include "gtkintl.h"
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index fc232996f2..fd733ea2d7 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -51,11 +51,8 @@
#include "gtkpopovermenuprivate.h"
#include "gtkmodelbuttonprivate.h"
#include "gtkseparator.h"
-#include "gtkradiomenuitem.h"
-#include "gtkcheckmenuitem.h"
#include "gtkradiobutton.h"
#include "gtkradiotoolbutton.h"
-#include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h"
#include "gtktoolshell.h"
#include "gtktypebuiltins.h"
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index ffbbace135..0136b17d54 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -26,7 +26,6 @@
#include "gtkmarshalers.h"
#include "gtktoolshell.h"
-#include "gtkseparatormenuitem.h"
#include "gtksizerequest.h"
#include "gtkintl.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 5dcdc80315..103cdf523d 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -26,7 +26,6 @@
#endif
#include <gtk/gtkbin.h>
-#include <gtk/gtkmenuitem.h>
#include <gtk/gtksizegroup.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b939567dbc..0c42bc1534 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -51,7 +51,6 @@
#include "gtklayoutmanagerprivate.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkmenu.h"
#include "gtkpopover.h"
#include "gtkprivate.h"
#include "gtkrenderbackgroundprivate.h"
diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index cfc41987f5..c6f4665d8e 100644
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -41,7 +41,6 @@
#include "gtkiconview.h"
#include "gtklabel.h"
#include "gtklistbox.h"
-#include "gtkmenuitem.h"
#include "gtkpopover.h"
#include "gtksettings.h"
#include "gtksizegroup.h"
diff --git a/gtk/meson.build b/gtk/meson.build
index 00a3068864..85a25212a6 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -199,7 +199,6 @@ gtk_public_sources = files([
'gtkcenterbox.c',
'gtkcenterlayout.c',
'gtkcheckbutton.c',
- 'gtkcheckmenuitem.c',
'gtkcolorbutton.c',
'gtkcolorchooser.c',
'gtkcolorchooserdialog.c',
@@ -284,15 +283,10 @@ gtk_public_sources = files([
'gtkmediacontrols.c',
'gtkmediafile.c',
'gtkmediastream.c',
- 'gtkmenu.c',
- 'gtkmenubar.c',
'gtkmenubutton.c',
- 'gtkmenuitem.c',
- 'gtkmenushell.c',
'gtkmenutoolbutton.c',
'gtkmessagedialog.c',
'gtkmodelbutton.c',
- 'gtkmodelmenuitem.c',
'gtkmodules.c',
'gtkmountoperation.c',
'gtknativedialog.c',
@@ -318,7 +312,6 @@ gtk_public_sources = files([
'gtkprogressbar.c',
'gtkpropertylookuplistmodel.c',
'gtkradiobutton.c',
- 'gtkradiomenuitem.c',
'gtkradiotoolbutton.c',
'gtkrange.c',
'gtktreerbtree.c',
@@ -342,7 +335,6 @@ gtk_public_sources = files([
'gtkselection.c',
'gtkselectionmodel.c',
'gtkseparator.c',
- 'gtkseparatormenuitem.c',
'gtkseparatortoolitem.c',
'gtksettings.c',
'gtkshortcutlabel.c',
@@ -465,7 +457,6 @@ gtk_public_headers = files([
'gtkcellrenderertoggle.h',
'gtkcellview.h',
'gtkcheckbutton.h',
- 'gtkcheckmenuitem.h',
'gtkcolorbutton.h',
'gtkcolorchooser.h',
'gtkcolorchooserdialog.h',
@@ -547,11 +538,7 @@ gtk_public_headers = files([
'gtkmediacontrols.h',
'gtkmediafile.h',
'gtkmediastream.h',
- 'gtkmenu.h',
- 'gtkmenubar.h',
'gtkmenubutton.h',
- 'gtkmenuitem.h',
- 'gtkmenushell.h',
'gtkmenutoolbutton.h',
'gtkmessagedialog.h',
'gtkmountoperation.h',
@@ -576,7 +563,6 @@ gtk_public_headers = files([
'gtkprintsettings.h',
'gtkprogressbar.h',
'gtkradiobutton.h',
- 'gtkradiomenuitem.h',
'gtkradiotoolbutton.h',
'gtkrange.h',
'gtkrecentmanager.h',
@@ -593,7 +579,6 @@ gtk_public_headers = files([
'gtkselection.h',
'gtkselectionmodel.h',
'gtkseparator.h',
- 'gtkseparatormenuitem.h',
'gtkseparatortoolitem.h',
'gtksettings.h',
'gtkshortcutlabel.h',
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index 7e742f8661..921f38d504 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -50,7 +50,6 @@ gtk/a11y/gtkentryaccessible.c
gtk/a11y/gtkexpanderaccessible.c
gtk/a11y/gtkimageaccessible.c
gtk/a11y/gtkmenubuttonaccessible.c
-gtk/a11y/gtkmenuitemaccessible.c
gtk/a11y/gtkrenderercellaccessible.c
gtk/a11y/gtkscalebuttonaccessible.c
gtk/a11y/gtkspinneraccessible.c
@@ -194,11 +193,7 @@ gtk/gtkmaplistmodel.c
gtk/gtkmediacontrols.c
gtk/gtkmediafile.c
gtk/gtkmediastream.c
-gtk/gtkmenubar.c
gtk/gtkmenubutton.c
-gtk/gtkmenu.c
-gtk/gtkmenuitem.c
-gtk/gtkmenushell.c
gtk/gtkmenutoolbutton.c
gtk/gtkmenutrackeritem.c
gtk/gtkmessagedialog.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]