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-3.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-3.ui')
| -rw-r--r-- | tests/merge-3.ui | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/merge-3.ui b/tests/merge-3.ui index 397930d27e..9fce79cb21 100644 --- a/tests/merge-3.ui +++ b/tests/merge-3.ui @@ -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> |