AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

Rename GtkMenuMerge to GtkUIManager

Browse Source
This commit is contained in:
Matthias Clasen 2003-08-25 23:15:12 +00:00
parent 77af2d637c
commit 5e8c963498
5 changed files with 153 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/reference/ChangeLog
View File

@ -1,3 +1,10 @@
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:

4
docs/reference/gtk/gtk-docs.sgml
View File

@ -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;

44
docs/reference/gtk/gtk-sections.txt
View File

@ -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
<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_MENU_MERGE
GTK_MENU_MERGE
GTK_MENU_MERGE_CLASS
GTK_IS_MENU_MERGE
GTK_IS_MENU_MERGE_CLASS
GTK_MENU_MERGE_GET_CLASS
GtkMenuMergeClass
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_menu_merge_get_type
GtkMenuMergePrivate
gtk_ui_manager_get_type
GtkUIManagerPrivate
</SECTION>
<SECTION>

121
docs/reference/gtk/tmpl/gtkmenumerge.sgml
View File

@ -1,121 +0,0 @@
<!-- ##### SECTION Title ##### -->
GtkMenuMerge
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### STRUCT GtkMenuMerge ##### -->
<para>
</para>
@parent:
<!-- ##### FUNCTION gtk_menu_merge_new ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_insert_action_group ##### -->
<para>
</para>
@self:
@action_group:
@pos:
<!-- ##### FUNCTION gtk_menu_merge_remove_action_group ##### -->
<para>
</para>
@self:
@action_group:
<!-- ##### FUNCTION gtk_menu_merge_get_action_groups ##### -->
<para>
</para>
@self:
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_get_accel_group ##### -->
<para>
</para>
@self:
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_get_widget ##### -->
<para>
</para>
@self:
@path:
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_add_ui_from_string ##### -->
<para>
</para>
@self:
@buffer:
@length:
@error:
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_add_ui_from_file ##### -->
<para>
</para>
@self:
@filename:
@error:
@Returns:
<!-- ##### FUNCTION gtk_menu_merge_remove_ui ##### -->
<para>
</para>
@self:
@merge_id:
<!-- ##### FUNCTION gtk_menu_merge_get_ui ##### -->
<para>
</para>
@self:
@Returns:

122
docs/reference/gtk/tmpl/gtkuimanager.sgml Normal file
View File

@ -0,0 +1,122 @@
<!-- ##### SECTION Title ##### -->
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 GtkUIManager ##### -->
<para>
</para>
@parent:
<!-- ##### FUNCTION gtk_ui_manager_new ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gtk_ui_manager_insert_action_group ##### -->
<para>
</para>
@self:
@action_group:
@pos:
<!-- ##### FUNCTION gtk_ui_manager_remove_action_group ##### -->
<para>
</para>
@self:
@action_group:
<!-- ##### FUNCTION gtk_ui_manager_get_action_groups ##### -->
<para>
</para>
@self:
@Returns:
<!-- ##### FUNCTION gtk_ui_manager_get_accel_group ##### -->
<para>
</para>
@self:
@Returns:
<!-- ##### FUNCTION gtk_ui_manager_get_widget ##### -->
<para>
</para>
@self:
@path:
@Returns:
<!-- ##### FUNCTION gtk_ui_manager_add_ui_from_string ##### -->
<para>
</para>
@self:
@buffer:
@length:
@error:
@Returns:
<!-- ##### FUNCTION gtk_ui_manager_add_ui_from_file ##### -->
<para>
</para>
@self:
@filename:
@error:
@Returns:
<!-- ##### FUNCTION gtk_ui_manager_remove_ui ##### -->
<para>
</para>
@self:
@merge_id:
<!-- ##### FUNCTION gtk_ui_manager_get_ui ##### -->
<para>
</para>
@self:
@Returns: