diff options
Diffstat (limited to 'docs/reference')
| -rw-r--r-- | docs/reference/ChangeLog | 4 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-docs.sgml | 6 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 91 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtk-unused.sgml | 251 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkaccelgroup.sgml | 78 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkaccellabel.sgml | 28 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkcolorsel.sgml | 6 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkcombo.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkdialog.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkenums.sgml | 1 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkitemfactory.sgml | 59 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkmenu.sgml | 18 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkmenuitem.sgml | 9 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkpaned.sgml | 3 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtktoolbar.sgml | 4 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtktreednd.sgml | 1 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtktreeview.sgml | 52 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkwidget.sgml | 63 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkwindow.sgml | 7 |
19 files changed, 381 insertions, 304 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 963916c9c6..6a8b1c5138 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +Mon Nov 12 23:06:38 2001 Tim Janik <timj@gtk.org> + + * added gtkaccelmap.sgml. other updates. + 2001-11-11 Matthias Clasen <matthiasc@poet.de> * gdk-pixbuf/gdk-pixbuf-rendering.sgml, diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index fd0c2acdb8..50ee7a9bee 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -126,7 +126,8 @@ <!entity gtk-Styles SYSTEM "sgml/gtkstyle.sgml"> <!entity gtk-Themes SYSTEM "sgml/gtkthemes.sgml"> <!entity gtk-Resource-Files SYSTEM "sgml/gtkrc.sgml"> -<!entity gtk-Keyboard-Accelerators SYSTEM "sgml/gtkaccelgroup.sgml"> +<!entity GtkAccelGroup SYSTEM "sgml/gtkaccelgroup.sgml"> +<!entity gtk-accel-map SYSTEM "sgml/gtkaccelmap.sgml"> <!entity gtk-Selections SYSTEM "sgml/gtkselection.sgml"> <!entity gtk-Clipboards SYSTEM "sgml/gtkclipboard.sgml"> <!entity gtk-Drag-and-Drop SYSTEM "sgml/gtkdnd.sgml"> @@ -248,7 +249,8 @@ that is, GUI components such as #GtkButton or #GtkTextView. <title>GTK+ Core Reference</title> >k-General; - >k-Keyboard-Accelerators; + &GtkAccelGroup; + >k-accel-map; >k-Clipboards; >k-Drag-and-Drop; >k-Stock-Items; diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 37dbea2ecb..e184fd744f 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -2,6 +2,52 @@ <INCLUDE>gtk/gtk.h</INCLUDE> <SECTION> +<FILE>gtkaccelgroup</FILE> +<TITLE>Keyboard Accelerators</TITLE> +GtkAccelGroup +gtk_accel_group_get_type +gtk_accel_group_new +gtk_accel_group_connect +gtk_accel_group_disconnect +gtk_accel_group_query +gtk_accel_group_activate +gtk_accel_groups_activate +gtk_accel_group_lock +gtk_accel_group_unlock +gtk_accelerator_valid +gtk_accelerator_parse +gtk_accelerator_name +gtk_accelerator_set_default_mod_mask +gtk_accelerator_get_default_mod_mask +<SUBSECTION Private> +<SUBSECTION Standard> +GtkAccelGroupClass +GTK_TYPE_ACCEL_GROUP +GTK_ACCEL_GROUP +GTK_IS_ACCEL_GROUP +GTK_ACCEL_GROUP_CLASS +GTK_IS_ACCEL_GROUP_CLASS +GTK_ACCEL_GROUP_GET_CLASS +</SECTION> + +<SECTION> +<FILE>gtkaccelmap</FILE> +<TITLE>Accelerator Maps</TITLE> +GtkAccelMapNotify +GtkAccelMapForeach +gtk_accel_map_add_entry +gtk_accel_map_lookup_entry +gtk_accel_map_change_entry +gtk_accel_map_add_notifer +gtk_accel_map_remove_notifer +gtk_accel_map_load +gtk_accel_map_save +gtk_accel_map_foreach +gtk_accel_map_load_fd +gtk_accel_map_save_fd +</SECTION> + +<SECTION> <FILE>gtkaccellabel</FILE> <TITLE>GtkAccelLabel</TITLE> GtkAccelLabel @@ -1428,6 +1474,7 @@ gtk_menu_reorder_child gtk_menu_popup gtk_menu_set_accel_group gtk_menu_get_accel_group +gtk_menu_set_accel_path gtk_menu_set_title gtk_menu_get_tearoff_state gtk_menu_get_title @@ -1481,6 +1528,7 @@ gtk_menu_item_new_with_label gtk_menu_item_new_with_mnemonic gtk_menu_item_set_right_justified gtk_menu_item_set_submenu +gtk_menu_item_set_accel_path gtk_menu_item_remove_submenu gtk_menu_item_select gtk_menu_item_deselect @@ -3881,49 +3929,6 @@ GtkRcContext </SECTION> <SECTION> -<FILE>gtkaccelgroup</FILE> -<TITLE>Keyboard Accelerators</TITLE> -GtkAccelGroup -gtk_accel_group_new -gtk_accel_group_get_default -gtk_accel_group_ref -gtk_accel_group_unref -gtk_accel_group_activate -gtk_accel_groups_activate -gtk_accel_group_attach -gtk_accel_group_detach -gtk_accel_group_add -gtk_accel_group_remove -gtk_accel_group_lock -gtk_accel_group_unlock -gtk_accelerator_valid -gtk_accelerator_parse -gtk_accelerator_name -gtk_accelerator_set_default_mod_mask -gtk_accelerator_get_default_mod_mask -<SUBSECTION Private> -GtkAccelEntry -gtk_accel_group_get_type -gtk_accel_group_get_entry -gtk_accel_group_lock_entry -gtk_accel_group_unlock_entry -gtk_accel_group_handle_add -gtk_accel_group_handle_remove -gtk_accel_group_create_add -gtk_accel_group_create_remove -gtk_accel_groups_from_object -gtk_accel_group_entries_from_object -<SUBSECTION Standard> -GtkAccelGroupClass -GTK_ACCEL_GROUP -GTK_TYPE_ACCEL_GROUP -GTK_ACCEL_GROUP_CLASS -GTK_ACCEL_GROUP_GET_CLASS -GTK_IS_ACCEL_GROUP -GTK_IS_ACCEL_GROUP_CLASS -</SECTION> - -<SECTION> <FILE>gtkselection</FILE> <TITLE>Selections</TITLE> GtkTargetEntry diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 91412b12e8..86e08b9c73 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -495,9 +495,9 @@ This is a private struct used by GTK+ internally, don't worry about it. @object: @signal_id: -<!-- ##### ARG GtkAccelLabel:accel-widget ##### --> +<!-- ##### ARG GtkAccelLabel:accel-object ##### --> <para> -The widget whose accelerators are to be shown by the #GtkAccelLabel. + </para> @@ -1186,6 +1186,29 @@ produce superscript and subscript. @parent: @priv: +<!-- ##### USER_FUNCTION GtkTreeViewDraggableFunc ##### --> +<para> + +</para> + +@tree_view: +@context: +@path: +@user_data: +@Returns: + +<!-- ##### USER_FUNCTION GtkTreeViewDroppableFunc ##### --> +<para> + +</para> + +@tree_view: +@context: +@path: +@pos: +@user_data: +@Returns: + <!-- ##### ARG GtkVScale:adjustment ##### --> <para> the #GtkAdjustment which sets the range of the scale. @@ -1207,6 +1230,18 @@ the #GtkAdjustment which sets the range of the scale. @arg1: @Returns: +<!-- ##### SIGNAL GtkWidget::add-accelerator ##### --> +<para> + +</para> + +@widget: the object which received the signal. +@accel_signal_id: +@accel_group: +@accel_key: +@accel_mods: +@accel_flags: + <!-- ##### SIGNAL GtkWidget::debug-msg ##### --> <para> @@ -1237,6 +1272,16 @@ the #GtkAdjustment which sets the range of the scale. @widget: the object which received the signal. +<!-- ##### SIGNAL GtkWidget::remove-accelerator ##### --> +<para> + +</para> + +@widget: the object which received the signal. +@accel_group: +@accel_key: +@accel_mods: + <!-- ##### ARG GtkWidget:height ##### --> <para> @@ -1273,6 +1318,37 @@ If the window shrinks automatically when widgets within it shrink. </para> +<!-- ##### FUNCTION gtk_accel_group_activate ##### --> +<para> + +</para> + +@accel_group: +@accel_key: +@accel_mods: +@Returns: + +<!-- ##### FUNCTION gtk_accel_group_add ##### --> +<para> + +</para> + +@accel_group: +@path: +@accel_key: +@accel_mods: +@accel_flags: +@object: +@accel_signal: + +<!-- ##### FUNCTION gtk_accel_group_attach ##### --> +<para> + +</para> + +@accel_group: +@object: + <!-- ##### FUNCTION gtk_accel_group_create_add ##### --> <para> @@ -1293,6 +1369,14 @@ If the window shrinks automatically when widgets within it shrink. @handler_offset: @Returns: +<!-- ##### FUNCTION gtk_accel_group_detach ##### --> +<para> + +</para> + +@accel_group: +@object: + <!-- ##### FUNCTION gtk_accel_group_entries_from_object ##### --> <para> @@ -1301,6 +1385,13 @@ If the window shrinks automatically when widgets within it shrink. @object: @Returns: +<!-- ##### FUNCTION gtk_accel_group_get_default ##### --> +<para> + +</para> + +@Returns: + <!-- ##### FUNCTION gtk_accel_group_get_entry ##### --> <para> @@ -1342,6 +1433,24 @@ If the window shrinks automatically when widgets within it shrink. @accel_key: @accel_mods: +<!-- ##### MACRO gtk_accel_group_ref ##### --> +<para> + +</para> + +@Returns: +@accel_group: + +<!-- ##### FUNCTION gtk_accel_group_remove ##### --> +<para> + +</para> + +@accel_group: +@accel_key: +@accel_mods: +@object: + <!-- ##### FUNCTION gtk_accel_group_unlock_entry ##### --> <para> @@ -1351,6 +1460,13 @@ If the window shrinks automatically when widgets within it shrink. @accel_key: @accel_mods: +<!-- ##### MACRO gtk_accel_group_unref ##### --> +<para> + +</para> + +@accel_group: + <!-- ##### FUNCTION gtk_accel_groups_from_object ##### --> <para> @@ -1359,6 +1475,22 @@ If the window shrinks automatically when widgets within it shrink. @object: @Returns: +<!-- ##### FUNCTION gtk_accel_label_get_accel_object ##### --> +<para> + +</para> + +@accel_label: +@Returns: + +<!-- ##### FUNCTION gtk_accel_label_set_accel_object ##### --> +<para> + +</para> + +@accel_label: +@accel_object: + <!-- ##### FUNCTION gtk_arg_copy ##### --> <para> It will either copy data into an existing argument or allocate a new argument @@ -1905,6 +2037,54 @@ Get the type of GtkIdentifier. @Returns: +<!-- ##### FUNCTION gtk_item_factory_dump_items ##### --> +<para> + +</para> + +@path_pspec: +@modified_only: +@print_func: +@func_data: + +<!-- ##### FUNCTION gtk_item_factory_dump_rc ##### --> +<para> + +</para> + +@file_name: +@path_pspec: +@modified_only: + +<!-- ##### FUNCTION gtk_item_factory_parse_rc ##### --> +<para> + +</para> + +@file_name: + +<!-- ##### FUNCTION gtk_item_factory_parse_rc_scanner ##### --> +<para> + +</para> + +@scanner: + +<!-- ##### FUNCTION gtk_item_factory_parse_rc_string ##### --> +<para> + +</para> + +@rc_string: + +<!-- ##### FUNCTION gtk_item_factory_print_func ##### --> +<para> + +</para> + +@FILE_pointer: +@string: + <!-- ##### FUNCTION gtk_label_set_markup_with_accel ##### --> <para> @@ -2715,6 +2895,31 @@ a gtk_object_unref(). @width: @size: +<!-- ##### FUNCTION gtk_tree_view_set_rows_drag_dest ##### --> +<para> + +</para> + +@tree_view: +@targets: +@n_targets: +@actions: +@location_droppable_func: +@user_data: + +<!-- ##### FUNCTION gtk_tree_view_set_rows_drag_source ##### --> +<para> + +</para> + +@tree_view: +@start_button_mask: +@targets: +@n_targets: +@actions: +@row_draggable_func: +@user_data: + <!-- ##### FUNCTION gtk_type_check_class_cast ##### --> <para> Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make @@ -2829,6 +3034,25 @@ Set the varargs type for a fundamental type @foreign_type. fundamental type. @varargs_type: Must be a GtkType which is either structured or flag, or NONE. +<!-- ##### FUNCTION gtk_widget_accelerator_signal ##### --> +<para> + +</para> + +@widget: +@accel_group: +@accel_key: +@accel_mods: +@Returns: + +<!-- ##### FUNCTION gtk_widget_accelerators_locked ##### --> +<para> + +</para> + +@widget: +@Returns: + <!-- ##### FUNCTION gtk_widget_activate_mnemonic ##### --> <para> @@ -2847,6 +3071,13 @@ fundamental type. @width: @height: +<!-- ##### FUNCTION gtk_widget_lock_accelerators ##### --> +<para> + +</para> + +@widget: + <!-- ##### FUNCTION gtk_widget_pop_style ##### --> <para> @@ -2869,6 +3100,15 @@ fundamental type. @style: +<!-- ##### FUNCTION gtk_widget_remove_accelerators ##### --> +<para> + +</para> + +@widget: +@accel_signal: +@visible_only: + <!-- ##### FUNCTION gtk_widget_set_default_style ##### --> <para> @@ -2876,6 +3116,13 @@ fundamental type. @style: +<!-- ##### FUNCTION gtk_widget_unlock_accelerators ##### --> +<para> + +</para> + +@widget: + <!-- ##### FUNCTION gtk_window_activate_mnemonic ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml index a0fc59a529..b069f7e738 100644 --- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml +++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml @@ -1,9 +1,9 @@ <!-- ##### SECTION Title ##### --> -Keyboard Accelerators +Keyboard Accelerator Groups <!-- ##### SECTION Short_Description ##### --> -global keyboard accelerators (for an entire #GtkWindow) +Groups of global keyboard accelerators for an entire #GtkWindow <!-- ##### SECTION Long_Description ##### --> <para> @@ -11,14 +11,15 @@ A #GtkAccelGroup represents a group of keyboard accelerators, typically attached to a toplevel #GtkWindow (with gtk_window_add_accel_group()). Usually you won't need to create a #GtkAccelGroup directly; instead, when using #GtkItemFactory, GTK+ -automatically sets up the accelerators for your menus. +automatically sets up the accelerators for your menus in the item +factory's #GtkAccelGroup. </para> <para> Note that <firstterm>accelerators</firstterm> are different from <firstterm>mnemonics</firstterm>. Accelerators are shortcuts for activating a menu item; they appear alongside the menu item they're a -shortcut for, for example "Ctrl+Q" might appear alongside the "Quit" +shortcut for. For example "Ctrl+Q" might appear alongside the "Quit" menu item. Mnemonics are shortcuts for GUI elements such as text entries or buttons; they appear as underlined characters. See gtk_label_new_with_mnemonic(). Menu items can have both accelerators @@ -27,16 +28,17 @@ and mnemonics, of course. <!-- ##### SECTION See_Also ##### --> <para> -gtk_label_new_with_mnemonic(), gtk_window_add_accel_group() +gtk_window_add_accel_group(), gtk_accel_map_change_entry(), +gtk_item_factory_new(), gtk_label_new_with_mnemonic() </para> <!-- ##### STRUCT GtkAccelGroup ##### --> <para> -On opaque data type representing a group of accelerators. +An object representing and maintaining a group of accelerators. </para> -<!-- ##### FUNCTION gtk_accel_group_new ##### --> +<!-- ##### FUNCTION gtk_accel_group_get_type ##### --> <para> </para> @@ -44,32 +46,15 @@ On opaque data type representing a group of accelerators. @Returns: -<!-- ##### FUNCTION gtk_accel_group_get_default ##### --> -<para> - -</para> - -@Returns: - - -<!-- ##### FUNCTION gtk_accel_group_ref ##### --> +<!-- ##### FUNCTION gtk_accel_group_new ##### --> <para> </para> -@accel_group: @Returns: -<!-- ##### FUNCTION gtk_accel_group_unref ##### --> -<para> - -</para> - -@accel_group: - - -<!-- ##### FUNCTION gtk_accel_group_activate ##### --> +<!-- ##### FUNCTION gtk_accel_group_connect ##### --> <para> </para> @@ -77,39 +62,25 @@ On opaque data type representing a group of accelerators. @accel_group: @accel_key: @accel_mods: -@Returns: +@accel_flags: +@closure: +@accel_path_quark: +<!-- # Unused Parameters # --> +@path_quark: -<!-- ##### FUNCTION gtk_accel_groups_activate ##### --> +<!-- ##### FUNCTION gtk_accel_group_disconnect ##### --> <para> </para> -@object: +@accel_group: @accel_key: @accel_mods: @Returns: -<!-- ##### FUNCTION gtk_accel_group_attach ##### --> -<para> - -</para> - -@accel_group: -@object: - - -<!-- ##### FUNCTION gtk_accel_group_detach ##### --> -<para> - -</para> - -@accel_group: -@object: - - -<!-- ##### FUNCTION gtk_accel_group_add ##### --> +<!-- ##### FUNCTION gtk_accel_group_query ##### --> <para> </para> @@ -117,19 +88,20 @@ On opaque data type representing a group of accelerators. @accel_group: @accel_key: @accel_mods: -@accel_flags: -@object: -@accel_signal: +@n_entries: +@Returns: -<!-- ##### FUNCTION gtk_accel_group_remove ##### --> +<!-- ##### FUNCTION gtk_accel_groups_activate ##### --> <para> </para> -@accel_group: +@acceleratable: @accel_key: @accel_mods: +@Returns: +<!-- # Unused Parameters # --> @object: diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index a434252bbd..4587cf7515 100644 --- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml +++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml @@ -94,7 +94,7 @@ Creates a new #GtkAccelLabel. @Returns: a new #GtkAccelLabel. -<!-- ##### FUNCTION gtk_accel_label_get_accel_object ##### --> +<!-- ##### FUNCTION gtk_accel_label_get_accel_widget ##### --> <para> </para> @@ -103,24 +103,7 @@ Creates a new #GtkAccelLabel. @Returns: -<!-- ##### FUNCTION gtk_accel_label_set_accel_object ##### --> -<para> - -</para> - -@accel_label: -@accel_object: - - -<!-- ##### MACRO gtk_accel_label_get_accel_widget ##### --> -<para> - -</para> - -@accel_label: - - -<!-- ##### MACRO gtk_accel_label_set_accel_widget ##### --> +<!-- ##### FUNCTION gtk_accel_label_set_accel_widget ##### --> <para> Sets the widget whose accelerators are to be shown. </para> @@ -151,8 +134,13 @@ accelerators are added or removed from the associated widget. @Returns: always returns %FALSE. -<!-- ##### ARG GtkAccelLabel:accel-object ##### --> +<!-- ##### ARG GtkAccelLabel:accel-closure ##### --> <para> </para> +<!-- ##### ARG GtkAccelLabel:accel-widget ##### --> +<para> +The widget whose accelerators are to be shown by the #GtkAccelLabel. +</para> + diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml index 73907ce289..5bb58e1229 100644 --- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml @@ -225,7 +225,7 @@ time. </para> -@colorsel: +@colorsel: @color: @@ -234,8 +234,8 @@ time. </para> -@colorsel: -@color: +@colorsel: +@color: <!-- ##### SIGNAL GtkColorSelection::color-changed ##### --> diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index 8034f9cb78..4f6ed7b6fe 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -178,7 +178,7 @@ worried about differences in case. </para> @combo: a #GtkCombo. -@val: %TRUE if the text in the list items is case sensitive. +@val: %TRUE if the text in the list items is case sensitive. <!-- ##### FUNCTION gtk_combo_set_item_string ##### --> diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index f677af775d..7eb449fe1a 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -169,7 +169,7 @@ Creates a new dialog box. Widgets should not be packed into this #GtkWindow directly, but into the vbox and action_area, as described above. </para> -@Returns: a new #GtkDialog. +@Returns: a new #GtkDialog. <!-- ##### FUNCTION gtk_dialog_new_with_buttons ##### --> diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml index 6c19bccb73..304ae8d02e 100644 --- a/docs/reference/gtk/tmpl/gtkenums.sgml +++ b/docs/reference/gtk/tmpl/gtkenums.sgml @@ -20,7 +20,6 @@ Public enumerated types used throughout GTK+. </para> @GTK_ACCEL_VISIBLE: -@GTK_ACCEL_SIGNAL_VISIBLE: @GTK_ACCEL_LOCKED: @GTK_ACCEL_MASK: diff --git a/docs/reference/gtk/tmpl/gtkitemfactory.sgml b/docs/reference/gtk/tmpl/gtkitemfactory.sgml index abda892595..57c1fd8f71 100644 --- a/docs/reference/gtk/tmpl/gtkitemfactory.sgml +++ b/docs/reference/gtk/tmpl/gtkitemfactory.sgml @@ -84,11 +84,6 @@ GtkItemFactory </para> @path: -@accelerator_key: -@accelerator_mods: -@modified: -@in_propagation: -@dummy: @widgets: <!-- ##### FUNCTION gtk_item_factory_new ##### --> @@ -113,30 +108,6 @@ GtkItemFactory @accel_group: -<!-- ##### FUNCTION gtk_item_factory_parse_rc ##### --> -<para> - -</para> - -@file_name: - - -<!-- ##### FUNCTION gtk_item_factory_parse_rc_string ##### --> -<para> - -</para> - -@rc_string: - - -<!-- ##### FUNCTION gtk_item_factory_parse_rc_scanner ##### --> -<para> - -</para> - -@scanner: - - <!-- ##### FUNCTION gtk_item_factory_add_foreign ##### --> <para> @@ -207,36 +178,6 @@ GtkItemFactory @Returns: -<!-- ##### FUNCTION gtk_item_factory_dump_items ##### --> -<para> - -</para> - -@path_pspec: -@modified_only: -@print_func: -@func_data: - - -<!-- ##### FUNCTION gtk_item_factory_dump_rc ##### --> -<para> - -</para> - -@file_name: -@path_pspec: -@modified_only: - - -<!-- ##### FUNCTION gtk_item_factory_print_func ##### --> -<para> - -</para> - -@FILE_pointer: -@string: - - <!-- ##### FUNCTION gtk_item_factory_create_item ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index 8bb20423d8..eb37062f02 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -96,9 +96,9 @@ Creates a new #GtkMenu. Adds a new #GtkMenuItem to the end of the menu's item list. </para> -<!-- # Unused Parameters # --> @menu: a #GtkMenu. @child: The #GtkMenuItem to add. +<!-- # Unused Parameters # --> @m: @c: @@ -108,9 +108,9 @@ Adds a new #GtkMenuItem to the end of the menu's item list. Adds a new #GtkMenuItem to the beginning of the menu's item list. </para> -<!-- # Unused Parameters # --> @menu: a #GtkMenu. @child: The #GtkMenuItem to add. +<!-- # Unused Parameters # --> @menu_child: @m: @c: @@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position indicated by @position. </para> -<!-- # Unused Parameters # --> @menu: a #GtkMenu. @child: The #GtkMenuItem to add. @pos: +<!-- # Unused Parameters # --> @position: The position in the item list where @child is added. Positions are numbered from 0 to n-1. @@ -162,6 +162,9 @@ at the current pointer position. <!-- ##### FUNCTION gtk_menu_set_accel_group ##### --> <para> Set the #GtkAccelGroup which holds global accelerators for the menu. +This accelerator group needs to also be added to all windows that +this menu is being used in with gtk_window_add_accel_group(), in order +for those windows to support all the accelerators contained in this group. </para> @menu: a #GtkMenu. @@ -178,6 +181,15 @@ See gtk_menu_set_accel_group(). @Returns: the #GtkAccelGroup associated with the menu. +<!-- ##### FUNCTION gtk_menu_set_accel_path ##### --> +<para> + +</para> + +@menu: +@accel_path: + + <!-- ##### FUNCTION gtk_menu_set_title ##### --> <para> Sets the title string for the menu. The title is displayed when the menu diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml index 76b4e86398..d65e13a75e 100644 --- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml @@ -83,6 +83,15 @@ Sets the widget submenu, or changes it. @submenu: the submenu +<!-- ##### FUNCTION gtk_menu_item_set_accel_path ##### --> +<para> + +</para> + +@menu_item: +@accel_path: + + <!-- ##### FUNCTION gtk_menu_item_remove_submenu ##### --> <para> Removes the widget's submenu. diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml index f3a7e01e09..95369862de 100644 --- a/docs/reference/gtk/tmpl/gtkpaned.sgml +++ b/docs/reference/gtk/tmpl/gtkpaned.sgml @@ -112,6 +112,9 @@ Old name for gtk_paned_set_handle_size() Old name for gtk_paned_set_gutter_size() </para> +@p: +@s: + <!-- ##### FUNCTION gtk_paned_pack1 ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 9ee5eb8542..74562454d8 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -47,8 +47,8 @@ Widgets can be visibly grouped by adding gaps between widgets using gtk_toolbar_ to a #GtkToolbar. </para> -@GTK_TOOLBAR_CHILD_SPACE: a space in the style of the toolbar's #GtkToolbarSpaceStyle. -@GTK_TOOLBAR_CHILD_BUTTON: a #GtkButton. +@GTK_TOOLBAR_CHILD_SPACE: a space in the style of the toolbar's #GtkToolbarSpaceStyle. +@GTK_TOOLBAR_CHILD_BUTTON: a #GtkButton. @GTK_TOOLBAR_CHILD_TOGGLEBUTTON: a #GtkToggleButton. @GTK_TOOLBAR_CHILD_RADIOBUTTON: a #GtkRadioButton. @GTK_TOOLBAR_CHILD_WIDGET: a standard #GtkWidget. diff --git a/docs/reference/gtk/tmpl/gtktreednd.sgml b/docs/reference/gtk/tmpl/gtktreednd.sgml index 842769a899..9414655b6b 100644 --- a/docs/reference/gtk/tmpl/gtktreednd.sgml +++ b/docs/reference/gtk/tmpl/gtktreednd.sgml @@ -43,6 +43,7 @@ GtkTreeView drag-and-drop </para> @g_iface: +@row_draggable: @drag_data_get: @drag_data_delete: diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index 3234cc1c0b..b8480449e8 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -49,18 +49,6 @@ GtkTreeView @Returns: -<!-- ##### USER_FUNCTION GtkTreeViewDraggableFunc ##### --> -<para> - -</para> - -@tree_view: -@context: -@path: -@user_data: -@Returns: - - <!-- ##### USER_FUNCTION GtkTreeViewMappingFunc ##### --> <para> @@ -71,19 +59,6 @@ GtkTreeView @user_data: -<!-- ##### USER_FUNCTION GtkTreeViewDroppableFunc ##### --> -<para> - -</para> - -@tree_view: -@context: -@path: -@pos: -@user_data: -@Returns: - - <!-- ##### USER_FUNCTION GtkTreeViewSearchEqualFunc ##### --> <para> @@ -559,33 +534,6 @@ GtkTreeView @wy: -<!-- ##### FUNCTION gtk_tree_view_set_rows_drag_source ##### --> -<para> - -</para> - -@tree_view: -@start_button_mask: -@targets: -@n_targets: -@actions: -@row_draggable_func: -@user_data: - - -<!-- ##### FUNCTION gtk_tree_view_set_rows_drag_dest ##### --> -<para> - -</para> - -@tree_view: -@targets: -@n_targets: -@actions: -@location_droppable_func: -@user_data: - - <!-- ##### FUNCTION gtk_tree_view_unset_rows_drag_source ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 4781aee5fd..76769b73b5 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -527,27 +527,6 @@ GtkWidget @accel_group: @accel_key: @accel_mods: - - -<!-- ##### FUNCTION gtk_widget_remove_accelerators ##### --> -<para> - -</para> - -@widget: -@accel_signal: -@visible_only: - - -<!-- ##### FUNCTION gtk_widget_accelerator_signal ##### --> -<para> - -</para> - -@widget: -@accel_group: -@accel_key: -@accel_mods: @Returns: @@ -1000,14 +979,6 @@ GtkWidget @Returns: -<!-- ##### FUNCTION gtk_widget_lock_accelerators ##### --> -<para> - -</para> - -@widget: - - <!-- ##### FUNCTION gtk_widget_modify_style ##### --> <para> @@ -1207,23 +1178,6 @@ GtkWidget @Returns: -<!-- ##### FUNCTION gtk_widget_unlock_accelerators ##### --> -<para> - -</para> - -@widget: - - -<!-- ##### FUNCTION gtk_widget_accelerators_locked ##### --> -<para> - -</para> - -@widget: -@Returns: - - <!-- ##### FUNCTION gtk_widget_mnemonic_activate ##### --> <para> @@ -1456,17 +1410,12 @@ GtkWidget @requisition: -<!-- ##### SIGNAL GtkWidget::add-accelerator ##### --> +<!-- ##### SIGNAL GtkWidget::accel-closures-changed ##### --> <para> </para> @widget: the object which received the signal. -@accel_signal_id: -@accel_group: -@accel_key: -@accel_mods: -@accel_flags: <!-- ##### SIGNAL GtkWidget::button-press-event ##### --> <para> @@ -1834,16 +1783,6 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. -<!-- ##### SIGNAL GtkWidget::remove-accelerator ##### --> -<para> - -</para> - -@widget: the object which received the signal. -@accel_group: -@accel_key: -@accel_mods: - <!-- ##### SIGNAL GtkWidget::scroll-event ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index 66ea516399..b8111b4362 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -694,6 +694,13 @@ it's larger @height: +<!-- ##### SIGNAL GtkWindow::accels-changed ##### --> +<para> + +</para> + +@window: the object which received the signal. + <!-- ##### SIGNAL GtkWindow::activate-default ##### --> <para> |