[gtkmm] Regenerate some GTK+ defs and docs files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Regenerate some GTK+ defs and docs files.
- Date: Wed, 11 Jul 2012 08:52:10 +0000 (UTC)
commit a8206d91da3436f1a2caa1b5032f3ce4dcff21f6
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Jul 11 10:37:59 2012 +0200
Regenerate some GTK+ defs and docs files.
* tools/extra_defs_gen/generate_defs_gtk.cc: Add
GtkMenuButton and GtkSearchEntry.
* gtk/src/gtk_docs.xml:
* gtk/src/gtk_methods.defs:
* gtk/src/gtk_signals.defs: Regenerated with gen_scripts/.
ChangeLog | 10 +
gtk/src/gtk_docs.xml | 397 +++++++++++++++++++++++------
gtk/src/gtk_methods.defs | 105 ++++++++
gtk/src/gtk_signals.defs | 97 ++++++-
tools/extra_defs_gen/generate_defs_gtk.cc | 2 +
5 files changed, 515 insertions(+), 96 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ad94c53..6b7963c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-07-11 Murray Cumming <murrayc murrayc com>
+ Regenerate some GTK+ defs and docs files.
+
+ * tools/extra_defs_gen/generate_defs_gtk.cc: Add
+ GtkMenuButton and GtkSearchEntry.
+ * gtk/src/gtk_docs.xml:
+ * gtk/src/gtk_methods.defs:
+ * gtk/src/gtk_signals.defs: Regenerated with gen_scripts/.
+
+2012-07-11 Murray Cumming <murrayc murrayc com>
+
Added Gtk::SearchEntry.
* gtk/gtkmm.h:
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 5e4c38a..3604385 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -2954,7 +2954,7 @@ A handler for this signal can create a window containing
a notebook where the tab will be attached. It is also
responsible for moving/resizing the window and adding the
necessary properties to the notebook (e.g. the
-#GtkNotebook:group ).
+#GtkNotebook:group-name ).
Since: 2.12
@@ -3544,7 +3544,7 @@ Since: 2.10
</parameter_description>
</parameter>
<parameter name="preview">
-<parameter_description> the #GtkPrintPreviewOperation for the current operation
+<parameter_description> the #GtkPrintOperationPreview for the current operation
</parameter_description>
</parameter>
<parameter name="context">
@@ -6045,7 +6045,7 @@ changed on an object. The signal's detail holds the property name.
<parameter_description> the object which received the signal
</parameter_description>
</parameter>
-<parameter name="pspec">
+<parameter name="child_property">
<parameter_description> the #GParamSpec of the changed child property
</parameter_description>
</parameter>
@@ -6213,7 +6213,7 @@ of a widget changes.
<description>
The ::drag-begin signal is emitted on the drag source when a drag is
started. A typical reason to connect to this signal is to set up a
-custom drag icon with gtk_drag_source_set_icon().
+custom drag icon with e.g. gtk_drag_source_set_icon_pixbuf().
Note that some widgets set up a drag icon in the default handler of
this signal, so you may have to use g_signal_connect_after() to
@@ -9235,6 +9235,10 @@ Since: 3.4
<parameter_description> accelerator keyval
</parameter_description>
</parameter>
+<parameter name="keycode">
+<parameter_description> accelerator keycode
+</parameter_description>
+</parameter>
<parameter name="accelerator_mods">
<parameter_description> accelerator modifier mask
</parameter_description>
@@ -9291,6 +9295,10 @@ Since: 3.4
<parameter_description> accelerator keyval
</parameter_description>
</parameter>
+<parameter name="keycode">
+<parameter_description> accelerator keycode
+</parameter_description>
+</parameter>
<parameter name="accelerator_mods">
<parameter_description> accelerator modifier mask
</parameter_description>
@@ -10383,7 +10391,7 @@ Since: 2.4
<function name="gtk_action_group_set_translate_func">
<description>
Sets a function to be used for translating the @label and @tooltip of
-#GtkActionGroupEntry<!-- -->s added by gtk_action_group_add_actions().
+#GtkActionEntry<!-- -->s added by gtk_action_group_add_actions().
If you're using gettext(), it is enough to set the translation domain
with gtk_action_group_set_translation_domain().
@@ -10461,7 +10469,8 @@ Since: 2.4
<function name="gtk_action_group_translate_string">
<description>
-Translates a string using the specified translate_func(). This
+Translates a string using the function set with
+gtk_action_group_set_translate_func(). This
is mainly intended for language bindings.
Since: 2.6
@@ -10895,7 +10904,7 @@ Since: 3.4
<description>
Gets the current target value of @actionabe.
-See gtk_actionable_set_target_value() for more information.
+See gtk_actionable_set_action_target_value() for more information.
Since: 3.4
@@ -11017,8 +11026,8 @@ Sets the action-name and associated string target value of an
actionable widget.
This allows for the effect of both gtk_actionable_set_action_name()
-and gtk_actionable_set_target() in the common case that the target is
-string-valued.
+and gtk_actionable_set_action_target_value() in the common case that
+the target is string-valued.
@detailed_action_name is a string of the form
<literal>"action::target"</literal> where <literal>action</literal>
@@ -11056,7 +11065,8 @@ and registers to the action's proxy list.
<note><para>Be careful to call this before setting the local
copy of the #GtkAction property, since this function uses
-gtk_activatable_get_action() to retrieve the previous action</para></note>
+gtk_activatable_get_related_action() to retrieve the
+previous action</para></note>
Since: 2.16
@@ -11202,9 +11212,9 @@ changed any of the #GtkAdjustment fields other than the value.
<function name="gtk_adjustment_clamp_page">
<description>
-Updates the #GtkAdjustment #GtkAdjustment.value to ensure that the range
+Updates the #GtkAdjustment #GtkAdjustment:value to ensure that the range
between @lower and @upper is in the current page (i.e. between
-#GtkAdjustment.value and #GtkAdjustment.value + #GtkAdjustment.page_size).
+#GtkAdjustment:value and #GtkAdjustment:value + #GtkAdjustment:page_size).
If the range is larger than the page size, then only the start of it will
be in the current page.
A #GtkAdjustment::changed signal will be emitted if the value is changed.
@@ -11567,11 +11577,11 @@ Since: 2.14
<function name="gtk_adjustment_set_value">
<description>
Sets the #GtkAdjustment value. The value is clamped to lie between
-#GtkAdjustment.lower and #GtkAdjustment.upper.
+#GtkAdjustment:lower and #GtkAdjustment:upper.
Note that for adjustments which are used in a #GtkScrollbar, the effective
-range of allowed values goes from #GtkAdjustment.lower to
-#GtkAdjustment.upper - #GtkAdjustment.page_size.
+range of allowed values goes from #GtkAdjustment:lower to
+#GtkAdjustment:upper - #GtkAdjustment:page_size.
</description>
<parameters>
@@ -12407,7 +12417,8 @@ to be activated when the key combination specificed by @accelerator
is pressed.
@accelerator must be a string that can be parsed by
-gtk_accelerator_parse(), e.g. "<Primary>q" or "<Control><Alt>p".
+gtk_accelerator_parse(), e.g. "<Primary>q" or
+"<Control><Alt>p".
@action_name must be the name of an action as it would be used
in the app menu, i.e. actions that have been added to the application
@@ -12569,7 +12580,7 @@ Applications should invoke this method when they begin an operation
that should not be interrupted, such as creating a CD or DVD. The
types of actions that may be blocked are specified by the @flags
parameter. When the application completes the operation it should
-call g_application_uninhibit() to remove the inhibitor. Note that
+call gtk_application_uninhibit() to remove the inhibitor. Note that
an application can have multiple inhibitors, and all of the must
be individually removed. Inhibitors are also cleared when the
application exits.
@@ -12606,7 +12617,7 @@ why these operations are inhibited
</parameter>
</parameters>
<return> A non-zero cookie that is used to uniquely identify this
-request. It should be used as an argument to g_application_uninhibit()
+request. It should be used as an argument to gtk_application_uninhibit()
in order to remove the request. If the platform does not support
inhibiting or the request failed for some reason, 0 is returned.
@@ -12638,16 +12649,13 @@ Since: 3.4
<function name="gtk_application_new">
<description>
- application_id (allow-none): The application ID.
- flags: the application flags
-
Creates a new #GtkApplication instance.
This function calls g_type_init() for you. gtk_init() is called
as soon as the application gets registered as the primary instance.
Concretely, gtk_init() is called in the default handler for the
-#GApplication:startup signal. Therefore, #GtkApplication subclasses should
+#GApplication::startup signal. Therefore, #GtkApplication subclasses should
chain up in their #GApplication:startup handler before using any GTK+ API.
Note that commandline arguments are not passed to gtk_init().
@@ -12669,6 +12677,14 @@ Since: 3.0
</description>
<parameters>
+<parameter name="application_id">
+<parameter_description> The application ID.
+</parameter_description>
+</parameter>
+<parameter name="flags">
+<parameter_description> the application flags
+</parameter_description>
+</parameter>
</parameters>
<return> a new #GtkApplication instance
@@ -12803,7 +12819,7 @@ Since: 3.4
<function name="gtk_application_uninhibit">
<description>
-Removes an inhibitor that has been established with g_application_inhibit().
+Removes an inhibitor that has been established with gtk_application_inhibit().
Inhibitors are also cleared when the application exits.
Since: 3.4
@@ -12815,7 +12831,7 @@ Since: 3.4
</parameter_description>
</parameter>
<parameter name="cookie">
-<parameter_description> a cookie that was returned by g_application_inhibit()
+<parameter_description> a cookie that was returned by gtk_application_inhibit()
</parameter_description>
</parameter>
</parameters>
@@ -17970,7 +17986,7 @@ Emits the #GtkCellEditable::editing-done signal.
</description>
<parameters>
<parameter name="cell_editable">
-<parameter_description> A #GtkTreeEditable
+<parameter_description> A #GtkCellEditable
</parameter_description>
</parameter>
</parameters>
@@ -17984,7 +18000,7 @@ Emits the #GtkCellEditable::remove-widget signal.
</description>
<parameters>
<parameter name="cell_editable">
-<parameter_description> A #GtkTreeEditable
+<parameter_description> A #GtkCellEditable
</parameter_description>
</parameter>
</parameters>
@@ -23748,10 +23764,10 @@ or %NULL if @section was parsed from other data
<description>
Gets the parent section for the given @section. The parent section is
the section that contains this @section. A special case are sections of
-type #GTK_CSS_SECTION_TYPE_DOCUMENT. Their parent will either be %NULL
+type #GTK_CSS_SECTION_DOCUMENT. Their parent will either be %NULL
if they are the original CSS document that was loaded by
gtk_css_provider_load_from_file() or a section of type
-#GTK_CSS_SECTION_TYPE_IMPORT if it was loaded with an import rule from
+#GTK_CSS_SECTION_IMPORT if it was loaded with an import rule from
a different file.
Since: 3.2
@@ -23898,7 +23914,7 @@ Since: 3.0
</parameter_description>
</parameter>
<parameter name="device">
-<parameter_description> a #GtkDevice to grab on.
+<parameter_description> a #GdkDevice to grab on.
</parameter_description>
</parameter>
<parameter name="block_others">
@@ -27422,7 +27438,7 @@ widget is usually one of the dialog buttons.
(For experts: if @setting is %TRUE, the entry calls
gtk_window_activate_default() on the window containing the entry, in
-the default handler for the #GtkWidget::activate signal.)
+the default handler for the #GtkEntry::activate signal.)
</description>
<parameters>
@@ -27595,7 +27611,7 @@ Since: 2.16
</description>
<parameters>
<parameter name="entry">
-<parameter_description> a #GtkIconEntry
+<parameter_description> a #GtkEntry
</parameter_description>
</parameter>
<parameter name="icon_pos">
@@ -27760,7 +27776,7 @@ the <link linkend="PangoMarkupFormat">Pango text markup language
Use %NULL for @tooltip to remove an existing tooltip.
See also gtk_widget_set_tooltip_markup() and
-gtk_enty_set_icon_tooltip_text().
+gtk_entry_set_icon_tooltip_text().
Since: 2.16
@@ -31578,7 +31594,7 @@ Deprecated: 3.2: Use #GtkFontChooser
<function name="gtk_font_selection_get_size_list">
<description>
-This returns the #GtkTreeeView used to list font sizes.
+This returns the #GtkTreeView used to list font sizes.
Since: 2.14
@@ -35184,7 +35200,7 @@ Since: 2.8
</description>
<parameters>
<parameter name="icon_view">
-<parameter_description> a #GtkIconTreeView
+<parameter_description> a #GtkIconView
</parameter_description>
</parameter>
<parameter name="start_button_mask">
@@ -35209,6 +35225,39 @@ widget
<return></return>
</function>
+<function name="gtk_icon_view_get_cell_rect">
+<description>
+Fills the bounding rectangle in widget coordinates for the cell specified by
+ path and @cell. If @cell is %NULL the main cell area is used.
+
+This function is only valid if @icon_view is realized.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="icon_view">
+<parameter_description> a #GtkIconView
+</parameter_description>
+</parameter>
+<parameter name="path">
+<parameter_description> a #GtkTreePath
+</parameter_description>
+</parameter>
+<parameter name="cell">
+<parameter_description> a #GtkCellRenderer or %NULL
+</parameter_description>
+</parameter>
+<parameter name="rect">
+<parameter_description> rectangle to fill with cell rect
+</parameter_description>
+</parameter>
+</parameters>
+<return> %FALSE if there is no such item, %TRUE otherwise
+
+</return>
+</function>
+
<function name="gtk_icon_view_get_column_spacing">
<description>
Returns the value of the ::column-spacing property.
@@ -38568,7 +38617,7 @@ layout.
<description>
If the label has been set so that it has an mnemonic key this function
returns the keyval used for the mnemonic accelerator. If there is no
-mnemonic set up it returns #GDK_VoidSymbol.
+mnemonic set up it returns #GDK_KEY_VoidSymbol.
</description>
@@ -38578,7 +38627,7 @@ mnemonic set up it returns #GDK_VoidSymbol.
</parameter_description>
</parameter>
</parameters>
-<return> GDK keyval usable for accelerators, or #GDK_VoidSymbol
+<return> GDK keyval usable for accelerators, or #GDK_KEY_VoidSymbol
</return>
</function>
@@ -40281,8 +40330,7 @@ widgets crossed by the pointer.
</para></listitem>
<listitem><para>
Find the widget which got the event. If the widget can't be determined
-the event is thrown away unless it belongs to a INCR transaction. In that
-case it is passed to gtk_selection_incr_event().
+the event is thrown away unless it belongs to a INCR transaction.
</para></listitem>
<listitem><para>
Then the event is pushed onto a stack so you can query the currently
@@ -40571,6 +40619,195 @@ Since: 2.8
<return></return>
</function>
+<function name="gtk_menu_button_get_align_widget">
+<description>
+Returns the parent #GtkWidget to use to line up with menu.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GtkWidget value or %NULL.
+
+</return>
+</function>
+
+<function name="gtk_menu_button_get_direction">
+<description>
+Returns the direction the menu will be pointing at when popped up.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GtkArrowType value.
+
+</return>
+</function>
+
+<function name="gtk_menu_button_get_menu">
+<description>
+Returns the #GtkMenu that pops out of the button.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GtkMenu or %NULL.
+
+</return>
+</function>
+
+<function name="gtk_menu_button_get_menu_model">
+<description>
+Returns the #GMenuModel used to generate the menu.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GMenuModel or %NULL.
+
+</return>
+</function>
+
+<function name="gtk_menu_button_new">
+<description>
+Creates a new #GtkMenuButton widget with downwards-pointing
+arrow as the only child. You can replace the child widget
+with another #GtkWidget should you wish to.
+
+Since: 3.6
+
+</description>
+<parameters>
+</parameters>
+<return> The newly created #GtkMenuButton widget.
+
+</return>
+</function>
+
+<function name="gtk_menu_button_set_align_widget">
+<description>
+Sets the #GtkWidget to use to line the menu with when popped up. Note that
+the @align_widget must contain the #GtkMenuButton itself.
+
+Setting it to %NULL means that the popup menu will be aligned with the
+button itself.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+<parameter name="align_widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_menu_button_set_direction">
+<description>
+Sets the direction in which the menu will be popped up, as
+well as changing the arrow's direction. The child will not
+be changed to an arrow if it was customized.
+
+If the menu when popped out would have collided with screen edges,
+we will do our best to keep it inside the screen and fully visible.
+
+If you pass GTK_ARROW_NONE for a @direction, the menu will behave
+as if you passed GTK_ARROW_DOWN (although you won't see any arrows).
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+<parameter name="direction">
+<parameter_description> a #GtkArrowType
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_menu_button_set_menu">
+<description>
+Sets the #GtkMenu that will be popped up when the button is clicked,
+or %NULL to disable the button. If #GtkMenuButton:menu-model is set,
+it will be set to %NULL.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+<parameter name="menu">
+<parameter_description> a #GtkMenu
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_menu_button_set_menu_model">
+<description>
+Sets the #GMenuModel from which the #GtkMenuButton:menu property will be
+filled in, or %NULL to disable the button.
+
+The #GtkMenu will be created with gtk_menu_new_from_model(), so actions
+will be connected as documented there.
+
+If you #GtkMenuButton:menu * is already set, then its content will be lost
+and replaced by our newly created #GtkMenu.
+
+Since: 3.6
+
+</description>
+<parameters>
+<parameter name="menu_button">
+<parameter_description> a #GtkMenuButton
+</parameter_description>
+</parameter>
+<parameter name="menu_model">
+<parameter_description> a #GMenuModel
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gtk_menu_detach">
<description>
Detaches the menu from the widget to which it had been attached.
@@ -40625,7 +40862,7 @@ Since: 2.14
<function name="gtk_menu_get_active">
<description>
Returns the selected menu item from the menu. This is used by the
-#GtkOptionMenu.
+#GtkComboBox.
</description>
@@ -41424,7 +41661,7 @@ it first with g_intern_static_string().
<function name="gtk_menu_set_active">
<description>
Selects the specified menu item within the menu. This is used by
-the #GtkOptionMenu and should not be used by anyone else.
+the #GtkComboBox and should not be used by anyone else.
</description>
<parameters>
@@ -47975,7 +48212,7 @@ Since: 2.18
</parameter_description>
</parameter>
<parameter name="embed">
-<parameter_description> %TRUE to embed page setup selection in the #GtkPrintDialog
+<parameter_description> %TRUE to embed page setup selection in the #GtkPrintUnixDialog
</parameter_description>
</parameter>
</parameters>
@@ -49934,7 +50171,7 @@ Since: 2.10
<function name="gtk_print_unix_dialog_get_current_page">
<description>
-Gets the current page of the #GtkPrintDialog.
+Gets the current page of the #GtkPrintUnixDialog.
Since: 2.10
@@ -51426,7 +51663,8 @@ Creates a new #GtkRadioMenuItem.
</description>
<parameters>
<parameter name="group">
-<parameter_description> the group to which the radio menu item is to be attached
+<parameter_description> the group to which the
+radio menu item is to be attached
</parameter_description>
</parameter>
</parameters>
@@ -51611,8 +51849,8 @@ Since: 2.4
</description>
<parameters>
<parameter name="group">
-<parameter_description> an existing radio button group, or %NULL if you are
-creating a new group
+<parameter_description> an existing radio button
+group, or %NULL if you are creating a new group
</parameter_description>
</parameter>
<parameter name="stock_id">
@@ -51620,7 +51858,7 @@ creating a new group
</parameter_description>
</parameter>
</parameters>
-<return> The new #GtkRadioToolItem
+<return> The new #GtkRadioToolButton
</return>
</function>
@@ -52626,7 +52864,7 @@ Deprecated: 3.0: Use #GtkCssProvider instead
</description>
<parameters>
<parameter name="scanner">
-<parameter_description> a #GtkScanner (must be initialized for parsing an RC file)
+<parameter_description> a #GScanner (must be initialized for parsing an RC file)
</parameter_description>
</parameter>
<parameter name="state">
@@ -57588,11 +57826,11 @@ Since: 2.2
</description>
<parameters>
<parameter name="display">
-<parameter_description> the #Gdkdisplay where the selection is set
+<parameter_description> the #GdkDisplay where the selection is set
</parameter_description>
</parameter>
<parameter name="widget">
-<parameter_description> new selection owner (a #GdkWidget), or %NULL.
+<parameter_description> new selection owner (a #GtkWidget), or %NULL.
</parameter_description>
</parameter>
<parameter name="selection">
@@ -59556,7 +59794,7 @@ Since: 2.20
</description>
<parameters>
<parameter name="statusbar">
-<parameter_description> a #GtkStatusBar
+<parameter_description> a #GtkStatusbar
</parameter_description>
</parameter>
</parameters>
@@ -59579,7 +59817,7 @@ Creates a new #GtkStatusbar ready for messages.
<function name="gtk_statusbar_pop">
<description>
-Removes the first message in the #GtkStatusBar's stack
+Removes the first message in the #GtkStatusbar's stack
with the given context id.
Note that this may not change the displayed message, if
@@ -59589,7 +59827,7 @@ context id.
</description>
<parameters>
<parameter name="statusbar">
-<parameter_description> a #GtkStatusBar
+<parameter_description> a #GtkStatusbar
</parameter_description>
</parameter>
<parameter name="context_id">
@@ -59634,7 +59872,7 @@ The exact @context_id and @message_id must be specified.
</description>
<parameters>
<parameter name="statusbar">
-<parameter_description> a #GtkStatusBar
+<parameter_description> a #GtkStatusbar
</parameter_description>
</parameter>
<parameter name="context_id">
@@ -59659,7 +59897,7 @@ Since: 2.22
</description>
<parameters>
<parameter name="statusbar">
-<parameter_description> a #GtkStatusBar
+<parameter_description> a #GtkStatusbar
</parameter_description>
</parameter>
<parameter name="context_id">
@@ -70121,7 +70359,7 @@ Since: 3.0
</description>
<parameters>
<parameter name="engine">
-<parameter_description> a #GtkthemingEngine
+<parameter_description> a #GtkThemingEngine
</parameter_description>
</parameter>
<parameter name="state">
@@ -70277,7 +70515,7 @@ Since: 3.0
</description>
<parameters>
<parameter name="engine">
-<parameter_description> a #GtkthemingEngine
+<parameter_description> a #GtkThemingEngine
</parameter_description>
</parameter>
<parameter name="state">
@@ -71498,7 +71736,7 @@ match.
<function name="gtk_tool_item_get_relief_style">
<description>
-Returns the relief style of @tool_item. See gtk_button_set_relief_style().
+Returns the relief style of @tool_item. See gtk_button_set_relief().
Custom subclasses of #GtkToolItem should call this function in the handler
of the #GtkToolItem::toolbar_reconfigured signal to find out the
relief style of buttons.
@@ -71596,10 +71834,7 @@ only icons </listitem>
<listitem> GTK_TOOLBAR_TEXT, meaning the tool item should only
show text</listitem>
<listitem> GTK_TOOLBAR_BOTH_HORIZ, meaning the tool item should show
-both an icon and a label, arranged horizontally (however, note the
-#GtkToolButton:has_text_horizontally property that makes tool buttons not
-show labels when the toolbar style is GTK_TOOLBAR_BOTH_HORIZ.
-</listitem>
+both an icon and a label, arranged horizontally</listitem>
</itemizedlist>
Since: 2.4
@@ -72332,7 +72567,7 @@ on that widget
</parameter_description>
</parameter>
<parameter name="targets">
-<parameter_description> the #GtkToolPaletteDragTarget<!-- -->s which the widget
+<parameter_description> the #GtkToolPaletteDragTargets which the widget
should support
</parameter_description>
</parameter>
@@ -72625,7 +72860,7 @@ Since: 2.20
</parameter_description>
</parameter>
<parameter name="targets">
-<parameter_description> the #GtkToolPaletteDragTarget<!-- -->s
+<parameter_description> the #GtkToolPaletteDragTargets
which the widget should support
</parameter_description>
</parameter>
@@ -77568,7 +77803,7 @@ are removed, and replaced with the new attributes.
<function name="gtk_tree_view_column_set_cell_data_func">
<description>
-Sets the #GtkTreeViewColumnFunc to use for the column. This
+Sets the #GtkTreeCellDataFunc to use for the column. This
function is used instead of the standard attributes mapping for
setting the column value, and should set the value of @tree_column's
cell renderer as appropriate. @func may be %NULL to remove an
@@ -77585,7 +77820,7 @@ older one.
</parameter_description>
</parameter>
<parameter name="func">
-<parameter_description> The #GtkTreeViewColumnFunc to use.
+<parameter_description> The #GtkTreeCellDataFunc to use.
</parameter_description>
</parameter>
<parameter name="func_data">
@@ -77810,7 +78045,7 @@ Changes the appearance of the sort indicator.
This <emphasis>does not</emphasis> actually sort the model. Use
gtk_tree_view_column_set_sort_column_id() if you want automatic sorting
support. This function is primarily for custom sorting behavior, and should
-be used in conjunction with gtk_tree_sortable_set_sort_column() to do
+be used in conjunction with gtk_tree_sortable_set_sort_column_id() to do
that. For custom models, the mechanism will vary.
The sort indicator changes direction to indicate normal sort or reverse sort.
@@ -79147,7 +79382,7 @@ property set to be GTK_TREE_VIEW_COLUMN_FIXED.
<function name="gtk_tree_view_insert_column_with_data_func">
<description>
Convenience function that inserts a new column into the #GtkTreeView
-with the given cell renderer and a #GtkCellDataFunc to set cell renderer
+with the given cell renderer and a #GtkTreeCellDataFunc to set cell renderer
attributes (normally using data from the model). See also
gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_pack_start().
If @tree_view has "fixed_height" mode enabled, then the new column will have its
@@ -79893,7 +80128,7 @@ then it will unset the old model.
</description>
<parameters>
<parameter name="tree_view">
-<parameter_description> A #GtkTreeNode.
+<parameter_description> A #GtkTreeView.
</parameter_description>
</parameter>
<parameter name="model">
@@ -81154,7 +81389,7 @@ activatable, the function returns %FALSE.
Installs an accelerator for this @widget in @accel_group that causes
@accel_signal to be emitted if the accelerator is activated.
The @accel_group needs to be added to the widget's toplevel via
-gtk_window_add_accel_group(), and the signal must be of type %G_RUN_ACTION.
+gtk_window_add_accel_group(), and the signal must be of type %G_SIGNAL_ACTION.
Accelerators added through this function are not user changeable during
runtime. If you want to support accelerators that can be changed by the
user, use gtk_accel_map_add_entry() and gtk_widget_set_accel_path() or
@@ -83224,7 +83459,7 @@ Note the difference in behavior vs. gtk_widget_get_ancestor();
<literal>gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW)</literal>
would return
%NULL if @widget wasn't inside a toplevel window, and if the
-window was inside a #GtkWindow-derived widget which was in turn
+window was inside a #GtkWindow<!-- -->-derived widget which was in turn
inside the toplevel #GtkWindow. While the second case may
seem unlikely, it actually happens when a #GtkPlug is embedded
inside a #GtkSocket within the same application.
@@ -83365,10 +83600,10 @@ Since: 2.14
<function name="gtk_widget_grab_default">
<description>
-Causes @widget to become the default widget. @widget must have the
-%GTK_CAN_DEFAULT flag set; typically you have to set this flag
-yourself by calling <literal>gtk_widget_set_can_default (@widget,
-%TRUE)</literal>. The default widget is activated when
+Causes @widget to become the default widget. @widget must be able to be
+a default widget; typically you would ensure this yourself
+by calling gtk_widget_set_can_default() with a %TRUE value.
+The default widget is activated when
the user presses Enter in a window. Default widgets must be
activatable, that is, gtk_widget_activate() should affect them. Note
that #GtkEntry widgets require the "activates-default" property
@@ -86016,7 +86251,7 @@ Widgets are double buffered by default; you can use this function
to turn off the buffering. "Double buffered" simply means that
gdk_window_begin_paint_region() and gdk_window_end_paint() are called
automatically around expose events sent to the
-widget. gdk_window_begin_paint() diverts all drawing to a widget's
+widget. gdk_window_begin_paint_region() diverts all drawing to a widget's
window to an offscreen buffer, and gdk_window_end_paint() draws the
buffer to the screen. The result is that users see the window
update in one smooth step, and don't see individual graphics
@@ -86029,7 +86264,7 @@ if you had special needs and really knew what you were doing.
Note: if you turn off double-buffering, you have to handle
expose events, since even the clearing to the background color or
pixmap will not happen automatically (as it is done in
-gdk_window_begin_paint()).
+gdk_window_begin_paint_region()).
</description>
<parameters>
@@ -86850,7 +87085,7 @@ Since: 2.18
<description>
Sets the visual that should be used for by widget and its children for
creating #GdkWindows. The visual must be on the same #GdkScreen as
-returned by gdk_widget_get_screen(), so handling the
+returned by gtk_widget_get_screen(), so handling the
#GtkWidget::screen-changed signal is necessary.
Setting a new @visual will not cause @widget to recreate its windows,
@@ -89062,8 +89297,8 @@ presses Enter in a dialog (for example). This function sets or
unsets the default widget for a #GtkWindow about. When setting
(rather than unsetting) the default widget it's generally easier to
call gtk_widget_grab_focus() on the widget. Before making a widget
-the default widget, you must set the #GTK_CAN_DEFAULT flag on the
-widget you'd like to make the default using GTK_WIDGET_SET_FLAGS().
+the default widget, you must call gtk_widget_set_can_default() on the
+widget you'd like to make the default.
</description>
<parameters>
@@ -89242,7 +89477,7 @@ disable this button. If you set the deletable property to %FALSE
using this function, GTK+ will do its best to convince the window
manager not to show a close button. Depending on the system, this
function may not have any effect when called on a window that is
-already visible, so you should call it before calling gtk_window_show().
+already visible, so you should call it before calling gtk_widget_show().
On Windows, this function always works, since there's no window manager
policy involved.
@@ -89431,7 +89666,7 @@ Since: 3.0
<function name="gtk_window_set_has_user_ref_count">
<description>
Tells GTK+ whether to drop its extra reference to the window
-when gtk_window_destroy() is called.
+when gtk_widget_destroy() is called.
This function is only exported for the benefit of language
bindings which may need to keep the window alive until their
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 63ad512..d6f8ed1 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -1222,6 +1222,13 @@
(gtype-id "GTK_TYPE_RADIO_BUTTON")
)
+(define-object MenuButton
+ (in-module "Gtk")
+ (parent "GtkToggleButton")
+ (c-name "GtkMenuButton")
+ (gtype-id "GTK_TYPE_MENU_BUTTON")
+)
+
(define-object ScaleButton
(in-module "Gtk")
(parent "GtkButton")
@@ -9620,6 +9627,10 @@
+;; From gtkdbusgenerated.h
+
+
+
;; From gtkdebug.h
(define-function gtk_get_debug_flags
@@ -13724,6 +13735,17 @@
)
)
+(define-method get_cell_rect
+ (of-object "GtkIconView")
+ (c-name "gtk_icon_view_get_cell_rect")
+ (return-type "gboolean")
+ (parameters
+ '("GtkTreePath*" "path")
+ '("GtkCellRenderer*" "cell")
+ '("GdkRectangle*" "rect")
+ )
+)
+
(define-method set_tooltip_item
(of-object "GtkIconView")
(c-name "gtk_icon_view_set_tooltip_item")
@@ -15210,6 +15232,10 @@
+;; From gtklockbuttonprivate.h
+
+
+
;; From gtkmain.h
(define-function gtk_get_major_version
@@ -15536,6 +15562,85 @@
+;; From gtkmenubutton.h
+
+(define-function gtk_menu_button_get_type
+ (c-name "gtk_menu_button_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_menu_button_new
+ (c-name "gtk_menu_button_new")
+ (is-constructor-of "GtkMenuButton")
+ (return-type "GtkWidget*")
+)
+
+(define-method set_menu
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_set_menu")
+ (return-type "none")
+ (parameters
+ '("GtkWidget*" "menu")
+ )
+)
+
+(define-method get_menu
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_get_menu")
+ (return-type "GtkMenu*")
+)
+
+(define-method set_direction
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_set_direction")
+ (return-type "none")
+ (parameters
+ '("GtkArrowType" "direction")
+ )
+)
+
+(define-method get_direction
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_get_direction")
+ (return-type "GtkArrowType")
+)
+
+(define-method set_menu_model
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_set_menu_model")
+ (return-type "none")
+ (parameters
+ '("GMenuModel*" "menu_model")
+ )
+)
+
+(define-method get_menu_model
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_get_menu_model")
+ (return-type "GMenuModel*")
+)
+
+(define-method set_align_widget
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_set_align_widget")
+ (return-type "none")
+ (parameters
+ '("GtkWidget*" "align_widget")
+ )
+)
+
+(define-method get_align_widget
+ (of-object "GtkMenuButton")
+ (c-name "gtk_menu_button_get_align_widget")
+ (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkmenubuttonprivate.h
+
+
+
;; From gtkmenu.h
(define-function gtk_menu_get_type
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 6f88778..13b360f 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -1318,6 +1318,15 @@
(construct-only #f)
)
+(define-property always-show-image
+ (of-object "GtkButton")
+ (prop-type "GParamBoolean")
+ (docs "Whether the image will always be shown")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GtkButtonBox
(define-property layout-style
@@ -1803,7 +1812,7 @@
(define-property cell-background-set
(of-object "GtkCellRenderer")
(prop-type "GParamBoolean")
- (docs "Whether this tag affects the cell background color")
+ (docs "Whether the cell background color is set")
(readable #t)
(writable #t)
(construct-only #f)
@@ -2056,6 +2065,15 @@
(construct-only #f)
)
+(define-property placeholder-text
+ (of-object "GtkCellRendererText")
+ (prop-type "GParamString")
+ (docs "Text rendered when an editable cell is empty")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
(define-property background
(of-object "GtkCellRendererText")
(prop-type "GParamString")
@@ -4657,6 +4675,12 @@
;; From GtkIconView
+(define-signal selection-changed
+ (of-object "GtkIconView")
+ (return-type "void")
+ (when "first")
+)
+
(define-signal move-cursor
(of-object "GtkIconView")
(return-type "gboolean")
@@ -4679,12 +4703,6 @@
(when "last")
)
-(define-signal selection-changed
- (of-object "GtkIconView")
- (return-type "void")
- (when "first")
-)
-
(define-signal item-activated
(of-object "GtkIconView")
(return-type "void")
@@ -5219,6 +5237,44 @@
(construct-only #f)
)
+;; From GtkMenuButton
+
+(define-property menu
+ (of-object "GtkMenuButton")
+ (prop-type "GParamObject")
+ (docs "The dropdown menu.")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property menu-model
+ (of-object "GtkMenuButton")
+ (prop-type "GParamObject")
+ (docs "The dropdown menu's model.")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property align-widget
+ (of-object "GtkMenuButton")
+ (prop-type "GParamObject")
+ (docs "The parent widget which the menu should align with.")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property direction
+ (of-object "GtkMenuButton")
+ (prop-type "GParamEnum")
+ (docs "The direction the arrow should point.")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GtkMenuItem
(define-signal activate
@@ -6237,7 +6293,7 @@
(define-property embed-page-setup
(of-object "GtkPrintOperation")
(prop-type "GParamBoolean")
- (docs "TRUE if page setup combos are embedded in GtkPrintDialog")
+ (docs "TRUE if page setup combos are embedded in GtkPrintUnixDialog")
(readable #t)
(writable #t)
(construct-only #f)
@@ -7050,6 +7106,8 @@
(construct-only #f)
)
+;; From GtkSearchEntry
+
;; From GtkSeparator
;; From GtkSeparatorToolItem
@@ -7713,6 +7771,15 @@
(construct-only #f)
)
+(define-property gtk-enable-primary-paste
+ (of-object "GtkSettings")
+ (prop-type "GParamBoolean")
+ (docs "Whether a middle click on a mouse should paste the 'PRIMARY' clipboard content at the cursor location.")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GtkSizeGroup
(define-property mode
@@ -9604,27 +9671,26 @@
;; From GtkTreeModel
-(define-signal row-changed
+(define-signal row-inserted
(of-object "GtkTreeModel")
(return-type "void")
- (when "last")
+ (when "first")
(parameters
'("GtkTreePath*" "p0")
'("GtkTreeIter*" "p1")
)
)
-(define-signal row-inserted
+(define-signal row-deleted
(of-object "GtkTreeModel")
(return-type "void")
(when "first")
(parameters
'("GtkTreePath*" "p0")
- '("GtkTreeIter*" "p1")
)
)
-(define-signal row-has-child-toggled
+(define-signal row-changed
(of-object "GtkTreeModel")
(return-type "void")
(when "last")
@@ -9634,12 +9700,13 @@
)
)
-(define-signal row-deleted
+(define-signal row-has-child-toggled
(of-object "GtkTreeModel")
(return-type "void")
- (when "first")
+ (when "last")
(parameters
'("GtkTreePath*" "p0")
+ '("GtkTreeIter*" "p1")
)
)
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index c4c7cbd..6effe3a 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -140,6 +140,7 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_LINK_BUTTON )
<< get_defs( GTK_TYPE_MENU )
<< get_defs( GTK_TYPE_MENU_BAR )
+ << get_defs( GTK_TYPE_MENU_BUTTON )
<< get_defs( GTK_TYPE_MENU_ITEM )
<< get_defs( GTK_TYPE_MENU_SHELL )
<< get_defs( GTK_TYPE_MENU_TOOL_BUTTON )
@@ -182,6 +183,7 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_SCROLLABLE )
<< get_defs( GTK_TYPE_SCROLLBAR )
<< get_defs( GTK_TYPE_SCROLLED_WINDOW )
+ << get_defs( GTK_TYPE_SEARCH_ENTRY )
<< get_defs( GTK_TYPE_SEPARATOR )
<< get_defs( GTK_TYPE_SEPARATOR_TOOL_ITEM )
<< get_defs( GTK_TYPE_SETTINGS )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]