Commit 5e8c9634 authored by Matthias Clasen's avatar Matthias Clasen

Rename GtkMenuMerge to GtkUIManager

parent 77af2d63
2003-08-26 Matthias Clasen <maclas@gmx.de>
* gtk/gtk-sections.txt: Rename GtkMenuMerge to GtkUIManager
* gtk/gtk-docs.sgml: Adjust.
* gtk/tmpl/gtkuimanager.sgml: New template.
* gtk/tmpl/gtkmenumerge.sgml: Removed.
2003-08-24 Matthias Clasen <maclas@gmx.de>
* gtk/tmpl/gtkmenumerge.sgml:
......
......@@ -61,7 +61,6 @@
<!ENTITY GtkMenu SYSTEM "xml/gtkmenu.xml">
<!ENTITY GtkMenuBar SYSTEM "xml/gtkmenubar.xml">
<!ENTITY GtkMenuItem SYSTEM "xml/gtkmenuitem.xml">
<!ENTITY GtkMenuMerge SYSTEM "xml/gtkmenumerge.xml">
<!ENTITY GtkMenuShell SYSTEM "xml/gtkmenushell.xml">
<!ENTITY GtkMessageDialog SYSTEM "xml/gtkmessagedialog.xml">
<!ENTITY GtkMisc SYSTEM "xml/gtkmisc.xml">
......@@ -116,6 +115,7 @@
<!ENTITY GtkTreeStore SYSTEM "xml/gtktreestore.xml">
<!ENTITY GtkTreeViewColumn SYSTEM "xml/gtktreeviewcolumn.xml">
<!ENTITY GtkTreeView SYSTEM "xml/gtktreeview.xml">
<!ENTITY GtkUIManager SYSTEM "xml/gtkuimanager.xml">
<!ENTITY GtkCellRenderer SYSTEM "xml/gtkcellrenderer.xml">
<!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
<!ENTITY GtkCellRendererPixbuf SYSTEM "xml/gtkcellrendererpixbuf.xml">
......@@ -399,7 +399,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
<chapter id="Actions">
<title>Action-based menus and toolbars</title>
&GtkMenuMerge;
&GtkUIManager;
&GtkActionGroup;
&GtkAction;
&GtkToggleAction;
......
......@@ -1714,30 +1714,30 @@ gtk_menu_item_get_type
</SECTION>
<SECTION>
<FILE>gtkmenumerge</FILE>
<TITLE>GtkMenuMerge</TITLE>
GtkMenuMerge
gtk_menu_merge_new
gtk_menu_merge_insert_action_group
gtk_menu_merge_remove_action_group
gtk_menu_merge_get_action_groups
gtk_menu_merge_get_accel_group
gtk_menu_merge_get_widget
gtk_menu_merge_add_ui_from_string
gtk_menu_merge_add_ui_from_file
gtk_menu_merge_remove_ui
gtk_menu_merge_get_ui
<SUBSECTION Standard>
GTK_TYPE_MENU_MERGE
GTK_MENU_MERGE
GTK_MENU_MERGE_CLASS
GTK_IS_MENU_MERGE
GTK_IS_MENU_MERGE_CLASS
GTK_MENU_MERGE_GET_CLASS
GtkMenuMergeClass
<SUBSECTION Private>
gtk_menu_merge_get_type
GtkMenuMergePrivate
<FILE>gtkuimanager</FILE>
<TITLE>GtkUIManager</TITLE>
GtkUIManager
gtk_ui_manager_new
gtk_ui_manager_insert_action_group
gtk_ui_manager_remove_action_group
gtk_ui_manager_get_action_groups
gtk_ui_manager_get_accel_group
gtk_ui_manager_get_widget
gtk_ui_manager_add_ui_from_string
gtk_ui_manager_add_ui_from_file
gtk_ui_manager_remove_ui
gtk_ui_manager_get_ui
<SUBSECTION Standard>
GTK_TYPE_UI_MANAGER
GTK_UI_MANAGER
GTK_UI_MANAGER_CLASS
GTK_IS_UI_MANAGER
GTK_IS_UI_MANAGER_CLASS
GTK_UI_MANAGER_GET_CLASS
GtkUIManagerClass
<SUBSECTION Private>
gtk_ui_manager_get_type
GtkUIManagerPrivate
</SECTION>
<SECTION>
......
<!-- ##### SECTION Title ##### -->
GtkMenuMerge
GtkUIManager
<!-- ##### SECTION Short_Description ##### -->
constructing menus and toolbars from an XML description
<!-- ##### SECTION Long_Description ##### -->
<para>
A #GtkUIManager constructs a user interface (menus and toolbars) from
one or more UI definitions, which reference actions from one or ore
action groups.
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### STRUCT GtkMenuMerge ##### -->
<!-- ##### STRUCT GtkUIManager ##### -->
<para>
</para>
@parent:
<!-- ##### FUNCTION gtk_menu_merge_new ##### -->
<!-- ##### FUNCTION gtk_ui_manager_new ##### -->
<para>
</para>
......@@ -31,7 +32,7 @@ GtkMenuMerge
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_insert_action_group ##### -->
<!-- ##### FUNCTION gtk_ui_manager_insert_action_group ##### -->
<para>
</para>
......@@ -41,7 +42,7 @@ GtkMenuMerge
@pos:
<!-- ##### FUNCTION gtk_menu_merge_remove_action_group ##### -->
<!-- ##### FUNCTION gtk_ui_manager_remove_action_group ##### -->
<para>
</para>
......@@ -50,7 +51,7 @@ GtkMenuMerge
@action_group:
<!-- ##### FUNCTION gtk_menu_merge_get_action_groups ##### -->
<!-- ##### FUNCTION gtk_ui_manager_get_action_groups ##### -->
<para>
</para>
......@@ -59,7 +60,7 @@ GtkMenuMerge
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_get_accel_group ##### -->
<!-- ##### FUNCTION gtk_ui_manager_get_accel_group ##### -->
<para>
</para>
......@@ -68,7 +69,7 @@ GtkMenuMerge
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_get_widget ##### -->
<!-- ##### FUNCTION gtk_ui_manager_get_widget ##### -->
<para>
</para>
......@@ -78,7 +79,7 @@ GtkMenuMerge
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_add_ui_from_string ##### -->
<!-- ##### FUNCTION gtk_ui_manager_add_ui_from_string ##### -->
<para>
</para>
......@@ -90,7 +91,7 @@ GtkMenuMerge
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_add_ui_from_file ##### -->
<!-- ##### FUNCTION gtk_ui_manager_add_ui_from_file ##### -->
<para>
</para>
......@@ -101,7 +102,7 @@ GtkMenuMerge
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_remove_ui ##### -->
<!-- ##### FUNCTION gtk_ui_manager_remove_ui ##### -->
<para>
</para>
......@@ -110,7 +111,7 @@ GtkMenuMerge
@merge_id:
<!-- ##### FUNCTION gtk_menu_merge_get_ui ##### -->
<!-- ##### FUNCTION gtk_ui_manager_get_ui ##### -->
<para>
</para>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment