[gtkmm] Gdk, Gtk: Regenerate docs.xml and .defs files



commit 6e460bc38989d91e321439fccc4be969624d59e9
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Aug 13 20:08:07 2019 +0200

    Gdk, Gtk: Regenerate docs.xml and .defs files
    
    and update gdk_docs_override.xml and gtk_signals.defs.patch.

 gdk/src/gdk_docs.xml           |   3 +-
 gdk/src/gdk_docs_override.xml  |  26 ---
 gtk/src/gtk_docs.xml           | 126 ++++++++----
 gtk/src/gtk_enums.defs         | 456 +++++++++++++++++++++--------------------
 gtk/src/gtk_methods.defs       | 108 +++++++++-
 gtk/src/gtk_signals.defs       |  13 +-
 gtk/src/gtk_signals.defs.patch |  31 +--
 7 files changed, 438 insertions(+), 325 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 574f1432..08912a18 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -16529,8 +16529,7 @@ acceptable sizes for a toplevel surface. The purpose of
 this is to constrain user resizing, but the windowing system
 will typically  (but is not required to) also constrain the
 current size of the surface to the provided values and
-constrain programatic resizing via gdk_surface_resize() or
-gdk_surface_move_resize().
+constrain programatic resizing via gdk_surface_resize().
 
 Note that on X11, this effect has no effect on surfaces
 of type %GDK_SURFACE_TEMP since these surfaces are not resizable
diff --git a/gdk/src/gdk_docs_override.xml b/gdk/src/gdk_docs_override.xml
index b32201c2..af705ff5 100644
--- a/gdk/src/gdk_docs_override.xml
+++ b/gdk/src/gdk_docs_override.xml
@@ -117,30 +117,4 @@ Since: 2.14
 </description>
 </function>
 
-<function name="gdk_pixbuf_animation_iter_advance">
-<description>
-Possibly advances an animation to a new frame. Chooses the frame based
-on the start time passed to Gdk::PixbufAnimation::get_iter().
-
-@current_time would normally come from g_get_current_time(), and
-must be greater than or equal to the time passed to
-Gdk::PixbufAnimation::get_iter(), and must increase or remain
-unchanged each time get_pixbuf() is
-called. That is, you can&apos;t go backward in time; animations only
-play forward.
-
-If using the method overload that takes no current_time parameter then the 
-current time will be used. So you only need to explicitly pass
-@current_time if you&apos;re doing something odd like playing the animation
-at double speed.
-
-If this function returns %FALSE, there&apos;s no need to update the animation
-display, assuming the display had been rendered prior to advancing;
-if %TRUE, you need to call get_pixbuf() and update the
-display with the new pixbuf.
-
-Since: 2.14
-</description>
-</function>
-
 </root>
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 940a99ba..1c0930e9 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -10498,43 +10498,6 @@ when the child of a #GtkRevealer widget is shown or hidden.
 </parameters>
 </enum>
 
-<signal name="GtkScale::format-value">
-<description>
-Signal which allows you to change how the scale value is displayed.
-Connect a signal handler which returns an allocated string representing 
-@value. That string will then be used to display the scale's value.
-
-If no user-provided handlers are installed, the value will be displayed on
-its own, rounded according to the value of the #GtkScale:digits property.
-
-Here's an example signal handler which displays a value 1.0 as
-with &quot;--&gt;1.0&lt;--&quot;.
-|[&lt;!-- language=&quot;C&quot; --&gt;
-static gchar*
-format_value_callback (GtkScale *scale,
-gdouble   value)
-{
-return g_strdup_printf (&quot;--&gt;\%0.*g&lt;--&quot;,
-gtk_scale_get_digits (scale), value);
-}
-]|
-
-
-</description>
-<parameters>
-<parameter name="scale">
-<parameter_description> the object which received the signal
-</parameter_description>
-</parameter>
-<parameter name="value">
-<parameter_description> the value to format
-</parameter_description>
-</parameter>
-</parameters>
-<return> allocated string representing @value
-</return>
-</signal>
-
 <signal name="GtkScaleButton::popdown">
 <description>
 The ::popdown signal is a
@@ -17232,6 +17195,24 @@ gtk_accel_label_set_accel().
 <return></return>
 </function>
 
+<function name="gtk_accel_label_get_accel_closure">
+<description>
+Fetches the closure monitored by this accelerator label. See
+gtk_accel_label_set_accel_closure().
+
+
+</description>
+<parameters>
+<parameter name="accel_label">
+<parameter_description> a #GtkAccelLabel
+</parameter_description>
+</parameter>
+</parameters>
+<return> the closure monitored by @accel_label,
+or %NULL if it is not monitoring a closure.
+</return>
+</function>
+
 <function name="gtk_accel_label_get_accel_widget">
 <description>
 Fetches the widget monitored by this accelerator label. See
@@ -17245,7 +17226,8 @@ gtk_accel_label_set_accel_widget().
 </parameter_description>
 </parameter>
 </parameters>
-<return> the object monitored by the accelerator label, or %NULL.
+<return> the widget monitored by @accel_label,
+or %NULL if it is not monitoring a widget.
 </return>
 </function>
 
@@ -38033,6 +38015,20 @@ returned %TRUE for the sequences being currently interpreted.
 </return>
 </function>
 
+<function name="gtk_gesture_long_press_get_property">
+<description>
+Returns the delay factor as set by gtk_gesture_long_press_set_delay_factor().
+
+</description>
+<parameters>
+<parameter name="gesture">
+<parameter_description> A #GtkGestureLongPress
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_gesture_long_press_new">
 <description>
 Returns a newly created #GtkGesture that recognizes long presses.
@@ -38045,6 +38041,26 @@ Returns a newly created #GtkGesture that recognizes long presses.
 </return>
 </function>
 
+<function name="gtk_gesture_long_press_set_property">
+<description>
+Applies the given delay factor. The default long press time will be
+multiplied by this value.
+Valid values are in the range [0.5..2.0].
+
+</description>
+<parameters>
+<parameter name="gesture">
+<parameter_description> A #GtkGestureLongPress
+</parameter_description>
+</parameter>
+<parameter name="delay_factor">
+<parameter_description> The delay factor to apply
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_gesture_pan_get_orientation">
 <description>
 Returns the orientation of the pan gestures that this @gesture expects.
@@ -53540,7 +53556,7 @@ Gets the menu model set with gtk_password_entry_set_extra_menu().
 
 </description>
 <parameters>
-<parameter name="self">
+<parameter name="entry">
 <parameter_description> a #GtkText
 </parameter_description>
 </parameter>
@@ -61784,7 +61800,7 @@ so the retrieved value matches the displayed one, if #GtkScale:draw-value is
 
 Note that rounding to a small number of digits can interfere with
 the smooth autoscrolling that is built into #GtkScale. As an alternative,
-you can use the #GtkScale::format-value signal to format the displayed
+you can use gtk_scale_set_format_value_func() to format the displayed
 value yourself.
 
 </description>
@@ -61821,6 +61837,33 @@ to the slider.
 <return></return>
 </function>
 
+<function name="gtk_scale_set_format_value_func">
+<description>
+@func allows you to change how the scale value is displayed. The given
+function will return an allocated string representing @value.
+That string will then be used to display the scale's value.
+
+If #NULL is passed as @func, the value will be displayed on
+its own, rounded according to the value of the #GtkScale:digits property.
+
+</description>
+<parameters>
+<parameter name="scale">
+<parameter_description> a #GtkScale
+</parameter_description>
+</parameter>
+<parameter name="func">
+<parameter_description> function that formats the value
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> user data to pass to @func
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gtk_scale_set_has_origin">
 <description>
 If #GtkScale:has-origin is set to %TRUE (the default), the scale will
@@ -64805,7 +64848,8 @@ The child is recorded until the next call to gtk_snapshot_pop().
 </parameter_description>
 </parameter>
 <parameter name="child_bounds">
-<parameter_description> the bounds of the child
+<parameter_description> the bounds of the child or %NULL
+to use the full size of the collected child node
 </parameter_description>
 </parameter>
 </parameters>
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 3ae0b581..e0349bd6 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -1,3 +1,23 @@
+;; From gskpango.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GSK_PANGO_RENDERER_NORMAL,
+;;   GSK_PANGO_RENDERER_SELECTED,
+;;   GSK_PANGO_RENDERER_CURSOR
+;; } GskPangoRendererState;
+
+(define-enum-extended PangoRendererState
+  (in-module "Gsk")
+  (c-name "GskPangoRendererState")
+  (values
+    '("normal" "GSK_PANGO_RENDERER_NORMAL" "0")
+    '("selected" "GSK_PANGO_RENDERER_SELECTED" "1")
+    '("cursor" "GSK_PANGO_RENDERER_CURSOR" "2")
+  )
+)
+
 ;; From gtkaboutdialog.h
 
 ;; Original typedef:
@@ -25,8 +45,8 @@
 ;;   GTK_LICENSE_AGPL_3_0_ONLY
 ;; } GtkLicense;
 
-(define-enum-extended License
-  (in-module "Gtk")
+(define-enum-extended GtkLicense
+  (in-module "Gsk")
   (c-name "GtkLicense")
   (values
     '("unknown" "GTK_LICENSE_UNKNOWN" "0")
@@ -57,8 +77,8 @@
 ;;   GTK_ACCEL_MASK           = 0x07
 ;; } GtkAccelFlags;
 
-(define-flags-extended AccelFlags
-  (in-module "Gtk")
+(define-flags-extended GtkAccelFlags
+  (in-module "Gsk")
   (c-name "GtkAccelFlags")
   (values
     '("visible" "GTK_ACCEL_VISIBLE" "1 << 0")
@@ -78,8 +98,8 @@
 ;;   GTK_APPLICATION_INHIBIT_IDLE    = (1 << 3)
 ;; } GtkApplicationInhibitFlags;
 
-(define-flags-extended ApplicationInhibitFlags
-  (in-module "Gtk")
+(define-flags-extended GtkApplicationInhibitFlags
+  (in-module "Gsk")
   (c-name "GtkApplicationInhibitFlags")
   (values
     '("logout" "GTK_APPLICATION_INHIBIT_LOGOUT" "(1 << 0)")
@@ -102,8 +122,8 @@
 ;;   GTK_ASSISTANT_PAGE_CUSTOM
 ;; } GtkAssistantPageType;
 
-(define-enum-extended AssistantPageType
-  (in-module "Gtk")
+(define-enum-extended GtkAssistantPageType
+  (in-module "Gsk")
   (c-name "GtkAssistantPageType")
   (values
     '("content" "GTK_ASSISTANT_PAGE_CONTENT" "0")
@@ -136,8 +156,8 @@
 ;;   GTK_BUILDER_ERROR_INVALID_ID
 ;; } GtkBuilderError;
 
-(define-enum-extended BuilderError
-  (in-module "Gtk")
+(define-enum-extended GtkBuilderError
+  (in-module "Gsk")
   (c-name "GtkBuilderError")
   (values
     '("invalid-type-function" "GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" "0")
@@ -169,8 +189,8 @@
 ;;   GTK_CALENDAR_SHOW_DETAILS         = 1 << 5
 ;; } GtkCalendarDisplayOptions;
 
-(define-flags-extended CalendarDisplayOptions
-  (in-module "Gtk")
+(define-flags-extended GtkCalendarDisplayOptions
+  (in-module "Gsk")
   (c-name "GtkCalendarDisplayOptions")
   (values
     '("show-heading" "GTK_CALENDAR_SHOW_HEADING" "1 << 0")
@@ -190,8 +210,8 @@
 ;;   GTK_CELL_RENDERER_ACCEL_MODE_OTHER
 ;; } GtkCellRendererAccelMode;
 
-(define-enum-extended CellRendererAccelMode
-  (in-module "Gtk")
+(define-enum-extended GtkCellRendererAccelMode
+  (in-module "Gsk")
   (c-name "GtkCellRendererAccelMode")
   (values
     '("gtk" "GTK_CELL_RENDERER_ACCEL_MODE_GTK" "0")
@@ -214,8 +234,8 @@
 ;;   GTK_CELL_RENDERER_EXPANDED    = 1 << 6
 ;; } GtkCellRendererState;
 
-(define-flags-extended CellRendererState
-  (in-module "Gtk")
+(define-flags-extended GtkCellRendererState
+  (in-module "Gsk")
   (c-name "GtkCellRendererState")
   (values
     '("selected" "GTK_CELL_RENDERER_SELECTED" "1 << 0")
@@ -236,8 +256,8 @@
 ;;   GTK_CELL_RENDERER_MODE_EDITABLE
 ;; } GtkCellRendererMode;
 
-(define-enum-extended CellRendererMode
-  (in-module "Gtk")
+(define-enum-extended GtkCellRendererMode
+  (in-module "Gsk")
   (c-name "GtkCellRendererMode")
   (values
     '("inert" "GTK_CELL_RENDERER_MODE_INERT" "0")
@@ -270,8 +290,8 @@
 ;;   GTK_DEBUG_CONSTRAINTS     = 1 << 17,
 ;; } GtkDebugFlag;
 
-(define-flags-extended DebugFlag
-  (in-module "Gtk")
+(define-flags-extended GtkDebugFlag
+  (in-module "Gsk")
   (c-name "GtkDebugFlag")
   (values
     '("text" "GTK_DEBUG_TEXT" "1 << 0")
@@ -305,8 +325,8 @@
 ;;   GTK_DIALOG_USE_HEADER_BAR      = 1 << 2
 ;; } GtkDialogFlags;
 
-(define-flags-extended DialogFlags
-  (in-module "Gtk")
+(define-flags-extended GtkDialogFlags
+  (in-module "Gsk")
   (c-name "GtkDialogFlags")
   (values
     '("modal" "GTK_DIALOG_MODAL" "1 << 0")
@@ -331,8 +351,8 @@
 ;;   GTK_RESPONSE_HELP         = -11
 ;; } GtkResponseType;
 
-(define-enum-extended ResponseType
-  (in-module "Gtk")
+(define-enum-extended GtkResponseType
+  (in-module "Gsk")
   (c-name "GtkResponseType")
   (values
     '("none" "GTK_RESPONSE_NONE" "-1")
@@ -359,8 +379,8 @@
 ;;   GTK_DEST_DEFAULT_ALL        = 0x07
 ;; } GtkDestDefaults;
 
-(define-flags-extended DestDefaults
-  (in-module "Gtk")
+(define-flags-extended GtkDestDefaults
+  (in-module "Gsk")
   (c-name "GtkDestDefaults")
   (values
     '("motion" "GTK_DEST_DEFAULT_MOTION" "1 << 0")
@@ -384,8 +404,8 @@
 ;;   GTK_EDITABLE_NUM_PROPERTIES
 ;; } GtkEditableProperties;
 
-(define-enum-extended EditableProperties
-  (in-module "Gtk")
+(define-enum-extended GtkEditableProperties
+  (in-module "Gsk")
   (c-name "GtkEditableProperties")
   (values
     '("prop-text" "GTK_EDITABLE_PROP_TEXT" "0")
@@ -408,8 +428,8 @@
 ;;   GTK_ENTRY_ICON_SECONDARY
 ;; } GtkEntryIconPosition;
 
-(define-enum-extended EntryIconPosition
-  (in-module "Gtk")
+(define-enum-extended GtkEntryIconPosition
+  (in-module "Gsk")
   (c-name "GtkEntryIconPosition")
   (values
     '("primary" "GTK_ENTRY_ICON_PRIMARY" "0")
@@ -429,8 +449,8 @@
 ;;   GTK_ALIGN_BASELINE
 ;; } GtkAlign;
 
-(define-enum-extended Align
-  (in-module "Gtk")
+(define-enum-extended GtkAlign
+  (in-module "Gsk")
   (c-name "GtkAlign")
   (values
     '("fill" "GTK_ALIGN_FILL" "0")
@@ -451,8 +471,8 @@
 ;;   GTK_ARROW_NONE
 ;; } GtkArrowType;
 
-(define-enum-extended ArrowType
-  (in-module "Gtk")
+(define-enum-extended GtkArrowType
+  (in-module "Gsk")
   (c-name "GtkArrowType")
   (values
     '("up" "GTK_ARROW_UP" "0")
@@ -471,8 +491,8 @@
 ;;   GTK_BASELINE_POSITION_BOTTOM
 ;; } GtkBaselinePosition;
 
-(define-enum-extended BaselinePosition
-  (in-module "Gtk")
+(define-enum-extended GtkBaselinePosition
+  (in-module "Gsk")
   (c-name "GtkBaselinePosition")
   (values
     '("top" "GTK_BASELINE_POSITION_TOP" "0")
@@ -494,8 +514,8 @@
 ;;   GTK_DELETE_WHITESPACE
 ;; } GtkDeleteType;
 
-(define-enum-extended DeleteType
-  (in-module "Gtk")
+(define-enum-extended GtkDeleteType
+  (in-module "Gsk")
   (c-name "GtkDeleteType")
   (values
     '("chars" "GTK_DELETE_CHARS" "0")
@@ -520,8 +540,8 @@
 ;;   GTK_DIR_RIGHT
 ;; } GtkDirectionType;
 
-(define-enum-extended DirectionType
-  (in-module "Gtk")
+(define-enum-extended GtkDirectionType
+  (in-module "Gsk")
   (c-name "GtkDirectionType")
   (values
     '("tab-forward" "GTK_DIR_TAB_FORWARD" "0")
@@ -541,8 +561,8 @@
 ;;   GTK_ICON_SIZE_LARGE
 ;; } GtkIconSize;
 
-(define-enum-extended IconSize
-  (in-module "Gtk")
+(define-enum-extended GtkIconSize
+  (in-module "Gsk")
   (c-name "GtkIconSize")
   (values
     '("inherit" "GTK_ICON_SIZE_INHERIT" "0")
@@ -559,8 +579,8 @@
 ;;   GTK_SENSITIVITY_OFF
 ;; } GtkSensitivityType;
 
-(define-enum-extended SensitivityType
-  (in-module "Gtk")
+(define-enum-extended GtkSensitivityType
+  (in-module "Gsk")
   (c-name "GtkSensitivityType")
   (values
     '("auto" "GTK_SENSITIVITY_AUTO" "0")
@@ -577,8 +597,8 @@
 ;;   GTK_TEXT_DIR_RTL
 ;; } GtkTextDirection;
 
-(define-enum-extended TextDirection
-  (in-module "Gtk")
+(define-enum-extended GtkTextDirection
+  (in-module "Gsk")
   (c-name "GtkTextDirection")
   (values
     '("none" "GTK_TEXT_DIR_NONE" "0")
@@ -596,8 +616,8 @@
 ;;   GTK_JUSTIFY_FILL
 ;; } GtkJustification;
 
-(define-enum-extended Justification
-  (in-module "Gtk")
+(define-enum-extended GtkJustification
+  (in-module "Gsk")
   (c-name "GtkJustification")
   (values
     '("left" "GTK_JUSTIFY_LEFT" "0")
@@ -616,8 +636,8 @@
 ;;   GTK_MENU_DIR_PREV
 ;; } GtkMenuDirectionType;
 
-(define-enum-extended MenuDirectionType
-  (in-module "Gtk")
+(define-enum-extended GtkMenuDirectionType
+  (in-module "Gsk")
   (c-name "GtkMenuDirectionType")
   (values
     '("parent" "GTK_MENU_DIR_PARENT" "0")
@@ -637,8 +657,8 @@
 ;;   GTK_MESSAGE_OTHER
 ;; } GtkMessageType;
 
-(define-enum-extended MessageType
-  (in-module "Gtk")
+(define-enum-extended GtkMessageType
+  (in-module "Gsk")
   (c-name "GtkMessageType")
   (values
     '("info" "GTK_MESSAGE_INFO" "0")
@@ -664,8 +684,8 @@
 ;;   GTK_MOVEMENT_HORIZONTAL_PAGES
 ;; } GtkMovementStep;
 
-(define-enum-extended MovementStep
-  (in-module "Gtk")
+(define-enum-extended GtkMovementStep
+  (in-module "Gsk")
   (c-name "GtkMovementStep")
   (values
     '("logical-positions" "GTK_MOVEMENT_LOGICAL_POSITIONS" "0")
@@ -692,8 +712,8 @@
 ;;   GTK_SCROLL_HORIZONTAL_ENDS
 ;; } GtkScrollStep;
 
-(define-enum-extended ScrollStep
-  (in-module "Gtk")
+(define-enum-extended GtkScrollStep
+  (in-module "Gsk")
   (c-name "GtkScrollStep")
   (values
     '("steps" "GTK_SCROLL_STEPS" "0")
@@ -712,8 +732,8 @@
 ;;   GTK_ORIENTATION_VERTICAL
 ;; } GtkOrientation;
 
-(define-enum-extended Orientation
-  (in-module "Gtk")
+(define-enum-extended GtkOrientation
+  (in-module "Gsk")
   (c-name "GtkOrientation")
   (values
     '("horizontal" "GTK_ORIENTATION_HORIZONTAL" "0")
@@ -728,8 +748,8 @@
 ;;   GTK_OVERFLOW_HIDDEN
 ;; } GtkOverflow;
 
-(define-enum-extended Overflow
-  (in-module "Gtk")
+(define-enum-extended GtkOverflow
+  (in-module "Gsk")
   (c-name "GtkOverflow")
   (values
     '("visible" "GTK_OVERFLOW_VISIBLE" "0")
@@ -744,8 +764,8 @@
 ;;   GTK_PACK_END
 ;; } GtkPackType;
 
-(define-enum-extended PackType
-  (in-module "Gtk")
+(define-enum-extended GtkPackType
+  (in-module "Gsk")
   (c-name "GtkPackType")
   (values
     '("start" "GTK_PACK_START" "0")
@@ -762,8 +782,8 @@
 ;;   GTK_POS_BOTTOM
 ;; } GtkPositionType;
 
-(define-enum-extended PositionType
-  (in-module "Gtk")
+(define-enum-extended GtkPositionType
+  (in-module "Gsk")
   (c-name "GtkPositionType")
   (values
     '("left" "GTK_POS_LEFT" "0")
@@ -780,8 +800,8 @@
 ;;   GTK_RELIEF_NONE
 ;; } GtkReliefStyle;
 
-(define-enum-extended ReliefStyle
-  (in-module "Gtk")
+(define-enum-extended GtkReliefStyle
+  (in-module "Gsk")
   (c-name "GtkReliefStyle")
   (values
     '("normal" "GTK_RELIEF_NORMAL" "0")
@@ -810,8 +830,8 @@
 ;;   GTK_SCROLL_END
 ;; } GtkScrollType;
 
-(define-enum-extended ScrollType
-  (in-module "Gtk")
+(define-enum-extended GtkScrollType
+  (in-module "Gsk")
   (c-name "GtkScrollType")
   (values
     '("none" "GTK_SCROLL_NONE" "0")
@@ -842,8 +862,8 @@
 ;;   GTK_SELECTION_MULTIPLE
 ;; } GtkSelectionMode;
 
-(define-enum-extended SelectionMode
-  (in-module "Gtk")
+(define-enum-extended GtkSelectionMode
+  (in-module "Gsk")
   (c-name "GtkSelectionMode")
   (values
     '("none" "GTK_SELECTION_NONE" "0")
@@ -863,8 +883,8 @@
 ;;   GTK_SHADOW_ETCHED_OUT
 ;; } GtkShadowType;
 
-(define-enum-extended ShadowType
-  (in-module "Gtk")
+(define-enum-extended GtkShadowType
+  (in-module "Gsk")
   (c-name "GtkShadowType")
   (values
     '("none" "GTK_SHADOW_NONE" "0")
@@ -884,8 +904,8 @@
 ;;   GTK_TOOLBAR_BOTH_HORIZ
 ;; } GtkToolbarStyle;
 
-(define-enum-extended ToolbarStyle
-  (in-module "Gtk")
+(define-enum-extended GtkToolbarStyle
+  (in-module "Gsk")
   (c-name "GtkToolbarStyle")
   (values
     '("icons" "GTK_TOOLBAR_ICONS" "0")
@@ -904,8 +924,8 @@
 ;;   GTK_WRAP_WORD_CHAR
 ;; } GtkWrapMode;
 
-(define-enum-extended WrapMode
-  (in-module "Gtk")
+(define-enum-extended GtkWrapMode
+  (in-module "Gsk")
   (c-name "GtkWrapMode")
   (values
     '("none" "GTK_WRAP_NONE" "0")
@@ -922,8 +942,8 @@
 ;;   GTK_SORT_DESCENDING
 ;; } GtkSortType;
 
-(define-enum-extended SortType
-  (in-module "Gtk")
+(define-enum-extended GtkSortType
+  (in-module "Gsk")
   (c-name "GtkSortType")
   (values
     '("ascending" "GTK_SORT_ASCENDING" "0")
@@ -940,8 +960,8 @@
 ;;   GTK_PRINT_PAGES_SELECTION
 ;; } GtkPrintPages;
 
-(define-enum-extended PrintPages
-  (in-module "Gtk")
+(define-enum-extended GtkPrintPages
+  (in-module "Gsk")
   (c-name "GtkPrintPages")
   (values
     '("all" "GTK_PRINT_PAGES_ALL" "0")
@@ -959,8 +979,8 @@
 ;;   GTK_PAGE_SET_ODD
 ;; } GtkPageSet;
 
-(define-enum-extended PageSet
-  (in-module "Gtk")
+(define-enum-extended GtkPageSet
+  (in-module "Gsk")
   (c-name "GtkPageSet")
   (values
     '("all" "GTK_PAGE_SET_ALL" "0")
@@ -982,8 +1002,8 @@
 ;;   GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT  /*< nick=btrl >*/
 ;; } GtkNumberUpLayout;
 
-(define-enum-extended NumberUpLayout
-  (in-module "Gtk")
+(define-enum-extended GtkNumberUpLayout
+  (in-module "Gsk")
   (c-name "GtkNumberUpLayout")
   (values
     '("left-to-right-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM" "0")
@@ -1006,8 +1026,8 @@
 ;;   GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE
 ;; } GtkPageOrientation;
 
-(define-enum-extended PageOrientation
-  (in-module "Gtk")
+(define-enum-extended GtkPageOrientation
+  (in-module "Gsk")
   (c-name "GtkPageOrientation")
   (values
     '("portrait" "GTK_PAGE_ORIENTATION_PORTRAIT" "0")
@@ -1026,8 +1046,8 @@
 ;;   GTK_PRINT_QUALITY_DRAFT
 ;; } GtkPrintQuality;
 
-(define-enum-extended PrintQuality
-  (in-module "Gtk")
+(define-enum-extended GtkPrintQuality
+  (in-module "Gsk")
   (c-name "GtkPrintQuality")
   (values
     '("low" "GTK_PRINT_QUALITY_LOW" "0")
@@ -1045,8 +1065,8 @@
 ;;   GTK_PRINT_DUPLEX_VERTICAL
 ;; } GtkPrintDuplex;
 
-(define-enum-extended PrintDuplex
-  (in-module "Gtk")
+(define-enum-extended GtkPrintDuplex
+  (in-module "Gsk")
   (c-name "GtkPrintDuplex")
   (values
     '("simplex" "GTK_PRINT_DUPLEX_SIMPLEX" "0")
@@ -1064,8 +1084,8 @@
 ;;   GTK_UNIT_MM
 ;; } GtkUnit;
 
-(define-enum-extended Unit
-  (in-module "Gtk")
+(define-enum-extended GtkUnit
+  (in-module "Gsk")
   (c-name "GtkUnit")
   (values
     '("none" "GTK_UNIT_NONE" "0")
@@ -1084,8 +1104,8 @@
 ;;   GTK_TREE_VIEW_GRID_LINES_BOTH
 ;; } GtkTreeViewGridLines;
 
-(define-enum-extended TreeViewGridLines
-  (in-module "Gtk")
+(define-enum-extended GtkTreeViewGridLines
+  (in-module "Gsk")
   (c-name "GtkTreeViewGridLines")
   (values
     '("none" "GTK_TREE_VIEW_GRID_LINES_NONE" "0")
@@ -1106,8 +1126,8 @@
 ;;   GTK_DRAG_RESULT_ERROR
 ;; } GtkDragResult;
 
-(define-enum-extended DragResult
-  (in-module "Gtk")
+(define-enum-extended GtkDragResult
+  (in-module "Gsk")
   (c-name "GtkDragResult")
   (values
     '("success" "GTK_DRAG_RESULT_SUCCESS" "0")
@@ -1127,8 +1147,8 @@
 ;;   GTK_SIZE_GROUP_BOTH
 ;; } GtkSizeGroupMode;
 
-(define-enum-extended SizeGroupMode
-  (in-module "Gtk")
+(define-enum-extended GtkSizeGroupMode
+  (in-module "Gsk")
   (c-name "GtkSizeGroupMode")
   (values
     '("none" "GTK_SIZE_GROUP_NONE" "0")
@@ -1146,8 +1166,8 @@
 ;;   GTK_SIZE_REQUEST_CONSTANT_SIZE
 ;; } GtkSizeRequestMode;
 
-(define-enum-extended SizeRequestMode
-  (in-module "Gtk")
+(define-enum-extended GtkSizeRequestMode
+  (in-module "Gsk")
   (c-name "GtkSizeRequestMode")
   (values
     '("height-for-width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" "0")
@@ -1163,8 +1183,8 @@
 ;;   GTK_SCROLL_NATURAL
 ;; } GtkScrollablePolicy;
 
-(define-enum-extended ScrollablePolicy
-  (in-module "Gtk")
+(define-enum-extended GtkScrollablePolicy
+  (in-module "Gsk")
   (c-name "GtkScrollablePolicy")
   (values
     '("minimum" "GTK_SCROLL_MINIMUM" "0")
@@ -1192,8 +1212,8 @@
 ;;   GTK_STATE_FLAG_FOCUS_VISIBLE = 1 << 13
 ;; } GtkStateFlags;
 
-(define-flags-extended StateFlags
-  (in-module "Gtk")
+(define-flags-extended GtkStateFlags
+  (in-module "Gsk")
   (c-name "GtkStateFlags")
   (values
     '("normal" "GTK_STATE_FLAG_NORMAL" "0x0")
@@ -1228,8 +1248,8 @@
 ;;   GTK_BORDER_STYLE_RIDGE
 ;; } GtkBorderStyle;
 
-(define-enum-extended BorderStyle
-  (in-module "Gtk")
+(define-enum-extended GtkBorderStyle
+  (in-module "Gsk")
   (c-name "GtkBorderStyle")
   (values
     '("none" "GTK_BORDER_STYLE_NONE" "0")
@@ -1251,8 +1271,8 @@
 ;;   GTK_LEVEL_BAR_MODE_DISCRETE
 ;; } GtkLevelBarMode;
 
-(define-enum-extended LevelBarMode
-  (in-module "Gtk")
+(define-enum-extended GtkLevelBarMode
+  (in-module "Gsk")
   (c-name "GtkLevelBarMode")
   (values
     '("continuous" "GTK_LEVEL_BAR_MODE_CONTINUOUS" "0")
@@ -1275,8 +1295,8 @@
 ;;   GTK_INPUT_PURPOSE_PIN
 ;; } GtkInputPurpose;
 
-(define-enum-extended InputPurpose
-  (in-module "Gtk")
+(define-enum-extended GtkInputPurpose
+  (in-module "Gsk")
   (c-name "GtkInputPurpose")
   (values
     '("free-form" "GTK_INPUT_PURPOSE_FREE_FORM" "0")
@@ -1309,8 +1329,8 @@
 ;;   GTK_INPUT_HINT_NO_EMOJI            = 1 << 10
 ;; } GtkInputHints;
 
-(define-flags-extended InputHints
-  (in-module "Gtk")
+(define-flags-extended GtkInputHints
+  (in-module "Gsk")
   (c-name "GtkInputHints")
   (values
     '("none" "GTK_INPUT_HINT_NONE" "0x0")
@@ -1337,8 +1357,8 @@
 ;;   GTK_PHASE_TARGET
 ;; } GtkPropagationPhase;
 
-(define-enum-extended PropagationPhase
-  (in-module "Gtk")
+(define-enum-extended GtkPropagationPhase
+  (in-module "Gsk")
   (c-name "GtkPropagationPhase")
   (values
     '("none" "GTK_PHASE_NONE" "0")
@@ -1355,8 +1375,8 @@
 ;;   GTK_LIMIT_SAME_NATIVE
 ;; } GtkPropagationLimit;
 
-(define-enum-extended PropagationLimit
-  (in-module "Gtk")
+(define-enum-extended GtkPropagationLimit
+  (in-module "Gsk")
   (c-name "GtkPropagationLimit")
   (values
     '("none" "GTK_LIMIT_NONE" "0")
@@ -1372,8 +1392,8 @@
 ;;   GTK_EVENT_SEQUENCE_DENIED
 ;; } GtkEventSequenceState;
 
-(define-enum-extended EventSequenceState
-  (in-module "Gtk")
+(define-enum-extended GtkEventSequenceState
+  (in-module "Gsk")
   (c-name "GtkEventSequenceState")
   (values
     '("none" "GTK_EVENT_SEQUENCE_NONE" "0")
@@ -1391,8 +1411,8 @@
 ;;   GTK_PAN_DIRECTION_DOWN
 ;; } GtkPanDirection;
 
-(define-enum-extended PanDirection
-  (in-module "Gtk")
+(define-enum-extended GtkPanDirection
+  (in-module "Gsk")
   (c-name "GtkPanDirection")
   (values
     '("left" "GTK_PAN_DIRECTION_LEFT" "0")
@@ -1409,8 +1429,8 @@
 ;;   GTK_POPOVER_CONSTRAINT_WINDOW
 ;; } GtkPopoverConstraint;
 
-(define-enum-extended PopoverConstraint
-  (in-module "Gtk")
+(define-enum-extended GtkPopoverConstraint
+  (in-module "Gsk")
   (c-name "GtkPopoverConstraint")
   (values
     '("none" "GTK_POPOVER_CONSTRAINT_NONE" "0")
@@ -1425,8 +1445,8 @@
 ;;   GTK_PLACES_OPEN_NEW_WINDOW = 1 << 2
 ;; } GtkPlacesOpenFlags;
 
-(define-flags-extended PlacesOpenFlags
-  (in-module "Gtk")
+(define-flags-extended GtkPlacesOpenFlags
+  (in-module "Gsk")
   (c-name "GtkPlacesOpenFlags")
   (values
     '("normal" "GTK_PLACES_OPEN_NORMAL" "1 << 0")
@@ -1442,8 +1462,8 @@
 ;;   GTK_PICK_NON_TARGETABLE = 1 << 1
 ;; } GtkPickFlags;
 
-(define-flags-extended PickFlags
-  (in-module "Gtk")
+(define-flags-extended GtkPickFlags
+  (in-module "Gsk")
   (c-name "GtkPickFlags")
   (values
     '("default" "GTK_PICK_DEFAULT" "0x0")
@@ -1459,8 +1479,8 @@
 ;;   GTK_CONSTRAINT_RELATION_GE = 1
 ;; } GtkConstraintRelation;
 
-(define-enum-extended ConstraintRelation
-  (in-module "Gtk")
+(define-enum-extended GtkConstraintRelation
+  (in-module "Gsk")
   (c-name "GtkConstraintRelation")
   (values
     '("le" "GTK_CONSTRAINT_RELATION_LE" "-1")
@@ -1477,8 +1497,8 @@
 ;;   GTK_CONSTRAINT_STRENGTH_WEAK     = 1
 ;; } GtkConstraintStrength;
 
-(define-enum-extended ConstraintStrength
-  (in-module "Gtk")
+(define-enum-extended GtkConstraintStrength
+  (in-module "Gsk")
   (c-name "GtkConstraintStrength")
   (values
     '("required" "GTK_CONSTRAINT_STRENGTH_REQUIRED" "1001001000")
@@ -1504,8 +1524,8 @@
 ;;   GTK_CONSTRAINT_ATTRIBUTE_BASELINE
 ;; } GtkConstraintAttribute;
 
-(define-enum-extended ConstraintAttribute
-  (in-module "Gtk")
+(define-enum-extended GtkConstraintAttribute
+  (in-module "Gsk")
   (c-name "GtkConstraintAttribute")
   (values
     '("none" "GTK_CONSTRAINT_ATTRIBUTE_NONE" "0")
@@ -1533,8 +1553,8 @@
 ;;   GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_RELATION
 ;; } GtkConstraintVflParserError;
 
-(define-enum-extended ConstraintVflParserError
-  (in-module "Gtk")
+(define-enum-extended GtkConstraintVflParserError
+  (in-module "Gsk")
   (c-name "GtkConstraintVflParserError")
   (values
     '("symbol" "GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_SYMBOL" "0")
@@ -1558,8 +1578,8 @@
 ;;   GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES  = (GTK_EVENT_CONTROLLER_SCROLL_VERTICAL | 
GTK_EVENT_CONTROLLER_SCROLL_HORIZONTAL),
 ;; } GtkEventControllerScrollFlags;
 
-(define-flags-extended EventControllerScrollFlags
-  (in-module "Gtk")
+(define-flags-extended GtkEventControllerScrollFlags
+  (in-module "Gsk")
   (c-name "GtkEventControllerScrollFlags")
   (values
     '("none" "GTK_EVENT_CONTROLLER_SCROLL_NONE" "0x0")
@@ -1582,8 +1602,8 @@
 ;;   GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
 ;; } GtkFileChooserAction;
 
-(define-enum-extended FileChooserAction
-  (in-module "Gtk")
+(define-enum-extended GtkFileChooserAction
+  (in-module "Gsk")
   (c-name "GtkFileChooserAction")
   (values
     '("open" "GTK_FILE_CHOOSER_ACTION_OPEN" "0")
@@ -1601,8 +1621,8 @@
 ;;   GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
 ;; } GtkFileChooserConfirmation;
 
-(define-enum-extended FileChooserConfirmation
-  (in-module "Gtk")
+(define-enum-extended GtkFileChooserConfirmation
+  (in-module "Gsk")
   (c-name "GtkFileChooserConfirmation")
   (values
     '("confirm" "GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM" "0")
@@ -1619,8 +1639,8 @@
 ;;   GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME
 ;; } GtkFileChooserError;
 
-(define-enum-extended FileChooserError
-  (in-module "Gtk")
+(define-enum-extended GtkFileChooserError
+  (in-module "Gsk")
   (c-name "GtkFileChooserError")
   (values
     '("nonexistent" "GTK_FILE_CHOOSER_ERROR_NONEXISTENT" "0")
@@ -1649,8 +1669,8 @@
 ;;   GTK_FILE_CHOOSER_PROP_LAST                   = GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS
 ;; } GtkFileChooserProp;
 
-(define-enum-extended FileChooserProp
-  (in-module "Gtk")
+(define-enum-extended GtkFileChooserProp
+  (in-module "Gsk")
   (c-name "GtkFileChooserProp")
   (values
     '("first" "GTK_FILE_CHOOSER_PROP_FIRST" "0x1000")
@@ -1679,8 +1699,8 @@
 ;;   GTK_FILE_FILTER_MIME_TYPE    = 1 << 3
 ;; } GtkFileFilterFlags;
 
-(define-flags-extended FileFilterFlags
-  (in-module "Gtk")
+(define-flags-extended GtkFileFilterFlags
+  (in-module "Gsk")
   (c-name "GtkFileFilterFlags")
   (values
     '("filename" "GTK_FILE_FILTER_FILENAME" "1 << 0")
@@ -1701,8 +1721,8 @@
 ;;   GTK_FONT_CHOOSER_LEVEL_FEATURES   = 1 << 3
 ;; } GtkFontChooserLevel;
 
-(define-flags-extended FontChooserLevel
-  (in-module "Gtk")
+(define-flags-extended GtkFontChooserLevel
+  (in-module "Gsk")
   (c-name "GtkFontChooserLevel")
   (values
     '("family" "GTK_FONT_CHOOSER_LEVEL_FAMILY" "0x0")
@@ -1728,8 +1748,8 @@
 ;;   GTK_FONT_CHOOSER_PROP_LAST
 ;; } GtkFontChooserProp;
 
-(define-enum-extended FontChooserProp
-  (in-module "Gtk")
+(define-enum-extended GtkFontChooserProp
+  (in-module "Gsk")
   (c-name "GtkFontChooserProp")
   (values
     '("first" "GTK_FONT_CHOOSER_PROP_FIRST" "0x4000")
@@ -1760,8 +1780,8 @@
 ;;   GTK_ICON_LOOKUP_DIR_RTL          = 1 << 8
 ;; } GtkIconLookupFlags;
 
-(define-flags-extended IconLookupFlags
-  (in-module "Gtk")
+(define-flags-extended GtkIconLookupFlags
+  (in-module "Gsk")
   (c-name "GtkIconLookupFlags")
   (values
     '("no-svg" "GTK_ICON_LOOKUP_NO_SVG" "1 << 0")
@@ -1782,8 +1802,8 @@
 ;;   GTK_ICON_THEME_FAILED
 ;; } GtkIconThemeError;
 
-(define-enum-extended IconThemeError
-  (in-module "Gtk")
+(define-enum-extended GtkIconThemeError
+  (in-module "Gsk")
   (c-name "GtkIconThemeError")
   (values
     '("not-found" "GTK_ICON_THEME_NOT_FOUND" "0")
@@ -1804,8 +1824,8 @@
 ;;   GTK_ICON_VIEW_DROP_BELOW
 ;; } GtkIconViewDropPosition;
 
-(define-enum-extended IconViewDropPosition
-  (in-module "Gtk")
+(define-enum-extended GtkIconViewDropPosition
+  (in-module "Gsk")
   (c-name "GtkIconViewDropPosition")
   (values
     '("no-drop" "GTK_ICON_VIEW_NO_DROP" "0")
@@ -1828,8 +1848,8 @@
 ;;   GTK_IMAGE_PAINTABLE
 ;; } GtkImageType;
 
-(define-enum-extended ImageType
-  (in-module "Gtk")
+(define-enum-extended GtkImageType
+  (in-module "Gsk")
   (c-name "GtkImageType")
   (values
     '("empty" "GTK_IMAGE_EMPTY" "0")
@@ -1852,8 +1872,8 @@
 ;;   GTK_BUTTONS_OK_CANCEL
 ;; } GtkButtonsType;
 
-(define-enum-extended ButtonsType
-  (in-module "Gtk")
+(define-enum-extended GtkButtonsType
+  (in-module "Gsk")
   (c-name "GtkButtonsType")
   (values
     '("none" "GTK_BUTTONS_NONE" "0")
@@ -1875,8 +1895,8 @@
 ;;   GTK_BUTTON_ROLE_TITLE
 ;; } GtkButtonRole;
 
-(define-enum-extended ButtonRole
-  (in-module "Gtk")
+(define-enum-extended GtkButtonRole
+  (in-module "Gsk")
   (c-name "GtkButtonRole")
   (values
     '("normal" "GTK_BUTTON_ROLE_NORMAL" "0")
@@ -1895,8 +1915,8 @@
 ;;   GTK_NOTEBOOK_TAB_LAST
 ;; } GtkNotebookTab;
 
-(define-enum-extended NotebookTab
-  (in-module "Gtk")
+(define-enum-extended GtkNotebookTab
+  (in-module "Gsk")
   (c-name "GtkNotebookTab")
   (values
     '("first" "GTK_NOTEBOOK_TAB_FIRST" "0")
@@ -1913,8 +1933,8 @@
 ;;   GTK_PAD_ACTION_STRIP
 ;; } GtkPadActionType;
 
-(define-enum-extended PadActionType
-  (in-module "Gtk")
+(define-enum-extended GtkPadActionType
+  (in-module "Gsk")
   (c-name "GtkPadActionType")
   (values
     '("button" "GTK_PAD_ACTION_BUTTON" "0")
@@ -1940,8 +1960,8 @@
 ;;   GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT = 1 << 9
 ;; } GtkPrintCapabilities;
 
-(define-flags-extended PrintCapabilities
-  (in-module "Gtk")
+(define-flags-extended GtkPrintCapabilities
+  (in-module "Gsk")
   (c-name "GtkPrintCapabilities")
   (values
     '("page-set" "GTK_PRINT_CAPABILITY_PAGE_SET" "1 << 0")
@@ -1974,8 +1994,8 @@
 ;;   GTK_PRINTER_OPTION_TYPE_INFO
 ;; } GtkPrinterOptionType;
 
-(define-enum-extended PrinterOptionType
-  (in-module "Gtk")
+(define-enum-extended GtkPrinterOptionType
+  (in-module "Gsk")
   (c-name "GtkPrinterOptionType")
   (values
     '("boolean" "GTK_PRINTER_OPTION_TYPE_BOOLEAN" "0")
@@ -2007,8 +2027,8 @@
 ;;   GTK_PRINT_STATUS_FINISHED_ABORTED
 ;; } GtkPrintStatus;
 
-(define-enum-extended PrintStatus
-  (in-module "Gtk")
+(define-enum-extended GtkPrintStatus
+  (in-module "Gsk")
   (c-name "GtkPrintStatus")
   (values
     '("initial" "GTK_PRINT_STATUS_INITIAL" "0")
@@ -2031,8 +2051,8 @@
 ;;   GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
 ;; } GtkPrintOperationResult;
 
-(define-enum-extended PrintOperationResult
-  (in-module "Gtk")
+(define-enum-extended GtkPrintOperationResult
+  (in-module "Gsk")
   (c-name "GtkPrintOperationResult")
   (values
     '("error" "GTK_PRINT_OPERATION_RESULT_ERROR" "0")
@@ -2050,8 +2070,8 @@
 ;;   GTK_PRINT_OPERATION_ACTION_EXPORT
 ;; } GtkPrintOperationAction;
 
-(define-enum-extended PrintOperationAction
-  (in-module "Gtk")
+(define-enum-extended GtkPrintOperationAction
+  (in-module "Gsk")
   (c-name "GtkPrintOperationAction")
   (values
     '("print-dialog" "GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" "0")
@@ -2070,8 +2090,8 @@
 ;;   GTK_PRINT_ERROR_INVALID_FILE
 ;; } GtkPrintError;
 
-(define-enum-extended PrintError
-  (in-module "Gtk")
+(define-enum-extended GtkPrintError
+  (in-module "Gsk")
   (c-name "GtkPrintError")
   (values
     '("general" "GTK_PRINT_ERROR_GENERAL" "0")
@@ -2095,8 +2115,8 @@
 ;;   GTK_RECENT_MANAGER_ERROR_UNKNOWN
 ;; } GtkRecentManagerError;
 
-(define-enum-extended RecentManagerError
-  (in-module "Gtk")
+(define-enum-extended GtkRecentManagerError
+  (in-module "Gsk")
   (c-name "GtkRecentManagerError")
   (values
     '("not-found" "GTK_RECENT_MANAGER_ERROR_NOT_FOUND" "0")
@@ -2125,8 +2145,8 @@
 ;;   GTK_REVEALER_TRANSITION_TYPE_SWING_DOWN
 ;; } GtkRevealerTransitionType;
 
-(define-enum-extended RevealerTransitionType
-  (in-module "Gtk")
+(define-enum-extended GtkRevealerTransitionType
+  (in-module "Gsk")
   (c-name "GtkRevealerTransitionType")
   (values
     '("none" "GTK_REVEALER_TRANSITION_TYPE_NONE" "0")
@@ -2153,8 +2173,8 @@
 ;;   GTK_CORNER_BOTTOM_RIGHT
 ;; } GtkCornerType;
 
-(define-enum-extended CornerType
-  (in-module "Gtk")
+(define-enum-extended GtkCornerType
+  (in-module "Gsk")
   (c-name "GtkCornerType")
   (values
     '("top-left" "GTK_CORNER_TOP_LEFT" "0")
@@ -2173,8 +2193,8 @@
 ;;   GTK_POLICY_EXTERNAL
 ;; } GtkPolicyType;
 
-(define-enum-extended PolicyType
-  (in-module "Gtk")
+(define-enum-extended GtkPolicyType
+  (in-module "Gsk")
   (c-name "GtkPolicyType")
   (values
     '("always" "GTK_POLICY_ALWAYS" "0")
@@ -2200,8 +2220,8 @@
 ;;   GTK_SHORTCUT_GESTURE_SWIPE_RIGHT
 ;; } GtkShortcutType;
 
-(define-enum-extended ShortcutType
-  (in-module "Gtk")
+(define-enum-extended GtkShortcutType
+  (in-module "Gsk")
   (c-name "GtkShortcutType")
   (values
     '("accelerator" "GTK_SHORTCUT_ACCELERATOR" "0")
@@ -2226,8 +2246,8 @@
 ;;   GTK_UPDATE_IF_VALID
 ;; } GtkSpinButtonUpdatePolicy;
 
-(define-enum-extended SpinButtonUpdatePolicy
-  (in-module "Gtk")
+(define-enum-extended GtkSpinButtonUpdatePolicy
+  (in-module "Gsk")
   (c-name "GtkSpinButtonUpdatePolicy")
   (values
     '("always" "GTK_UPDATE_ALWAYS" "0")
@@ -2247,8 +2267,8 @@
 ;;   GTK_SPIN_USER_DEFINED
 ;; } GtkSpinType;
 
-(define-enum-extended SpinType
-  (in-module "Gtk")
+(define-enum-extended GtkSpinType
+  (in-module "Gsk")
   (c-name "GtkSpinType")
   (values
     '("step-forward" "GTK_SPIN_STEP_FORWARD" "0")
@@ -2290,8 +2310,8 @@
 ;;   GTK_STACK_TRANSITION_TYPE_ROTATE_LEFT_RIGHT
 ;; } GtkStackTransitionType;
 
-(define-enum-extended StackTransitionType
-  (in-module "Gtk")
+(define-enum-extended GtkStackTransitionType
+  (in-module "Gsk")
   (c-name "GtkStackTransitionType")
   (values
     '("none" "GTK_STACK_TRANSITION_TYPE_NONE" "0")
@@ -2329,8 +2349,8 @@
 ;;   GTK_STYLE_CONTEXT_PRINT_SHOW_STYLE   = 1 << 1
 ;; } GtkStyleContextPrintFlags;
 
-(define-flags-extended StyleContextPrintFlags
-  (in-module "Gtk")
+(define-flags-extended GtkStyleContextPrintFlags
+  (in-module "Gsk")
   (c-name "GtkStyleContextPrintFlags")
   (values
     '("none" "GTK_STYLE_CONTEXT_PRINT_NONE" "0x0")
@@ -2349,8 +2369,8 @@
 ;;   GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = - 3
 ;; } GtkTextBufferTargetInfo;
 
-(define-enum-extended TextBufferTargetInfo
-  (in-module "Gtk")
+(define-enum-extended GtkTextBufferTargetInfo
+  (in-module "Gsk")
   (c-name "GtkTextBufferTargetInfo")
   (values
     '("buffer-contents" "GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" "-1")
@@ -2369,8 +2389,8 @@
 ;;   /* Possible future plans: SEARCH_REGEXP */
 ;; } GtkTextSearchFlags;
 
-(define-flags-extended TextSearchFlags
-  (in-module "Gtk")
+(define-flags-extended GtkTextSearchFlags
+  (in-module "Gsk")
   (c-name "GtkTextSearchFlags")
   (values
     '("visible-only" "GTK_TEXT_SEARCH_VISIBLE_ONLY" "1 << 0")
@@ -2393,8 +2413,8 @@
 ;;   GTK_TEXT_WINDOW_BOTTOM
 ;; } GtkTextWindowType;
 
-(define-enum-extended TextWindowType
-  (in-module "Gtk")
+(define-enum-extended GtkTextWindowType
+  (in-module "Gsk")
   (c-name "GtkTextWindowType")
   (values
     '("private" "GTK_TEXT_WINDOW_PRIVATE" "0")
@@ -2414,8 +2434,8 @@
 ;;   GTK_TEXT_VIEW_LAYER_ABOVE_TEXT
 ;; } GtkTextViewLayer;
 
-(define-enum-extended TextViewLayer
-  (in-module "Gtk")
+(define-enum-extended GtkTextViewLayer
+  (in-module "Gsk")
   (c-name "GtkTextViewLayer")
   (values
     '("below-text" "GTK_TEXT_VIEW_LAYER_BELOW_TEXT" "0")
@@ -2430,8 +2450,8 @@
 ;;   GTK_TEXT_EXTEND_SELECTION_LINE
 ;; } GtkTextExtendSelection;
 
-(define-enum-extended TextExtendSelection
-  (in-module "Gtk")
+(define-enum-extended GtkTextExtendSelection
+  (in-module "Gsk")
   (c-name "GtkTextExtendSelection")
   (values
     '("word" "GTK_TEXT_EXTEND_SELECTION_WORD" "0")
@@ -2448,8 +2468,8 @@
 ;;   GTK_TREE_MODEL_LIST_ONLY = 1 << 1
 ;; } GtkTreeModelFlags;
 
-(define-flags-extended TreeModelFlags
-  (in-module "Gtk")
+(define-flags-extended GtkTreeModelFlags
+  (in-module "Gsk")
   (c-name "GtkTreeModelFlags")
   (values
     '("iters-persist" "GTK_TREE_MODEL_ITERS_PERSIST" "1 << 0")
@@ -2467,8 +2487,8 @@
 ;;   GTK_TREE_VIEW_COLUMN_FIXED
 ;; } GtkTreeViewColumnSizing;
 
-(define-enum-extended TreeViewColumnSizing
-  (in-module "Gtk")
+(define-enum-extended GtkTreeViewColumnSizing
+  (in-module "Gsk")
   (c-name "GtkTreeViewColumnSizing")
   (values
     '("grow-only" "GTK_TREE_VIEW_COLUMN_GROW_ONLY" "0")
@@ -2492,8 +2512,8 @@
 ;;   GTK_TREE_VIEW_DROP_INTO_OR_AFTER
 ;; } GtkTreeViewDropPosition;
 
-(define-enum-extended TreeViewDropPosition
-  (in-module "Gtk")
+(define-enum-extended GtkTreeViewDropPosition
+  (in-module "Gsk")
   (c-name "GtkTreeViewDropPosition")
   (values
     '("before" "GTK_TREE_VIEW_DROP_BEFORE" "0")
@@ -2512,8 +2532,8 @@
 ;;   GTK_WINDOW_POPUP
 ;; } GtkWindowType;
 
-(define-enum-extended WindowType
-  (in-module "Gtk")
+(define-enum-extended GtkWindowType
+  (in-module "Gsk")
   (c-name "GtkWindowType")
   (values
     '("toplevel" "GTK_WINDOW_TOPLEVEL" "0")
@@ -2533,8 +2553,8 @@
 ;;   GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
 ;; } GtkCssParserError;
 
-(define-enum-extended CssParserError
-  (in-module "Gtk")
+(define-enum-extended GtkCssParserError
+  (in-module "Gsk")
   (c-name "GtkCssParserError")
   (values
     '("failed" "GTK_CSS_PARSER_ERROR_FAILED" "0")
@@ -2553,8 +2573,8 @@
 ;;   GTK_CSS_PARSER_WARNING_UNIMPLEMENTED
 ;; } GtkCssParserWarning;
 
-(define-enum-extended CssParserWarning
-  (in-module "Gtk")
+(define-enum-extended GtkCssParserWarning
+  (in-module "Gsk")
   (c-name "GtkCssParserWarning")
   (values
     '("deprecated" "GTK_CSS_PARSER_WARNING_DEPRECATED" "0")
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 5d3fb18a..98596fd2 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -1,5 +1,12 @@
 ;; -*- scheme -*-
 ; object definitions ...
+(define-object PangoRenderer
+  (in-module "Gsk")
+  (parent "PangoRenderer")
+  (c-name "GskPangoRenderer")
+  (gtype-id "GSK_TYPE_PANGO_RENDERER")
+)
+
 (define-object AccelGroup
   (in-module "Gtk")
   (parent "GObject")
@@ -536,6 +543,17 @@
 
 ;; Enumerations and flags ...
 
+(define-enum PangoRendererState
+  (in-module "Gsk")
+  (c-name "GskPangoRendererState")
+  (gtype-id "GSK_TYPE_PANGO_RENDERER_STATE")
+  (values
+    '("normal" "GSK_PANGO_RENDERER_NORMAL")
+    '("selected" "GSK_PANGO_RENDERER_SELECTED")
+    '("cursor" "GSK_PANGO_RENDERER_CURSOR")
+  )
+)
+
 (define-enum License
   (in-module "Gtk")
   (c-name "GtkLicense")
@@ -2042,6 +2060,26 @@
   (return-type "GType")
 )
 
+(define-method set_state
+  (of-object "GskPangoRenderer")
+  (c-name "gsk_pango_renderer_set_state")
+  (return-type "none")
+  (parameters
+    '("GskPangoRendererState" "state")
+  )
+)
+
+(define-function gsk_pango_renderer_acquire
+  (c-name "gsk_pango_renderer_acquire")
+  (return-type "GskPangoRenderer*")
+)
+
+(define-method release
+  (of-object "GskPangoRenderer")
+  (c-name "gsk_pango_renderer_release")
+  (return-type "none")
+)
+
 
 
 ;; From gtk-a11y.h
@@ -2591,6 +2629,12 @@
   )
 )
 
+(define-method get_accel_closure
+  (of-object "GtkAccelLabel")
+  (c-name "gtk_accel_label_get_accel_closure")
+  (return-type "GClosure*")
+)
+
 (define-method refetch
   (of-object "GtkAccelLabel")
   (c-name "gtk_accel_label_refetch")
@@ -5735,6 +5779,36 @@
   (return-type "gboolean")
 )
 
+(define-method set_is_expander
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_set_is_expander")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_expander")
+  )
+)
+
+(define-method get_is_expander
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_get_is_expander")
+  (return-type "gboolean")
+)
+
+(define-method set_is_expanded
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_set_is_expanded")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_expander")
+  )
+)
+
+(define-method get_is_expanded
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_get_is_expanded")
+  (return-type "gboolean")
+)
+
 (define-method stop_editing
   (of-object "GtkCellRenderer")
   (c-name "gtk_cell_renderer_stop_editing")
@@ -10877,6 +10951,21 @@
   (return-type "GtkGesture*")
 )
 
+(define-method set_delay_factor
+  (of-object "GtkGestureLongPress")
+  (c-name "gtk_gesture_long_press_set_delay_factor")
+  (return-type "none")
+  (parameters
+    '("double" "delay_factor")
+  )
+)
+
+(define-method get_delay_factor
+  (of-object "GtkGestureLongPress")
+  (c-name "gtk_gesture_long_press_get_delay_factor")
+  (return-type "double")
+)
+
 
 
 ;; From gtkgesturepan.h
@@ -20788,6 +20877,16 @@
   (return-type "none")
 )
 
+(define-method set_format_value_func
+  (of-object "GtkScale")
+  (c-name "gtk_scale_set_format_value_func")
+  (return-type "none")
+  (parameters
+    '("GtkScaleFormatValueFunc" "func")
+    '("gpointer" "user_data")
+  )
+)
+
 
 
 ;; From gtkscrollable.h
@@ -28204,11 +28303,10 @@
   (c-name "gtk_tree_view_column_cell_get_size")
   (return-type "none")
   (parameters
-    '("const-GdkRectangle*" "cell_area")
-    '("gint*" "x_offset")
-    '("gint*" "y_offset")
-    '("gint*" "width")
-    '("gint*" "height")
+    '("int*" "x_offset")
+    '("int*" "y_offset")
+    '("int*" "width")
+    '("int*" "height")
   )
 )
 
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 3aaacc64..7a6fd3fb 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -7276,7 +7276,7 @@
   (readable #t)
   (writable #t)
   (construct-only #f)
-  (default-value "GTK_POS_TOP")
+  (default-value "GTK_POS_BOTTOM")
 )
 
 (define-property autohide
@@ -8185,15 +8185,6 @@
 
 ;; From GtkScale
 
-(define-signal format-value
-  (of-object "GtkScale")
-  (return-type "gchar*")
-  (flags "Run Last")
-  (parameters
-    '("gdouble" "p0")
-  )
-)
-
 (define-property digits
   (of-object "GtkScale")
   (prop-type "GParamInt")
@@ -12627,7 +12618,7 @@
 (define-property cursor
   (of-object "GtkWidget")
   (prop-type "GParamObject")
-  (docs "The cursor to show when hoving above widget")
+  (docs "The cursor to show when hovering above widget")
   (readable #t)
   (writable #t)
   (construct-only #f)
diff --git a/gtk/src/gtk_signals.defs.patch b/gtk/src/gtk_signals.defs.patch
index 59799b40..c5c19046 100644
--- a/gtk/src/gtk_signals.defs.patch
+++ b/gtk/src/gtk_signals.defs.patch
@@ -1,5 +1,5 @@
---- ./../../gtk/src/gtk_signals.defs.orig      2019-04-06 10:24:14.921963903 +0200
-+++ ./../../gtk/src/gtk_signals.defs   2019-04-06 10:24:14.961964072 +0200
+--- tools/gen_scripts/../../gtk/src/gtk_signals.defs.orig      2019-08-13 08:24:53.970585996 +0200
++++ tools/gen_scripts/../../gtk/src/gtk_signals.defs   2019-08-13 08:24:53.994586156 +0200
 @@ -2357,11 +2357,11 @@
  (define-signal color-activated
    (of-object "GtkColorChooser")
@@ -26,7 +26,7 @@
      '("const-gchar*" "p0")
    )
  )
-@@ -2606,11 +2606,11 @@
+@@ -2768,11 +2768,11 @@
    (of-object "GtkCssProvider")
    (return-type "void")
    (flags "Run Last")
@@ -39,7 +39,7 @@
  
  ;; From GtkDialog
  
-@@ -6119,11 +6119,11 @@
+@@ -6320,11 +6320,11 @@
  (define-signal toggle-size-request
    (of-object "GtkMenuItem")
    (return-type "void")
@@ -52,7 +52,7 @@
  
  (define-signal toggle-size-allocate
    (of-object "GtkMenuItem")
-@@ -7338,11 +7338,11 @@
+@@ -7560,11 +7560,11 @@
    )
  )
  
@@ -65,20 +65,7 @@
  
  (define-signal update-custom-widget
    (of-object "GtkPrintOperation")
-@@ -7963,11 +7963,11 @@
- 
- ;; From GtkScale
- 
- (define-signal format-value
-   (of-object "GtkScale")
--  (return-type "const-gchar*")
-+  (return-type "gchar*")
-   (flags "Run Last")
-   (parameters
-     '("gdouble" "p0")
-   )
- )
-@@ -9229,11 +9229,11 @@
+@@ -9452,11 +9452,11 @@
  (define-signal input
    (of-object "GtkSpinButton")
    (return-type "gint")
@@ -91,7 +78,7 @@
  
  (define-signal output
    (of-object "GtkSpinButton")
-@@ -9858,11 +9858,11 @@
+@@ -10340,11 +10340,11 @@
  (define-signal mark-set
    (of-object "GtkTextBuffer")
    (return-type "void")
@@ -104,7 +91,7 @@
  )
  
  (define-signal mark-deleted
-@@ -9878,23 +9878,23 @@
+@@ -10360,23 +10360,23 @@
    (of-object "GtkTextBuffer")
    (return-type "void")
    (flags "Run Last")
@@ -132,7 +119,7 @@
  
  (define-signal begin-user-action
    (of-object "GtkTextBuffer")
-@@ -11152,11 +11152,11 @@
+@@ -11624,11 +11624,11 @@
    (return-type "void")
    (flags "Run First")
    (parameters



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]