From e7e395652cfac4aa5385aa91fd6079fae13dd129 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <maclas@gmx.de>
Date: Sun, 24 Aug 2003 19:58:30 +0000
Subject: A model-view separation for menus and toolbars, using the EggMenu
 code by

2003-08-24  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkaction.[ch]:
	* gtk/gtktoggleaction.[ch]:
	* gtk/gtktoggleactionprivate.h:
	* gtk/gtkradioaction.[ch]:
	* gtk/gtkactiongroup.[ch]:
	* gtk/gtkmenumerge.[ch]: A model-view separation for menus and
	toolbars, using the EggMenu code by James Henstridge.

	* gtk/gtk.h: Include new headers.
	* gtk/Makefile.am: Add new files.

	* tests/testactions.c: Test for actions.
	* tests/testmerge.c: Test for menu merging.
	* tests/merge-[123].ui: Test data for testmerge.
	* tests/Makefile.am: Add testactions and testmerge.

	* demos/gtk-demo/appwindow.c: Use GtkMenuMerge to construct the
	menubar and toolbar.
---
 tests/merge-3.ui | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 tests/merge-3.ui

(limited to 'tests/merge-3.ui')

diff --git a/tests/merge-3.ui b/tests/merge-3.ui
new file mode 100644
index 0000000000..397930d27e
--- /dev/null
+++ b/tests/merge-3.ui
@@ -0,0 +1,23 @@
+<!--*- xml -*-->
+<Root>
+  <menu>
+    <submenu name="FileMenu" verb="StockFileMenuAction">
+      <menuitem name="New" verb="New2Action" />
+    </submenu>
+    <placeholder name="TestPlaceholder">
+      <submenu name="Test">
+        <menuitem name="Cut" verb="CutAction" />
+      </submenu>
+    </placeholder>
+  </menu>
+  <dockitem name="toolbar1">
+    <placeholder name="JustifyToolItems">
+      <separator name="first-sep"/>
+      <toolitem name="Left" verb="justify-left"/>
+      <toolitem name="Centre" verb="justify-center"/>
+      <toolitem name="Right" verb="justify-right"/>
+      <toolitem name="Fill" verb="justify-fill"/>
+      <separator name="second-sep" />
+    </placeholder>
+  </dockitem>
+</Root>
-- 
cgit v1.2.1