GNOME.org
 

[gtk/wip/otte/toolbar: 8/8] GtkToolbar: remove

commit 946dbdf4921de7751cc9db888b843c14ac670933
Author: Benjamin Otte <otte redhat com>
Date:   Mon Feb 3 05:42:34 2020 +0100

    GtkToolbar: remove

 demos/gtk-demo/iconview.c             |    8 +-
 docs/reference/gtk/gtk4-docs.xml      |   10 +-
 docs/reference/gtk/gtk4-sections.txt  |  213 ---
 docs/reference/gtk/gtk4.types.in      |    7 -
 docs/reference/gtk/migrating-3to4.xml |   17 +-
 docs/reference/gtk/visual_index.xml   |    3 -
 gtk/a11y/gtkimageaccessible.c         |   47 +-
 gtk/gtk-autocleanups.h                |    8 -
 gtk/gtk.h                             |    8 -
 gtk/gtkenums.h                        |   24 +-
 gtk/gtkmenutoolbutton.c               |  438 -----
 gtk/gtkmenutoolbutton.h               |   57 -
 gtk/gtkradiotoolbutton.c              |  217 ---
 gtk/gtkradiotoolbutton.h              |   53 -
 gtk/gtkseparatortoolitem.c            |  228 ---
 gtk/gtkseparatortoolitem.h            |   50 -
 gtk/gtktextview.c                     |    1 -
 gtk/gtktoggletoolbutton.c             |  258 ---
 gtk/gtktoggletoolbutton.h             |   83 -
 gtk/gtktoolbar.c                      | 2895 ---------------------------------
 gtk/gtktoolbar.h                      |   95 --
 gtk/gtktoolbarprivate.h               |   41 -
 gtk/gtktoolbutton.c                   | 1024 ------------
 gtk/gtktoolbutton.h                   |  112 --
 gtk/gtktoolitem.c                     |  822 ----------
 gtk/gtktoolitem.h                     |  141 --
 gtk/gtktoolshell.c                    |  203 ---
 gtk/gtktoolshell.h                    |   91 --
 gtk/meson.build                       |   16 -
 tests/meson.build                     |    2 -
 tests/stresstest-toolbar.c            |  157 --
 tests/testtoolbar.c                   |  642 --------
 32 files changed, 59 insertions(+), 7912 deletions(-)
---
diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index 7e0e15d4e2..d650acec42 100644
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -188,8 +188,8 @@ item_activated (GtkIconView *icon_view,
 }
 
 static void
-up_clicked (GtkToolItem *item,
-            gpointer     user_data)
+up_clicked (GtkButton *item,
+            gpointer   user_data)
 {
   GtkListStore *store;
   gchar *dir_name;
@@ -209,8 +209,8 @@ up_clicked (GtkToolItem *item,
 }
 
 static void
-home_clicked (GtkToolItem *item,
-              gpointer     user_data)
+home_clicked (GtkButton *item,
+              gpointer   user_data)
 {
   GtkListStore *store;
 
diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index a85bbd80e4..dc4f654722 100644
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -214,17 +214,9 @@
     </chapter>
 
     <chapter id="MenusAndCombos">
-      <title>Menus, Combo Box, Toolbar</title>
+      <title>Menus, Combo Box</title>
       <xi:include href="xml/gtkcombobox.xml" />
       <xi:include href="xml/gtkcomboboxtext.xml" />
-      <xi:include href="xml/gtktoolshell.xml" />
-      <xi:include href="xml/gtktoolbar.xml" />
-      <xi:include href="xml/gtktoolitem.xml" />
-      <xi:include href="xml/gtkseparatortoolitem.xml" />
-      <xi:include href="xml/gtktoolbutton.xml" />
-      <xi:include href="xml/gtkmenutoolbutton.xml" />
-      <xi:include href="xml/gtktoggletoolbutton.xml" />
-      <xi:include href="xml/gtkradiotoolbutton.xml" />
       <xi:include href="xml/gtkpopover.xml" />
       <xi:include href="xml/gtkpopovermenu.xml" />
       <xi:include href="xml/gtkpopovermenubar.xml" />
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 2482f9e0dc..708d7a21a2 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -3003,218 +3003,6 @@ gtk_toggle_button_get_type
 GtkToggleButtonPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtktoolshell</FILE>
-<TITLE>GtkToolShell</TITLE>
-GtkToolShell
-GtkToolShellIface
-gtk_tool_shell_get_ellipsize_mode
-gtk_tool_shell_get_orientation
-gtk_tool_shell_get_style
-gtk_tool_shell_get_text_alignment
-gtk_tool_shell_get_text_orientation
-gtk_tool_shell_rebuild_menu
-gtk_tool_shell_get_text_size_group
-
-<SUBSECTION Standard>
-GTK_IS_TOOL_SHELL
-GTK_TOOL_SHELL
-GTK_TOOL_SHELL_GET_IFACE
-GTK_TYPE_TOOL_SHELL
-
-<SUBSECTION Private>
-gtk_tool_shell_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtktoolbar</FILE>
-<TITLE>GtkToolbar</TITLE>
-GtkToolbar
-gtk_toolbar_new
-gtk_toolbar_insert
-gtk_toolbar_get_item_index
-gtk_toolbar_get_n_items
-gtk_toolbar_get_nth_item
-gtk_toolbar_get_drop_index
-gtk_toolbar_set_drop_highlight_item
-gtk_toolbar_set_show_arrow
-gtk_toolbar_get_show_arrow
-gtk_toolbar_get_style
-
-gtk_toolbar_set_style
-gtk_toolbar_unset_style
-
-<SUBSECTION Standard>
-GTK_TOOLBAR
-GTK_IS_TOOLBAR
-GTK_TYPE_TOOLBAR
-GTK_TOOLBAR_CLASS
-GTK_IS_TOOLBAR_CLASS
-GTK_TOOLBAR_GET_CLASS
-<SUBSECTION Private>
-gtk_toolbar_get_type
-GtkToolbarPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtktoolitem</FILE>
-<TITLE>GtkToolItem</TITLE>
-GtkToolItem
-GtkToolItemClass
-gtk_tool_item_new
-gtk_tool_item_set_homogeneous
-gtk_tool_item_get_homogeneous
-gtk_tool_item_set_expand
-gtk_tool_item_get_expand
-gtk_tool_item_set_tooltip_text
-gtk_tool_item_set_tooltip_markup
-gtk_tool_item_set_visible_horizontal
-gtk_tool_item_get_visible_horizontal
-gtk_tool_item_set_visible_vertical
-gtk_tool_item_get_visible_vertical
-gtk_tool_item_set_is_important
-gtk_tool_item_get_is_important
-gtk_tool_item_get_ellipsize_mode
-gtk_tool_item_get_orientation
-gtk_tool_item_get_toolbar_style
-gtk_tool_item_get_text_alignment
-gtk_tool_item_get_text_orientation
-gtk_tool_item_set_overflow_text
-gtk_tool_item_get_overflow_text
-gtk_tool_item_rebuild_menu
-gtk_tool_item_toolbar_reconfigured
-gtk_tool_item_get_text_size_group
-
-<SUBSECTION Standard>
-GTK_TYPE_TOOL_ITEM
-GTK_TOOL_ITEM
-GTK_TOOL_ITEM_CLASS
-GTK_IS_TOOL_ITEM
-GTK_IS_TOOL_ITEM_CLASS
-GTK_TOOL_ITEM_GET_CLASS
-
-<SUBSECTION Private>
-gtk_tool_item_get_type
-GtkToolItemPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkseparatortoolitem</FILE>
-<TITLE>GtkSeparatorToolItem</TITLE>
-GtkSeparatorToolItem
-gtk_separator_tool_item_new
-gtk_separator_tool_item_set_draw
-gtk_separator_tool_item_get_draw
-
-<SUBSECTION Standard>
-GTK_TYPE_SEPARATOR_TOOL_ITEM
-GTK_SEPARATOR_TOOL_ITEM
-GTK_SEPARATOR_TOOL_ITEM_CLASS
-GTK_IS_SEPARATOR_TOOL_ITEM
-GTK_IS_SEPARATOR_TOOL_ITEM_CLASS
-GTK_SEPARATOR_TOOL_ITEM_GET_CLASS
-
-<SUBSECTION Private>
-gtk_separator_tool_item_get_type
-GtkSeparatorToolItemPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtktoolbutton</FILE>
-<TITLE>GtkToolButton</TITLE>
-GtkToolButton
-GtkToolButtonClass
-gtk_tool_button_new
-gtk_tool_button_set_label
-gtk_tool_button_get_label
-gtk_tool_button_set_use_underline
-gtk_tool_button_get_use_underline
-gtk_tool_button_set_icon_name
-gtk_tool_button_get_icon_name
-gtk_tool_button_set_icon_widget
-gtk_tool_button_get_icon_widget
-gtk_tool_button_set_label_widget
-gtk_tool_button_get_label_widget
-
-<SUBSECTION Standard>
-GTK_TYPE_TOOL_BUTTON
-GTK_TOOL_BUTTON
-GTK_TOOL_BUTTON_CLASS
-GTK_IS_TOOL_BUTTON
-GTK_IS_TOOL_BUTTON_CLASS
-GTK_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_tool_button_get_type
-GtkToolButtonPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkmenutoolbutton</FILE>
-<TITLE>GtkMenuToolButton</TITLE>
-GtkMenuToolButton
-gtk_menu_tool_button_new
-gtk_menu_tool_button_set_popover
-gtk_menu_tool_button_get_popover
-gtk_menu_tool_button_set_arrow_tooltip_text
-gtk_menu_tool_button_set_arrow_tooltip_markup
-
-<SUBSECTION Standard>
-GTK_TYPE_MENU_TOOL_BUTTON
-GTK_MENU_TOOL_BUTTON
-GTK_MENU_TOOL_BUTTON_CLASS
-GTK_IS_MENU_TOOL_BUTTON
-GTK_IS_MENU_TOOL_BUTTON_CLASS
-GTK_MENU_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_menu_tool_button_get_type
-GtkMenuToolButtonPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkradiotoolbutton</FILE>
-<TITLE>GtkRadioToolButton</TITLE>
-GtkRadioToolButton
-gtk_radio_tool_button_new
-gtk_radio_tool_button_new_from_widget
-gtk_radio_tool_button_get_group
-gtk_radio_tool_button_set_group
-
-<SUBSECTION Standard>
-GTK_TYPE_RADIO_TOOL_BUTTON
-GTK_RADIO_TOOL_BUTTON
-GTK_RADIO_TOOL_BUTTON_CLASS
-GTK_IS_RADIO_TOOL_BUTTON
-GTK_IS_RADIO_TOOL_BUTTON_CLASS
-GTK_RADIO_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_radio_tool_button_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtktoggletoolbutton</FILE>
-<TITLE>GtkToggleToolButton</TITLE>
-GtkToggleToolButton
-GtkToggleToolButtonClass
-gtk_toggle_tool_button_new
-gtk_toggle_tool_button_set_active
-gtk_toggle_tool_button_get_active
-
-<SUBSECTION Standard>
-GTK_TYPE_TOGGLE_TOOL_BUTTON
-GTK_TOGGLE_TOOL_BUTTON
-GTK_TOGGLE_TOOL_BUTTON_CLASS
-GTK_IS_TOGGLE_TOOL_BUTTON
-GTK_IS_TOGGLE_TOOL_BUTTON_CLASS
-GTK_TOGGLE_TOOL_BUTTON_GET_CLASS
-
-<SUBSECTION Private>
-gtk_toggle_tool_button_get_type
-GtkToggleToolButtonPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtktooltip</FILE>
 <TITLE>GtkTooltip</TITLE>
@@ -4977,7 +4765,6 @@ GtkScrollType
 GtkSelectionMode
 GtkShadowType
 GtkStateFlags
-GtkToolbarStyle
 GtkSortType
 GtkIconSize
 
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index 60d8712f97..f856be4c2e 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -122,7 +122,6 @@ gtk_media_controls_get_type
 gtk_media_file_get_type
 gtk_media_stream_get_type
 gtk_menu_button_get_type
-gtk_menu_tool_button_get_type
 gtk_message_dialog_get_type
 gtk_mount_operation_get_type
 gtk_native_get_type
@@ -150,7 +149,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_tool_button_get_type
 gtk_range_get_type
 gtk_recent_manager_get_type
 gtk_revealer_get_type
@@ -164,7 +162,6 @@ gtk_search_bar_get_type
 gtk_search_entry_get_type
 gtk_selection_model_get_type
 gtk_separator_get_type
-gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_shortcut_label_get_type
 gtk_shortcuts_window_get_type
@@ -196,10 +193,6 @@ gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
 gtk_toggle_button_get_type
-gtk_toggle_tool_button_get_type
-gtk_toolbar_get_type
-gtk_tool_button_get_type
-gtk_tool_item_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
 gtk_tree_list_model_get_type
diff --git a/docs/reference/gtk/migrating-3to4.xml b/docs/reference/gtk/migrating-3to4.xml
index 5d1e776514..294c404d69 100644
--- a/docs/reference/gtk/migrating-3to4.xml
+++ b/docs/reference/gtk/migrating-3to4.xml
@@ -877,20 +877,19 @@
         switching to menu models and actions.
       </para>
       <para>
-        Since menus are gone, GtkMenuButton and GtkMenuToolButton also lost their
-        ability to show menus, and need to be used with popovers in GTK 4.
+        Since menus are gone, GtkMenuButton also lost its ability to show menus,
+        and needs to be used with popovers in GTK 4.
       </para>
     </section>
 
     <section>
-      <title>GtkToolbar overflow handling has changed</title>
+      <title>GtkToolbar has been removed</title>
       <para>
-        The handling of overflow in toolbars has been simplified.
-        Instead of creating a proxy menuitem and setting it with
-        gtk_tool_item_set_proxy_menu_item(), you simply provide
-        a label for the overflow menu with gtk_tool_item_set_overflow_text().
-        GTK will figure out itself whether to create a check- or
-        radioitem as proxy.
+        Toolbars were using outdated concepts such as requiring special toolitem
+        widgets.
+      </para>
+      <para>
+        Toolbars should be replaced by using a GtkBox with regular widgets instead.
       </para>
     </section>
 
diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 092031b70e..44cc4e6433 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -162,9 +162,6 @@
     <link linkend="GtkPaned">
       <inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic>
     </link>
-    <link linkend="GtkToolbar">
-      <inlinegraphic fileref="toolbar.png" format="PNG"></inlinegraphic>
-    </link>
     <link linkend="GtkPlacesSidebar">
       <inlinegraphic fileref="placessidebar.png" format="PNG"></inlinegraphic>
     </link>
diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c
index e4837d128f..99a27a658a 100644
--- a/gtk/a11y/gtkimageaccessible.c
+++ b/gtk/a11y/gtkimageaccessible.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include "gtkimageaccessible.h"
-#include "gtktoolbarprivate.h"
 #include "gtkimageprivate.h"
 #include "gtkintl.h"
 
@@ -129,6 +128,50 @@ static const NameMapEntry name_map[] = {
   { "zoom-out", NC_("Stock label", "Zoom _Out") }
 };
 
+/* GTK+ internal methods */
+static gchar *
+elide_underscores (const gchar *original)
+{
+  gchar *q, *result;
+  const gchar *p, *end;
+  gsize len;
+  gboolean last_underscore;
+
+  if (!original)
+    return NULL;
+
+  len = strlen (original);
+  q = result = g_malloc (len + 1);
+  last_underscore = FALSE;
+
+  end = original + len;
+  for (p = original; p < end; p++)
+    {
+      if (!last_underscore && *p == '_')
+        last_underscore = TRUE;
+      else
+        {
+          last_underscore = FALSE;
+          if (original + 2 <= p && p + 1 <= end &&
+              p[-2] == '(' && p[-1] == '_' && p[0] != '_' && p[1] == ')')
+            {
+              q--;
+              *q = '\0';
+              p++;
+            }
+          else
+            *q++ = *p;
+        }
+    }
+
+  if (last_underscore)
+    *q++ = '_';
+
+  *q = '\0';
+
+  return result;
+}
+
 static gchar *
 name_from_icon_name (const gchar *icon_name)
 {
@@ -147,7 +190,7 @@ name_from_icon_name (const gchar *icon_name)
           label = g_dpgettext2 (GETTEXT_PACKAGE, "Stock label", name_map[i].label);
           g_free (name);
 
-          return _gtk_toolbar_elide_underscores (label);
+          return elide_underscores (label);
         }
     }
 
diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 1ed3d765b1..c4fbd2da02 100644
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -105,7 +105,6 @@ 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(GtkMenuButton, 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)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkNotebook, g_object_unref)
@@ -121,7 +120,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(GtkRadioToolButton, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRange, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRecentManager, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRevealer, g_object_unref)
@@ -133,7 +131,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(GtkSeparatorToolItem, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSettings, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStackSidebar, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSizeGroup, g_object_unref)
@@ -152,11 +149,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextTag, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextTagTable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextView, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToggleButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToggleToolButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToolButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToolItem, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToolShell, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToolbar, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTooltip, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeDragDest, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeDragSource, g_object_unref)
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 8205a19622..68fcf844b3 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -156,7 +156,6 @@
 #include <gtk/gtkmediafile.h>
 #include <gtk/gtkmediastream.h>
 #include <gtk/gtkmenubutton.h>
-#include <gtk/gtkmenutoolbutton.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkmountoperation.h>
 #include <gtk/gtknative.h>
@@ -180,7 +179,6 @@
 #include <gtk/gtkprintsettings.h>
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtkradiobutton.h>
-#include <gtk/gtkradiotoolbutton.h>
 #include <gtk/gtkrange.h>
 #include <gtk/gtkrecentmanager.h>
 #include <gtk/gtkrender.h>
@@ -196,7 +194,6 @@
 #include <gtk/gtkselection.h>
 #include <gtk/gtkselectionmodel.h>
 #include <gtk/gtkseparator.h>
-#include <gtk/gtkseparatortoolitem.h>
 #include <gtk/gtksettings.h>
 #include <gtk/gtkshortcutlabel.h>
 #include <gtk/gtkshortcutsgroup.h>
@@ -228,11 +225,6 @@
 #include <gtk/gtktexttagtable.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
-#include <gtk/gtktoggletoolbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolshell.h>
 #include <gtk/gtktooltip.h>
 #include <gtk/gtktestutils.h>
 #include <gtk/gtktreednd.h>
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index edf1c2d373..18e2ecd476 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -332,7 +332,7 @@ typedef enum
  * @GTK_ORIENTATION_VERTICAL: The element is in vertical orientation.
  *
  * Represents the orientation of widgets and other objects which can be switched
- * between horizontal and vertical orientation on the fly, like #GtkToolbar or
+ * between horizontal and vertical orientation on the fly, like #GtkBox or
  * #GtkGesturePan.
  */
 typedef enum
@@ -494,28 +494,6 @@ typedef enum
 
 /* Widget states */
 
-/**
- * GtkToolbarStyle:
- * @GTK_TOOLBAR_ICONS: Buttons display only icons in the toolbar.
- * @GTK_TOOLBAR_TEXT: Buttons display only text labels in the toolbar.
- * @GTK_TOOLBAR_BOTH: Buttons display text and icons in the toolbar.
- * @GTK_TOOLBAR_BOTH_HORIZ: Buttons display icons and text alongside each
- *  other, rather than vertically stacked
- *
- * Used to customize the appearance of a #GtkToolbar. Note that
- * setting the toolbar style overrides the user’s preferences
- * for the default toolbar style.  Note that if the button has only
- * a label set and GTK_TOOLBAR_ICONS is used, the label will be
- * visible, and vice versa.
- */
-typedef enum
-{
-  GTK_TOOLBAR_ICONS,
-  GTK_TOOLBAR_TEXT,
-  GTK_TOOLBAR_BOTH,
-  GTK_TOOLBAR_BOTH_HORIZ
-} GtkToolbarStyle;
-
 /**
  * GtkWrapMode:
  * @GTK_WRAP_NONE: do not wrap lines; just make the text area wider
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 4e6ce8d468..8e9e094a5a 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -50,7 +50,6 @@
 #include "gtktexthandleprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkpopover.h"
-#include "gtktoolbar.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkemojichooser.h"
 #include "gtkpango.h"
diff --git a/gtk/meson.build b/gtk/meson.build
index 17156b001a..b610540fa2 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -279,7 +279,6 @@ gtk_public_sources = files([
   'gtkmediafile.c',
   'gtkmediastream.c',
   'gtkmenubutton.c',
-  'gtkmenutoolbutton.c',
   'gtkmessagedialog.c',
   'gtkmodelbutton.c',
   'gtkmodules.c',
@@ -307,7 +306,6 @@ gtk_public_sources = files([
   'gtkprogressbar.c',
   'gtkpropertylookuplistmodel.c',
   'gtkradiobutton.c',
-  'gtkradiotoolbutton.c',
   'gtkrange.c',
   'gtktreerbtree.c',
   'gtkrecentmanager.c',
@@ -330,7 +328,6 @@ gtk_public_sources = files([
   'gtkselection.c',
   'gtkselectionmodel.c',
   'gtkseparator.c',
-  'gtkseparatortoolitem.c',
   'gtksettings.c',
   'gtkshortcutlabel.c',
   'gtkshortcutsgroup.c',
@@ -371,11 +368,6 @@ gtk_public_sources = files([
   'gtktextutil.c',
   'gtktextview.c',
   'gtktogglebutton.c',
-  'gtktoggletoolbutton.c',
-  'gtktoolbar.c',
-  'gtktoolbutton.c',
-  'gtktoolitem.c',
-  'gtktoolshell.c',
   'gtktooltip.c',
   'gtktooltipwindow.c',
   'gtktreednd.c',
@@ -532,7 +524,6 @@ gtk_public_headers = files([
   'gtkmediafile.h',
   'gtkmediastream.h',
   'gtkmenubutton.h',
-  'gtkmenutoolbutton.h',
   'gtkmessagedialog.h',
   'gtkmountoperation.h',
   'gtknative.h',
@@ -556,7 +547,6 @@ gtk_public_headers = files([
   'gtkprintsettings.h',
   'gtkprogressbar.h',
   'gtkradiobutton.h',
-  'gtkradiotoolbutton.h',
   'gtkrange.h',
   'gtkrecentmanager.h',
   'gtkrender.h',
@@ -572,7 +562,6 @@ gtk_public_headers = files([
   'gtkselection.h',
   'gtkselectionmodel.h',
   'gtkseparator.h',
-  'gtkseparatortoolitem.h',
   'gtksettings.h',
   'gtkshortcutlabel.h',
   'gtkshortcutsgroup.h',
@@ -605,11 +594,6 @@ gtk_public_headers = files([
   'gtktexttagtable.h',
   'gtktextview.h',
   'gtktogglebutton.h',
-  'gtktoggletoolbutton.h',
-  'gtktoolbar.h',
-  'gtktoolbutton.h',
-  'gtktoolitem.h',
-  'gtktoolshell.h',
   'gtktooltip.h',
   'gtktreednd.h',
   'gtktreelistmodel.h',
diff --git a/tests/meson.build b/tests/meson.build
index a62924d050..58198895da 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -73,9 +73,7 @@ gtk_tests = [
   ['testscale'],
   ['testselectionmode'],
   ['testspinbutton'],
-  ['testtoolbar'],
   ['testtoolbar2'],
-  ['stresstest-toolbar'],
   ['testtreechanging'],
   ['testtreednd'],
   ['testtreeedit'],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]