gdk: Deprecate thread functions

[~andy/gtk] / tests / merge-1.ui

diff --git a/tests/merge-1.ui b/tests/merge-1.ui
index 8ff6a72b2ba116a4870f46aa6f794febacb1714f..b2cb72218c5bcefe5084aa902e2a9217f622252d 100644 (file)
--- a/tests/merge-1.ui
+++ b/tests/merge-1.ui
@@ -1,20 +1,28 @@
 <!--*- xml -*-->
-<Root>
-  <menu>
-    <submenu name="FileMenu" verb="StockFileMenuAction">
-      <menuitem name="Open" verb="OpenAction" />
-    </submenu>
-    <submenu name="EditMenu" verb="StockEditMenuAction">
-      <menuitem name="Cut" verb="CutAction" />
-    </submenu>
+<ui>
+  <menubar>
+    <menu name="FileMenu" action="FileMenuAction">
+      <menuitem name="Open" action="OpenAction" />
+      <menuitem name="Bold" action="BoldAction" />
+    </menu>
+    <menu name="EditMenu" action="EditMenuAction">
+      <menuitem name="Cut" action="CutAction" />
+      <menu name="EmptyMenu1" action="EmptyMenu1Action">
+      </menu>
+      <menu name="EmptyMenu2" action="EmptyMenu2Action">
+      </menu>
+    </menu>
     <placeholder name="TestPlaceholder" />
-  </menu>
-  <dockitem name="toolbar1">
-    <placeholder name="ToolbarPlaceholder" />
-    <toolitem name="NewButton" verb="NewAction" />
-    <toolitem name="CutButton" verb="CutAction" />
-    <toolitem name="CopyButton" verb="CopyAction" />
-    <toolitem name="PasteButton" verb="PasteAction" />
+  </menubar>
+  <toolbar name="toolbar1">
+    <placeholder name="ToolbarPlaceholder">
+       <toolitem name="nb2" action="New2Action" />
+       <separator name="Sep1" />
+    </placeholder>
+    <toolitem name="NewButton" action="NewAction" />
+    <toolitem name="CutButton" action="CutAction" />
+    <toolitem name="CopyButton" action="CopyAction" />
+    <toolitem name="PasteButton" action="PasteAction" />
     <placeholder name="JustifyToolItems"/>
-  </dockitem>
-</Root>
+  </toolbar>
+</ui>