[gtkmm] Gdk, Gtk: Regenerate docs.xml and .defs files
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Gdk, Gtk: Regenerate docs.xml and .defs files
- Date: Thu, 3 Sep 2020 07:00:17 +0000 (UTC)
commit b15b18bc0221d477e461fc9ae3e5dd7a294216b9
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Thu Sep 3 08:55:25 2020 +0200
Gdk, Gtk: Regenerate docs.xml and .defs files
and update gtk_extra_objects.defs and generate_defs_gtk.cc.
gdk/src/gdk_docs.xml | 2 +
gdk/src/gdk_methods.defs | 2 +-
gtk/src/gtk_docs.xml | 572 +++++++++++-------------------
gtk/src/gtk_extra_objects.defs | 6 -
gtk/src/gtk_methods.defs | 215 +++++------
gtk/src/gtk_signals.defs | 67 ++--
tools/extra_defs_gen/generate_defs_gtk.cc | 1 -
7 files changed, 342 insertions(+), 523 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 099fb5c1..28a51ee1 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -14510,6 +14510,8 @@ Obtains the current device position in doubles and modifier state.
The position is given in coordinates relative to the upper left
corner of @surface.
+Return: %TRUE if the device is over the surface
+
</description>
<parameters>
<parameter name="surface">
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index edbd0f26..a0cc3d8e 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -3701,7 +3701,7 @@
(define-method get_device_position
(of-object "GdkSurface")
(c-name "gdk_surface_get_device_position")
- (return-type "none")
+ (return-type "gboolean")
(parameters
'("GdkDevice*" "device")
'("double*" "x")
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 84b6e40d..93ee94d8 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -10,30 +10,6 @@ Emitted when the attributes of the accessible for the
<parameter_description> the #GtkATContext
</parameter_description>
</parameter>
-<parameter name="changed_states">
-<parameter_description> flags for the changed states
-</parameter_description>
-</parameter>
-<parameter name="changed_properties">
-<parameter_description> flags for the changed properties
-</parameter_description>
-</parameter>
-<parameter name="changed_relations">
-<parameter_description> flags for the changed relations
-</parameter_description>
-</parameter>
-<parameter name="states">
-<parameter_description> the new states
-</parameter_description>
-</parameter>
-<parameter name="properties">
-<parameter_description> the new properties
-</parameter_description>
-</parameter>
-<parameter name="relations">
-<parameter_description> the new relations
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</signal>
@@ -235,6 +211,15 @@ Whether to wrap the text in the license dialog.
</description>
</property>
+<property name="GtkAccessible:accessible-role">
+<description>
+The accessible role of the given #GtkAccessible implementation.
+
+The accessible role cannot be changed once set.
+
+</description>
+</property>
+
<enum name="GtkAccessibleAutocomplete">
<description>
The possible values for the %GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE
@@ -2977,6 +2962,16 @@ since 2.10
</description>
</property>
+<signal name="GtkCheckButton::toggled">
+<description>
+Emitted when the buttons's #GtkCheckButton:active flag changes.
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</signal>
+
<signal name="GtkColorButton::color-set">
<description>
The ::color-set signal is emitted when the user selects a color.
@@ -11305,32 +11300,6 @@ Name of the property used for lookups
</description>
</property>
-<signal name="GtkRadioButton::group-changed">
-<description>
-Emitted when the group of radio buttons that a radio button belongs
-to changes. This is emitted when a radio button switches from
-being alone to being part of a group of 2 or more buttons, or
-vice-versa, and when a button is moved from one group of 2 or
-more buttons to a different one, but not when the composition
-of the group that a button belongs to changes.
-
-</description>
-<parameters>
-<parameter name="button">
-<parameter_description> the object which received the signal
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</signal>
-
-<property name="GtkRadioButton:group">
-<description>
-Sets a new group for a radio button.
-
-</description>
-</property>
-
<signal name="GtkRange::adjust-bounds">
<description>
Emitted before clamping a value, to give the application a
@@ -17923,7 +17892,7 @@ gtk_accessible_update_property (GTK_ACCESSIBLE (spin_button),
<function name="gtk_accessible_update_property_value">
<description>
-Updates an accessible property.
+Updates an array of accessible properties.
This function should be called by #GtkWidget types whenever an accessible
property change must be communicated to assistive technologies.
@@ -17936,12 +17905,16 @@ This function is meant to be used by language bindings.
<parameter_description> a #GtkAccessible
</parameter_description>
</parameter>
-<parameter name="property">
-<parameter_description> a #GtkAccessibleProperty
+<parameter name="n_properties">
+<parameter_description> the number of accessible properties to set
</parameter_description>
</parameter>
-<parameter name="value">
-<parameter_description> a #GValue with the value for @property
+<parameter name="properties">
+<parameter_description> an array of #GtkAccessibleProperty
+</parameter_description>
+</parameter>
+<parameter name="values">
+<parameter_description> an array of #GValues, one for each property
</parameter_description>
</parameter>
</parameters>
@@ -17975,7 +17948,7 @@ relation change must be communicated to assistive technologies.
<function name="gtk_accessible_update_relation_value">
<description>
-Updates an accessible relation.
+Updates an array of accessible relations.
This function should be called by #GtkWidget types whenever an accessible
relation change must be communicated to assistive technologies.
@@ -17988,12 +17961,16 @@ This function is meant to be used by language bindings.
<parameter_description> a #GtkAccessible
</parameter_description>
</parameter>
-<parameter name="relation">
-<parameter_description> a #GtkAccessibleRelation
+<parameter name="n_relations">
+<parameter_description> the number of accessible relations to set
</parameter_description>
</parameter>
-<parameter name="value">
-<parameter_description> a #GValue with the value for @relation
+<parameter name="relations">
+<parameter_description> an array of #GtkAccessibleRelation
+</parameter_description>
+</parameter>
+<parameter name="values">
+<parameter_description> an array of #GValues, one for each relation
</parameter_description>
</parameter>
</parameters>
@@ -18036,7 +18013,7 @@ GTK_ACCESSIBLE_STATE_CHECKED, value,
<function name="gtk_accessible_update_state_value">
<description>
-Updates an accessible state.
+Updates an array of accessible states.
This function should be called by #GtkWidget types whenever an accessible
state change must be communicated to assistive technologies.
@@ -18049,12 +18026,16 @@ This function is meant to be used by language bindings.
<parameter_description> a #GtkAccessible
</parameter_description>
</parameter>
-<parameter name="state">
-<parameter_description> a #GtkAccessibleState
+<parameter name="n_states">
+<parameter_description> the number of accessible states to set
</parameter_description>
</parameter>
-<parameter name="value">
-<parameter_description> a #GValue with the value for @state
+<parameter name="states">
+<parameter_description> an array of #GtkAccessibleState
+</parameter_description>
+</parameter>
+<parameter name="values">
+<parameter_description> an array of #GValues, one for each state
</parameter_description>
</parameter>
</parameters>
@@ -27491,19 +27472,20 @@ Sets the new start widget of @self.
<return></return>
</function>
-<function name="gtk_check_button_get_draw_indicator">
+<function name="gtk_check_button_get_active">
<description>
-Returns Whether or not the indicator part of the button gets drawn.
+Returns the current value of the #GtkCheckButton:active property.
</description>
<parameters>
-<parameter name="check_button">
+<parameter name="self">
<parameter_description> a #GtkCheckButton
</parameter_description>
</parameter>
</parameters>
-<return> The value of the GtkCheckButton:draw-indicator property.
+<return> The value of the #GtkCheckButton:active property.
+See gtk_check_button_set_active() for details on how to set a new value.
</return>
</function>
@@ -27523,6 +27505,40 @@ Returns whether the check button is in an inconsistent state.
</return>
</function>
+<function name="gtk_check_button_get_label">
+<description>
+Returns the label of the checkbutton.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkCheckButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> The label @self shows next to the indicator.
+If no label is shown, %NULL will be returned.
+</return>
+</function>
+
+<function name="gtk_check_button_get_use_underline">
+<description>
+Returns the current value of the #GtkCheckButton:use-underline property.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkCheckButton
+</parameter_description>
+</parameter>
+</parameters>
+<return> The value of the #GtkCheckButton:use-underline property.
+See gtk_check_button_set_use_underline() for details on how to set a new value.
+</return>
+</function>
+
<function name="gtk_check_button_new">
<description>
Creates a new #GtkCheckButton.
@@ -27537,7 +27553,8 @@ Creates a new #GtkCheckButton.
<function name="gtk_check_button_new_with_label">
<description>
-Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
+Creates a new #GtkCheckButton with a #GtkLabel next to it, if
+@label is non-%NULL.
</description>
@@ -27547,14 +27564,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
</parameter_description>
</parameter>
</parameters>
-<return> a #GtkWidget.
+<return> a new #GtkCheckButton
</return>
</function>
<function name="gtk_check_button_new_with_mnemonic">
<description>
-Creates a new #GtkCheckButton containing a label. The label
-will be created using gtk_label_new_with_mnemonic(), so underscores
+Creates a new #GtkCheckButton containing a label. Underscores
in @label indicate the mnemonic for the check button.
@@ -27570,20 +27586,53 @@ mnemonic character
</return>
</function>
-<function name="gtk_check_button_set_draw_indicator">
+<function name="gtk_check_button_set_active">
<description>
-Sets whether the indicator part of the button is drawn. This is important for
-cases where the check button should have the functionality of a check button,
-but the visuals of a regular button, like in a #GtkStackSwitcher.
+Sets the new value of the #GtkCheckButton:active property.
+See also gtk_check_button_get_active().
+
+Setting #GtkCheckButton:active to %TRUE will add the `:checked:` state to
+both the checkbutton and the indicator CSS node.
</description>
<parameters>
-<parameter name="check_button">
+<parameter name="self">
<parameter_description> a #GtkCheckButton
</parameter_description>
</parameter>
-<parameter name="draw_indicator">
-<parameter_description> Whether or not to draw the indicator part of the button
+<parameter name="setting">
+<parameter_description> the new value to set
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_check_button_set_group">
+<description>
+Adds @self to the group of @group. In a group of multiple check buttons,
+only one button can be active at a time.
+
+Setting the group of a check button also changes the css name of the
+indicator widget's CSS node to 'radio'.
+
+The behavior of a checkbutton in a group is also commonly known as
+a 'radio button'.
+
+Note that the same effect can be achieved via the #GtkActionable
+api, by using the same action with parameter type and state type 's'
+for all buttons in the group, and giving each button its own target
+value.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkCheckButton
+</parameter_description>
+</parameter>
+<parameter name="group">
+<parameter_description> another #GtkCheckButton to
+form a group with
</parameter_description>
</parameter>
</parameters>
@@ -27615,6 +27664,50 @@ not the semantics of the button.
<return></return>
</function>
+<function name="gtk_check_button_set_label">
+<description>
+Sets the text of @self. If #GtkCheckButton:use-underline is %TRUE,
+the underscore in @label is interpreted as mnemonic indicator,
+see gtk_check_button_set_use_underline() for details on this behavior.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkCheckButton
+</parameter_description>
+</parameter>
+<parameter name="label">
+<parameter_description> The text shown next to the indicator, or %NULL
+to show no text
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_check_button_set_use_underline">
+<description>
+Sets the new value of the #GtkCheckButton:use-underline property.
+See also gtk_check_button_get_use_underline().
+
+If @setting is %TRUE, an underscore character in @self's label indicates
+a mnemonic accelerator key. This behavior is similar to #GtkLabel:use-underline.
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkCheckButton
+</parameter_description>
+</parameter>
+<parameter name="setting">
+<parameter_description> the new value to set
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gtk_check_version">
<description>
Checks that the GTK library in use is compatible with the
@@ -28553,10 +28646,7 @@ Sets whether selections can be changed by dragging with the mouse.
<function name="gtk_column_view_set_model">
<description>
-Sets the #GListModel to use.
-
-If the @model is a #GtkSelectionModel, it is used for managing the selection.
-Otherwise, @self creates a #GtkSingleSelection for the selection.
+Sets the #GtkSelectionModel to use.
</description>
<parameters>
@@ -42124,32 +42214,13 @@ selected on hover.
<function name="gtk_grid_view_new">
<description>
-Creates a new #GtkGridView.
-
-You most likely want to call gtk_grid_view_set_factory() to
-set up a way to map its items to widgets next.
-
-
-</description>
-<parameters>
-<parameter name="model">
-<parameter_description> the model to use, or %NULL
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GtkGridView
-</return>
-</function>
-
-<function name="gtk_grid_view_new_with_factory">
-<description>
Creates a new #GtkGridView that uses the given @factory for
mapping items to widgets.
The function takes ownership of the
-argument, so you can write code like
+arguments, so you can write code like
```
-grid_view = gtk_grid_view_new_with_factory (create_model (),
+grid_view = gtk_grid_view_new (create_model (),
gtk_builder_list_item_factory_new_from_resource ("/resource.ui"));
```
@@ -42165,7 +42236,7 @@ gtk_builder_list_item_factory_new_from_resource ("/resource.ui"));
</parameter_description>
</parameter>
</parameters>
-<return> a new #GtkGridView using the given @factory
+<return> a new #GtkGridView using the given @model and @factory
</return>
</function>
@@ -42249,7 +42320,7 @@ gtk_grid_view_set_max_columns(), that value is ignored.
<function name="gtk_grid_view_set_model">
<description>
-Sets the #GListModel to use for
+Sets the #GtkSelectionModel to use for
</description>
<parameters>
@@ -49170,32 +49241,13 @@ selected on hover.
<function name="gtk_list_view_new">
<description>
-Creates a new #GtkListView.
-
-You most likely want to call gtk_list_view_set_factory()
-to set up a way to map its items to widgets.
-
-
-</description>
-<parameters>
-<parameter name="model">
-<parameter_description> the model to use, or %NULL
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GtkListView
-</return>
-</function>
-
-<function name="gtk_list_view_new_with_factory">
-<description>
Creates a new #GtkListView that uses the given @factory for
mapping items to widgets.
The function takes ownership of the
-argument, so you can write code like
+arguments, so you can write code like
```
-list_view = gtk_list_view_new_with_factory (create_model (),
+list_view = gtk_list_view_new (create_model (),
gtk_builder_list_item_factory_new_from_resource ("/resource.ui"));
```
@@ -49211,7 +49263,7 @@ gtk_builder_list_item_factory_new_from_resource ("/resource.ui"));
</parameter_description>
</parameter>
</parameters>
-<return> a new #GtkListView using the given @factory
+<return> a new #GtkListView using the given @model and @factory
</return>
</function>
@@ -49253,10 +49305,7 @@ Sets the #GtkListItemFactory to use for populating list items.
<function name="gtk_list_view_set_model">
<description>
-Sets the #GListModel to use.
-
-If the @model is a #GtkSelectionModel, it is used for managing the selection.
-Otherwise, @self creates a #GtkSingleSelection for the selection.
+Sets the #GtkSelectionModel to use.
</description>
<parameters>
@@ -60186,209 +60235,6 @@ query the `this` object
</return>
</function>
-<function name="gtk_radio_button_get_group">
-<description>
-Retrieves the group assigned to a radio button.
-
-
-</description>
-<parameters>
-<parameter name="radio_button">
-<parameter_description> a #GtkRadioButton.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a linked list
-containing all the radio buttons in the same group
-as @radio_button. The returned list is owned by the radio button
-and must not be modified or freed.
-</return>
-</function>
-
-<function name="gtk_radio_button_join_group">
-<description>
-Joins a #GtkRadioButton object to the group of another #GtkRadioButton object
-
-Use this in language bindings instead of the gtk_radio_button_get_group()
-and gtk_radio_button_set_group() methods
-
-A common way to set up a group of radio buttons is the following:
-|[<!-- language="C" -->
-GtkRadioButton *radio_button;
-GtkRadioButton *last_button;
-
-while (some_condition)
-{
-radio_button = GTK_RADIO_BUTTON (gtk_radio_button_new (NULL));
-
-gtk_radio_button_join_group (radio_button, last_button);
-last_button = radio_button;
-}
-]|
-
-</description>
-<parameters>
-<parameter name="radio_button">
-<parameter_description> the #GtkRadioButton object
-</parameter_description>
-</parameter>
-<parameter name="group_source">
-<parameter_description> a radio button object whose group we are
-joining, or %NULL to remove the radio button from its group
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gtk_radio_button_new">
-<description>
-Creates a new #GtkRadioButton. To be of any practical value, a widget should
-then be packed into the radio button.
-
-
-</description>
-<parameters>
-<parameter name="group">
-<parameter_description> an existing
-radio button group, or %NULL if you are creating a new group.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new radio button
-</return>
-</function>
-
-<function name="gtk_radio_button_new_from_widget">
-<description>
-Creates a new #GtkRadioButton, adding it to the same group as
-@radio_group_member. As with gtk_radio_button_new(), a widget
-should be packed into the radio button.
-
-
-</description>
-<parameters>
-<parameter name="radio_group_member">
-<parameter_description> an existing #GtkRadioButton.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new radio button.
-</return>
-</function>
-
-<function name="gtk_radio_button_new_with_label">
-<description>
-Creates a new #GtkRadioButton with a text label.
-
-
-</description>
-<parameters>
-<parameter name="group">
-<parameter_description> an existing
-radio button group, or %NULL if you are creating a new group.
-</parameter_description>
-</parameter>
-<parameter name="label">
-<parameter_description> the text label to display next to the radio button.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new radio button.
-</return>
-</function>
-
-<function name="gtk_radio_button_new_with_label_from_widget">
-<description>
-Creates a new #GtkRadioButton with a text label, adding it to
-the same group as @radio_group_member.
-
-
-</description>
-<parameters>
-<parameter name="radio_group_member">
-<parameter_description> widget to get radio group from or %NULL
-</parameter_description>
-</parameter>
-<parameter name="label">
-<parameter_description> a text string to display next to the radio button.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new radio button.
-</return>
-</function>
-
-<function name="gtk_radio_button_new_with_mnemonic">
-<description>
-Creates a new #GtkRadioButton containing a label, adding it to the same
-group as @group. The label will be created using
-gtk_label_new_with_mnemonic(), so underscores in @label indicate the
-mnemonic for the button.
-
-
-</description>
-<parameters>
-<parameter name="group">
-<parameter_description> the radio button
-group, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="label">
-<parameter_description> the text of the button, with an underscore in front of the
-mnemonic character
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GtkRadioButton
-</return>
-</function>
-
-<function name="gtk_radio_button_new_with_mnemonic_from_widget">
-<description>
-Creates a new #GtkRadioButton containing a label. The label
-will be created using gtk_label_new_with_mnemonic(), so underscores
-in @label indicate the mnemonic for the button.
-
-
-</description>
-<parameters>
-<parameter name="radio_group_member">
-<parameter_description> widget to get radio group from or %NULL
-</parameter_description>
-</parameter>
-<parameter name="label">
-<parameter_description> the text of the button, with an underscore in front of the
-mnemonic character
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GtkRadioButton
-</return>
-</function>
-
-<function name="gtk_radio_button_set_group">
-<description>
-Sets a #GtkRadioButton’s group. It should be noted that this does not change
-the layout of your interface in any way, so if you are changing the group,
-it is likely you will need to re-arrange the user interface to reflect these
-changes.
-
-</description>
-<parameters>
-<parameter name="radio_button">
-<parameter_description> a #GtkRadioButton.
-</parameter_description>
-</parameter>
-<parameter name="group">
-<parameter_description> an existing radio
-button group, such as one returned from gtk_radio_button_get_group(), or %NULL.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gtk_range_get_adjustment">
<description>
Get the #GtkAdjustment which is the “model” object for #GtkRange.
@@ -62017,7 +61863,7 @@ Renders a line from (x0, y0) to (x1, y1).
<function name="gtk_render_option">
<description>
-Renders an option mark (as in a #GtkRadioButton), the %GTK_STATE_FLAG_CHECKED
+Renders an option mark (as in a radio button), the %GTK_STATE_FLAG_CHECKED
state will determine whether the option is on or off, and
%GTK_STATE_FLAG_INCONSISTENT whether it should be marked as undefined.
@@ -76693,32 +76539,6 @@ coordinates, storing the result in (@buffer_x,@buffer_y).
<return></return>
</function>
-<function name="gtk_tim_sort_get_progress">
-<description>
-Does a progress estimate about sort progress, estimates relative
-to the number of items to sort.
-
-Note that this is entirely a progress estimate and does not have
-a relationship with items put in their correct place.
-It is also an estimate, so no guarantees are made about accuracy,
-other than that it will only report 100% completion when it is
-indeed done sorting.
-
-To get a percentage, you need to divide this number by the total
-number of elements that are being sorted.
-
-
-</description>
-<parameters>
-<parameter name="self">
-<parameter_description> a #GtkTimSort
-</parameter_description>
-</parameter>
-</parameters>
-<return> Rough guess of sort progress
-</return>
-</function>
-
<function name="gtk_toggle_button_get_active">
<description>
Queries a #GtkToggleButton and returns its current state. Returns %TRUE if
@@ -76805,6 +76625,32 @@ If the status of the button changes, this action causes the
<return></return>
</function>
+<function name="gtk_toggle_button_set_group">
+<description>
+Adds @self to the group of @group. In a group of multiple toggle buttons,
+only one button can be active at a time.
+
+Note that the same effect can be achieved via the #GtkActionable
+api, by using the same action with parameter type and state type 's'
+for all buttons in the group, and giving each button its own target
+value.
+
+
+</description>
+<parameters>
+<parameter name="self">
+<parameter_description> a #GtkToggleButton
+</parameter_description>
+</parameter>
+<parameter name="group">
+<parameter_description> another #GtkToggleButton to
+form a group with
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gtk_toggle_button_toggled">
<description>
Emits the #GtkToggleButton::toggled signal on the
diff --git a/gtk/src/gtk_extra_objects.defs b/gtk/src/gtk_extra_objects.defs
index 784119c9..536b772d 100644
--- a/gtk/src/gtk_extra_objects.defs
+++ b/gtk/src/gtk_extra_objects.defs
@@ -448,12 +448,6 @@
(gtype-id "GTK_TYPE_PROGRESS_BAR")
)
-(define-object RadioButton
- (in-module "Gtk")
- (c-name "GtkRadioButton")
- (gtype-id "GTK_TYPE_RADIO_BUTTON")
-)
-
(define-object RecentFilter
(in-module "Gtk")
(c-name "GtkRecentFilter")
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 864c1a19..132614e2 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -361,6 +361,13 @@
(gtype-id "GTK_TYPE_COMBO_BOX")
)
+(define-object CheckButton
+ (in-module "Gtk")
+ (parent "GtkWidget")
+ (c-name "GtkCheckButton")
+ (gtype-id "GTK_TYPE_CHECK_BUTTON")
+)
+
(define-object Button
(in-module "Gtk")
(parent "GtkWidget")
@@ -375,13 +382,6 @@
(gtype-id "GTK_TYPE_TOGGLE_BUTTON")
)
-(define-object CheckButton
- (in-module "Gtk")
- (parent "GtkToggleButton")
- (c-name "GtkCheckButton")
- (gtype-id "GTK_TYPE_CHECK_BUTTON")
-)
-
(define-object ScaleButton
(in-module "Gtk")
(parent "GtkButton")
@@ -2482,8 +2482,9 @@
(c-name "gtk_accessible_update_state_value")
(return-type "none")
(parameters
- '("GtkAccessibleState" "state")
- '("const-GValue*" "value")
+ '("int" "n_states")
+ '("GtkAccessibleState[]" "states")
+ '("const-GValue[]" "values")
)
)
@@ -2492,8 +2493,9 @@
(c-name "gtk_accessible_update_property_value")
(return-type "none")
(parameters
- '("GtkAccessibleProperty" "property")
- '("const-GValue*" "value")
+ '("int" "n_properties")
+ '("GtkAccessibleProperty[]" "properties")
+ '("const-GValue[]" "values")
)
)
@@ -2502,8 +2504,9 @@
(c-name "gtk_accessible_update_relation_value")
(return-type "none")
(parameters
- '("GtkAccessibleRelation" "relation")
- '("const-GValue*" "value")
+ '("int" "n_relations")
+ '("GtkAccessibleRelation[]" "relations")
+ '("const-GValue[]" "values")
)
)
@@ -6466,36 +6469,75 @@
)
)
-(define-method set_draw_indicator
+(define-method set_inconsistent
(of-object "GtkCheckButton")
- (c-name "gtk_check_button_set_draw_indicator")
+ (c-name "gtk_check_button_set_inconsistent")
(return-type "none")
(parameters
- '("gboolean" "draw_indicator")
+ '("gboolean" "inconsistent")
)
)
-(define-method get_draw_indicator
+(define-method get_inconsistent
(of-object "GtkCheckButton")
- (c-name "gtk_check_button_get_draw_indicator")
+ (c-name "gtk_check_button_get_inconsistent")
(return-type "gboolean")
)
-(define-method set_inconsistent
+(define-method get_active
(of-object "GtkCheckButton")
- (c-name "gtk_check_button_set_inconsistent")
+ (c-name "gtk_check_button_get_active")
+ (return-type "gboolean")
+)
+
+(define-method set_active
+ (of-object "GtkCheckButton")
+ (c-name "gtk_check_button_set_active")
(return-type "none")
(parameters
- '("gboolean" "inconsistent")
+ '("gboolean" "setting")
)
)
-(define-method get_inconsistent
+(define-method get_label
(of-object "GtkCheckButton")
- (c-name "gtk_check_button_get_inconsistent")
+ (c-name "gtk_check_button_get_label")
+ (return-type "const-char*")
+)
+
+(define-method set_label
+ (of-object "GtkCheckButton")
+ (c-name "gtk_check_button_set_label")
+ (return-type "none")
+ (parameters
+ '("const-char*" "label")
+ )
+)
+
+(define-method set_group
+ (of-object "GtkCheckButton")
+ (c-name "gtk_check_button_set_group")
+ (return-type "none")
+ (parameters
+ '("GtkCheckButton*" "group")
+ )
+)
+
+(define-method get_use_underline
+ (of-object "GtkCheckButton")
+ (c-name "gtk_check_button_get_use_underline")
(return-type "gboolean")
)
+(define-method set_use_underline
+ (of-object "GtkCheckButton")
+ (c-name "gtk_check_button_set_use_underline")
+ (return-type "none")
+ (parameters
+ '("gboolean" "setting")
+ )
+)
+
;; From gtkcolorbutton.h
@@ -6834,7 +6876,7 @@
(is-constructor-of "GtkColumnView")
(return-type "GtkWidget*")
(parameters
- '("GListModel*" "model")
+ '("GtkSelectionModel*" "model")
)
)
@@ -6875,7 +6917,7 @@
(define-method get_model
(of-object "GtkColumnView")
(c-name "gtk_column_view_get_model")
- (return-type "GListModel*")
+ (return-type "GtkSelectionModel*")
)
(define-method set_model
@@ -6883,7 +6925,7 @@
(c-name "gtk_column_view_set_model")
(return-type "none")
(parameters
- '("GListModel*" "model")
+ '("GtkSelectionModel*" "model")
)
)
@@ -12515,15 +12557,7 @@
(is-constructor-of "GtkGridView")
(return-type "GtkWidget*")
(parameters
- '("GListModel*" "model")
- )
-)
-
-(define-function gtk_grid_view_new_with_factory
- (c-name "gtk_grid_view_new_with_factory")
- (return-type "GtkWidget*")
- (parameters
- '("GListModel*" "model")
+ '("GtkSelectionModel*" "model")
'("GtkListItemFactory*" "factory")
)
)
@@ -12531,7 +12565,7 @@
(define-method get_model
(of-object "GtkGridView")
(c-name "gtk_grid_view_get_model")
- (return-type "GListModel*")
+ (return-type "GtkSelectionModel*")
)
(define-method set_model
@@ -12539,7 +12573,7 @@
(c-name "gtk_grid_view_set_model")
(return-type "none")
(parameters
- '("GListModel*" "model")
+ '("GtkSelectionModel*" "model")
)
)
@@ -15313,15 +15347,7 @@
(is-constructor-of "GtkListView")
(return-type "GtkWidget*")
(parameters
- '("GListModel*" "model")
- )
-)
-
-(define-function gtk_list_view_new_with_factory
- (c-name "gtk_list_view_new_with_factory")
- (return-type "GtkWidget*")
- (parameters
- '("GListModel*" "model")
+ '("GtkSelectionModel*" "model")
'("GtkListItemFactory*" "factory")
)
)
@@ -15329,7 +15355,7 @@
(define-method get_model
(of-object "GtkListView")
(c-name "gtk_list_view_get_model")
- (return-type "GListModel*")
+ (return-type "GtkSelectionModel*")
)
(define-method set_model
@@ -15337,7 +15363,7 @@
(c-name "gtk_list_view_set_model")
(return-type "none")
(parameters
- '("GListModel*" "model")
+ '("GtkSelectionModel*" "model")
)
)
@@ -20246,90 +20272,6 @@
-;; From gtkradiobutton.h
-
-(define-function gtk_radio_button_get_type
- (c-name "gtk_radio_button_get_type")
- (return-type "GType")
-)
-
-(define-function gtk_radio_button_new
- (c-name "gtk_radio_button_new")
- (is-constructor-of "GtkRadioButton")
- (return-type "GtkWidget*")
- (parameters
- '("GSList*" "group")
- )
-)
-
-(define-method new_from_widget
- (of-object "GtkRadioButton")
- (c-name "gtk_radio_button_new_from_widget")
- (return-type "GtkWidget*")
-)
-
-(define-function gtk_radio_button_new_with_label
- (c-name "gtk_radio_button_new_with_label")
- (return-type "GtkWidget*")
- (parameters
- '("GSList*" "group")
- '("const-char*" "label")
- )
-)
-
-(define-method new_with_label_from_widget
- (of-object "GtkRadioButton")
- (c-name "gtk_radio_button_new_with_label_from_widget")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "label")
- )
-)
-
-(define-function gtk_radio_button_new_with_mnemonic
- (c-name "gtk_radio_button_new_with_mnemonic")
- (return-type "GtkWidget*")
- (parameters
- '("GSList*" "group")
- '("const-char*" "label")
- )
-)
-
-(define-method new_with_mnemonic_from_widget
- (of-object "GtkRadioButton")
- (c-name "gtk_radio_button_new_with_mnemonic_from_widget")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "label")
- )
-)
-
-(define-method get_group
- (of-object "GtkRadioButton")
- (c-name "gtk_radio_button_get_group")
- (return-type "GSList*")
-)
-
-(define-method set_group
- (of-object "GtkRadioButton")
- (c-name "gtk_radio_button_set_group")
- (return-type "none")
- (parameters
- '("GSList*" "group")
- )
-)
-
-(define-method join_group
- (of-object "GtkRadioButton")
- (c-name "gtk_radio_button_join_group")
- (return-type "none")
- (parameters
- '("GtkRadioButton*" "group_source")
- )
-)
-
-
-
;; From gtkrange.h
(define-function gtk_range_get_type
@@ -26950,6 +26892,15 @@
(return-type "none")
)
+(define-method set_group
+ (of-object "GtkToggleButton")
+ (c-name "gtk_toggle_button_set_group")
+ (return-type "none")
+ (parameters
+ '("GtkToggleButton*" "group")
+ )
+)
+
;; From gtktooltip.h
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 909a4913..557d8607 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -948,14 +948,39 @@
;; From GtkCheckButton
-(define-property draw-indicator
+(define-signal toggled
+ (of-object "GtkCheckButton")
+ (return-type "void")
+ (flags "Run First")
+)
+
+(define-property active
(of-object "GtkCheckButton")
(prop-type "GParamBoolean")
- (docs "If the indicator part of the button is displayed")
+ (docs "If the toggle button should be pressed in")
(readable #t)
(writable #t)
(construct-only #f)
- (default-value "TRUE")
+ (default-value "FALSE")
+)
+
+(define-property group
+ (of-object "GtkCheckButton")
+ (prop-type "GParamObject")
+ (docs "The check button whose group this widget belongs to.")
+ (readable #f)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property label
+ (of-object "GtkCheckButton")
+ (prop-type "GParamString")
+ (docs "Text of the label widget inside the button, if the button contains a label widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+ (default-value "")
)
(define-property inconsistent
@@ -968,6 +993,16 @@
(default-value "FALSE")
)
+(define-property use-underline
+ (of-object "GtkCheckButton")
+ (prop-type "GParamBoolean")
+ (docs "If set, an underline in the text indicates the next character should be used for the mnemonic
accelerator key")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+ (default-value "FALSE")
+)
+
;; From GtkCellArea
(define-signal apply-attributes
@@ -8261,23 +8296,6 @@
(default-value "PANGO_ELLIPSIZE_NONE")
)
-;; From GtkRadioButton
-
-(define-signal group-changed
- (of-object "GtkRadioButton")
- (return-type "void")
- (flags "Run First")
-)
-
-(define-property group
- (of-object "GtkRadioButton")
- (prop-type "GParamObject")
- (docs "The radio button whose group this widget belongs to.")
- (readable #f)
- (writable #t)
- (construct-only #f)
-)
-
;; From GtkRange
(define-signal value-changed
@@ -12017,6 +12035,15 @@
(default-value "FALSE")
)
+(define-property group
+ (of-object "GtkToggleButton")
+ (prop-type "GParamObject")
+ (docs "The toggle button whose group this widget belongs to.")
+ (readable #f)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GtkTooltip
;; From GtkTreeModel
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 96bc2212..97d4ef3a 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -190,7 +190,6 @@ int main(int /* argc */, char** /* argv */)
<< get_defs( GTK_TYPE_PRINT_SETTINGS )
<< get_defs( GTK_TYPE_PRINT_OPERATION_PREVIEW )
<< get_defs( GTK_TYPE_PROGRESS_BAR )
- << get_defs( GTK_TYPE_RADIO_BUTTON )
<< get_defs( GTK_TYPE_RANGE )
<< get_defs( GTK_TYPE_RECENT_MANAGER )
<< get_defs( GTK_TYPE_REVEALER )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
