Use gssize for length, not gsize.

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

	* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize
	for length, not gsize.

	* gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to
	<ui> and make it optional in strings. Rename verb to action, <dockitem>
	to <toolbar>, <menu> to <menubar>, <submenu> to <menu>.

	* demos/gtk-demo/appwindow.c:
	* tests/testactions.c:
	* tests/testmerge.c:
	* tests/merge-1.ui:
	* tests/merge-2.ui:
	* tests/merge-3.ui: Adjust to the new XML format.
This commit is contained in:
Matthias Clasen
2003-08-26 00:13:59 +00:00
committed by Matthias Clasen
parent 2be259b24a
commit 720bdb8daf
13 changed files with 346 additions and 221 deletions

View File

@ -1,23 +1,23 @@
<!--*- xml -*-->
<Root>
<menu>
<submenu name="FileMenu" verb="StockFileMenuAction">
<menuitem name="New" verb="New2Action" />
</submenu>
<ui>
<menubar>
<menu name="FileMenu" action="StockFileMenuAction">
<menuitem name="New" action="New2Action" />
</menu>
<placeholder name="TestPlaceholder">
<submenu name="Test">
<menuitem name="Cut" verb="CutAction" />
</submenu>
<menu name="Test">
<menuitem name="Cut" action="CutAction" />
</menu>
</placeholder>
</menu>
<dockitem name="toolbar1">
</menubar>
<toolbar 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"/>
<toolitem name="Left" action="justify-left"/>
<toolitem name="Centre" action="justify-center"/>
<toolitem name="Right" action="justify-right"/>
<toolitem name="Fill" action="justify-fill"/>
<separator name="second-sep" />
</placeholder>
</dockitem>
</Root>
</toolbar>
</ui>