diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-08-26 00:13:59 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-26 00:13:59 +0000 |
| commit | 720bdb8daf6727700eb6df80bc057a93d45b277a (patch) | |
| tree | 878a7ce87050325d0f8001974142c2174a8b046a /tests/merge-2.ui | |
| parent | 2be259b24a5cd25efc8375207ac1a3bc1ceb9c62 (diff) | |
| download | gtk+-720bdb8daf6727700eb6df80bc057a93d45b277a.tar.gz | |
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.
Diffstat (limited to 'tests/merge-2.ui')
| -rw-r--r-- | tests/merge-2.ui | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/merge-2.ui b/tests/merge-2.ui index cf32ecfcc4..8a059298d1 100644 --- a/tests/merge-2.ui +++ b/tests/merge-2.ui @@ -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> |