callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gssize for length, not gsize.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/merge-2.ui
View File

@ -1,27 +1,27 @@
<!--*- xml -*-->
<Root>
<menu>
<submenu name="FileMenu" verb="StockFileMenuAction">
<menuitem name="New" verb="NewAction" pos="top" />
<ui>
<menubar>
<menu name="FileMenu" action="StockFileMenuAction">
<menuitem name="New" action="NewAction" pos="top" />
<separator />
<menuitem name="Quit" verb="QuitAction" />
</submenu>
<submenu name="HelpMenu" verb="StockHelpMenuAction">
<menuitem name="About" verb="AboutAction" />
</submenu>
</menu>
<dockitem name="toolbar1">
<menuitem name="Quit" action="QuitAction" />
</menu>
<menu name="HelpMenu" action="StockHelpMenuAction">
<menuitem name="About" action="AboutAction" />
</menu>
</menubar>
<toolbar name="toolbar1">
<placeholder name="ToolbarPlaceholder">
<toolitem name="Quit" verb="QuitAction" />
<toolitem name="Quit" action="QuitAction" />
<separator />
</placeholder>
</dockitem>
</toolbar>
<popups>
<popup name="FileMenu" verb="StockFileMenuAction">
<menuitem name="New" verb="NewAction" pos="top" />
<submenu name="HelpMenu" verb="StockHelpMenuAction">
<menuitem name="About" verb="AboutAction" />
</submenu>
<popup name="FileMenu" action="StockFileMenuAction">
<menuitem name="New" action="NewAction" pos="top" />
<menu name="HelpMenu" action="StockHelpMenuAction">
<menuitem name="About" action="AboutAction" />
</menu>
</popup>
</popups>
</Root>
</ui>