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

A model-view separation for menus and toolbars, using the EggMenu code by

Browse Source 
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.
This commit is contained in:
Matthias Clasen
2003-08-24 19:58:30 +00:00
committed by Matthias Clasen
parent 9897d659c0
commit e7e395652c
25 changed files with 4928 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/merge-2.ui Normal file
View File

@ -0,0 +1,27 @@
<!--*- xml -*-->
<Root>
<menu>
<submenu name="FileMenu" verb="StockFileMenuAction">
<menuitem name="New" verb="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">
<placeholder name="ToolbarPlaceholder">
<toolitem name="Quit" verb="QuitAction" />
<separator />
</placeholder>
</dockitem>
<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>
</popups>
</Root>