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 /demos | |
| 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 'demos')
| -rw-r--r-- | demos/gtk-demo/appwindow.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c index 916f1ae444..c3f36f7082 100644 --- a/demos/gtk-demo/appwindow.c +++ b/demos/gtk-demo/appwindow.c @@ -101,39 +101,39 @@ static GtkActionGroupEntry entries[] = { static guint n_entries = G_N_ELEMENTS (entries); static const gchar *ui_info = -"<Root>" -" <menu name='MenuBar'>" -" <submenu name='FileMenu'>" +"<ui>" +" <menubar name='MenuBar'>" +" <menu name='FileMenu'>" " <menuitem name='New'/>" " <menuitem name='Open'/>" " <menuitem name='Save'/>" " <menuitem name='SaveAs'/>" " <separator name='Sep1'/>" " <menuitem name='Quit'/>" -" </submenu>" -" <submenu name='PreferencesMenu'>" -" <submenu name='ColorMenu'>" +" </menu>" +" <menu name='PreferencesMenu'>" +" <menu name='ColorMenu'>" " <menuitem name='Red'/>" " <menuitem name='Green'/>" " <menuitem name='Blue'/>" -" </submenu>" -" <submenu name='ShapeMenu'>" +" </menu>" +" <menu name='ShapeMenu'>" " <menuitem name='Square'/>" " <menuitem name='Rectangle'/>" " <menuitem name='Oval'/>" -" </submenu>" -" </submenu>" -" <submenu name='HelpMenu'>" +" </menu>" +" </menu>" +" <menu name='HelpMenu'>" " <menuitem name='About'/>" -" </submenu>" -" </menu>" -" <dockitem name='ToolBar'>" +" </menu>" +" </menubar>" +" <toolbar name='ToolBar'>" " <toolitem name='Open'/>" " <toolitem name='Quit'/>" " <separator name='Sep1'/>" " <toolitem name='Logo'/>" -" </dockitem>" -"</Root>"; +" </toolbar>" +"</ui>"; |