[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: Tue, 3 Jul 2018 12:59:16 +0000 (UTC)
commit 08e68693bd2882a719bf73e8993759c766591cb1
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Tue Jul 3 14:53:41 2018 +0200
Gdk, Gtk: Regenerate docs.xml and .defs files
and make manual modifications:
* gdk/src/gdk_docs_override.xml: Remove some stuff that has become unnecessary.
* gdk/src/gdk_extra_objects.defs: Replace GdkDragContext by GdkDrag.
Remove GdkDrawingContext.
* tools/extra_defs_gen/generate_defs_gdk.cc: Replace GDK_TYPE_DRAG_CONTEXT
by GDK_TYPE_DRAG.
gdk/src/gdk_docs.xml | 261 +++++++++++++++---------------
gdk/src/gdk_docs_override.xml | 20 ---
gdk/src/gdk_enums.defs | 2 +-
gdk/src/gdk_extra_objects.defs | 12 +-
gdk/src/gdk_methods.defs | 46 +++---
gdk/src/gdk_signals.defs | 136 ++++++++--------
gtk/src/gtk_docs.xml | 126 +++++++++++----
gtk/src/gtk_methods.defs | 16 +-
gtk/src/gtk_signals.defs | 20 ++-
tools/extra_defs_gen/generate_defs_gdk.cc | 2 +-
10 files changed, 341 insertions(+), 300 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 9d576c14..67f6fc0d 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -688,62 +688,13 @@ The ::display-opened signal is emitted when a display is opened.
<return></return>
</signal>
-<enum name="GdkDragAction">
+<signal name="GdkDrag::action-changed">
<description>
-Used in #GdkDragContext to indicate what the destination
-should do with the dropped data.
+A new action is being chosen for the drag operation.
</description>
<parameters>
-<parameter name="GDK_ACTION_COPY">
-<parameter_description> Copy the data.
-</parameter_description>
-</parameter>
-<parameter name="GDK_ACTION_MOVE">
-<parameter_description> Move the data, i.e. first copy it, then delete
-it from the source using the DELETE target of the X selection protocol.
-</parameter_description>
-</parameter>
-<parameter name="GDK_ACTION_LINK">
-<parameter_description> Add a link to the data. Note that this is only
-useful if source and destination agree on what it means.
-</parameter_description>
-</parameter>
-<parameter name="GDK_ACTION_ASK">
-<parameter_description> Ask the user what to do with the data.
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
-<enum name="GdkDragCancelReason">
-<description>
-Used in #GdkDragContext to the reason of a cancelled DND operation.
-
-</description>
-<parameters>
-<parameter name="GDK_DRAG_CANCEL_NO_TARGET">
-<parameter_description> There is no suitable drop target.
-</parameter_description>
-</parameter>
-<parameter name="GDK_DRAG_CANCEL_USER_CANCELLED">
-<parameter_description> Drag cancelled by the user
-</parameter_description>
-</parameter>
-<parameter name="GDK_DRAG_CANCEL_ERROR">
-<parameter_description> Unspecified error.
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
-<signal name="GdkDragContext::action-changed">
-<description>
-A new action is being chosen for the drag and drop operation.
-
-</description>
-<parameters>
-<parameter name="context">
+<parameter name="drag">
<parameter_description> The object on which the signal is emitted
</parameter_description>
</parameter>
@@ -755,33 +706,33 @@ A new action is being chosen for the drag and drop operation.
<return></return>
</signal>
-<signal name="GdkDragContext::cancel">
+<signal name="GdkDrag::cancel">
<description>
-The drag and drop operation was cancelled.
+The drag operation was cancelled.
</description>
<parameters>
-<parameter name="context">
+<parameter name="drag">
<parameter_description> The object on which the signal is emitted
</parameter_description>
</parameter>
<parameter name="reason">
-<parameter_description> The reason the context was cancelled
+<parameter_description> The reason the drag was cancelled
</parameter_description>
</parameter>
</parameters>
<return></return>
</signal>
-<signal name="GdkDragContext::dnd-finished">
+<signal name="GdkDrag::dnd-finished">
<description>
-The drag and drop operation was finished, the drag destination
-finished reading all data. The drag source can now free all
-miscellaneous data.
+The drag operation was finished, the destination
+finished reading all data. The drag object can now
+free all miscellaneous data.
</description>
<parameters>
-<parameter name="context">
+<parameter name="drag">
<parameter_description> The object on which the signal is emitted
</parameter_description>
</parameter>
@@ -789,13 +740,13 @@ miscellaneous data.
<return></return>
</signal>
-<signal name="GdkDragContext::drop-performed">
+<signal name="GdkDrag::drop-performed">
<description>
-The drag and drop operation was performed on an accepting client.
+The drag operation was performed on an accepting client.
</description>
<parameters>
-<parameter name="context">
+<parameter name="drag">
<parameter_description> The object on which the signal is emitted
</parameter_description>
</parameter>
@@ -803,35 +754,83 @@ The drag and drop operation was performed on an accepting client.
<return></return>
</signal>
-<property name="GdkDragContext:content">
+<property name="GdkDrag:content">
<description>
-The #GdkContentProvider or %NULL if the context is not a source-side
-context.
+The #GdkContentProvider.
</description>
</property>
-<property name="GdkDragContext:device">
+<property name="GdkDrag:device">
<description>
The #GdkDevice that is performing the drag.
</description>
</property>
-<property name="GdkDragContext:display">
+<property name="GdkDrag:display">
<description>
-The #GdkDisplay that the drag context belongs to.
+The #GdkDisplay that the drag belongs to.
</description>
</property>
-<property name="GdkDragContext:formats">
+<property name="GdkDrag:formats">
<description>
-The possible formats that the context can provide its data in.
+The possible formats that the drag can provide its data in.
</description>
</property>
+<enum name="GdkDragAction">
+<description>
+Used in #GdkDrag to indicate what the destination
+should do with the dropped data.
+
+</description>
+<parameters>
+<parameter name="GDK_ACTION_COPY">
+<parameter_description> Copy the data.
+</parameter_description>
+</parameter>
+<parameter name="GDK_ACTION_MOVE">
+<parameter_description> Move the data, i.e. first copy it, then delete
+it from the source using the DELETE target of the X selection protocol.
+</parameter_description>
+</parameter>
+<parameter name="GDK_ACTION_LINK">
+<parameter_description> Add a link to the data. Note that this is only
+useful if source and destination agree on what it means.
+</parameter_description>
+</parameter>
+<parameter name="GDK_ACTION_ASK">
+<parameter_description> Ask the user what to do with the data.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
+<enum name="GdkDragCancelReason">
+<description>
+Used in #GdkDrag to the reason of a cancelled DND operation.
+
+</description>
+<parameters>
+<parameter name="GDK_DRAG_CANCEL_NO_TARGET">
+<parameter_description> There is no suitable drop target.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DRAG_CANCEL_USER_CANCELLED">
+<parameter_description> Drag cancelled by the user
+</parameter_description>
+</parameter>
+<parameter name="GDK_DRAG_CANCEL_ERROR">
+<parameter_description> Unspecified error.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
<property name="GdkDrawContext:display">
<description>
The #GdkDisplay used to create the #GdkDrawContext.
@@ -7156,21 +7155,48 @@ This function is called by the drag source.
</parameter_description>
</parameter>
</parameters>
-<return> a newly created #GdkDragContext or
+<return> a newly created #GdkDrag or
%NULL on error.
</return>
</function>
-<function name="gdk_drag_context_get_actions">
+<function name="gdk_drag_drop_done">
+<description>
+Inform GDK if the drop ended successfully. Passing %FALSE
+for @success may trigger a drag cancellation animation.
+
+This function is called by the drag source, and should
+be the last call before dropping the reference to the
+@drag.
+
+The #GdkDrag will only take the first gdk_drag_drop_done()
+call as effective, if this function is called multiple times,
+all subsequent calls will be ignored.
+
+</description>
+<parameters>
+<parameter name="drag">
+<parameter_description> a #GdkDrag
+</parameter_description>
+</parameter>
+<parameter name="success">
+<parameter_description> whether the drag was ultimatively successful
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gdk_drag_get_actions">
<description>
Determines the bitmask of actions proposed by the source if
-gdk_drag_context_get_suggested_action() returns %GDK_ACTION_ASK.
+gdk_drag_get_suggested_action() returns %GDK_ACTION_ASK.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
@@ -7178,31 +7204,31 @@ gdk_drag_context_get_suggested_action() returns %GDK_ACTION_ASK.
</return>
</function>
-<function name="gdk_drag_context_get_device">
+<function name="gdk_drag_get_device">
<description>
-Returns the #GdkDevice associated to the drag context.
+Returns the #GdkDevice associated to the GdkDrag object.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
-<return> The #GdkDevice associated to @context.
+<return> The #GdkDevice associated to @drag.
</return>
</function>
-<function name="gdk_drag_context_get_display">
+<function name="gdk_drag_get_display">
<description>
-Gets the #GdkDisplay that the drag context was created for.
+Gets the #GdkDisplay that the drag object was created for.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
@@ -7210,20 +7236,20 @@ Gets the #GdkDisplay that the drag context was created for.
</return>
</function>
-<function name="gdk_drag_context_get_drag_surface">
+<function name="gdk_drag_get_drag_surface">
<description>
Returns the surface on which the drag icon should be rendered
during the drag operation. Note that the surface may not be
available until the drag operation has begun. GDK will move
the surface in accordance with the ongoing drag operation.
-The surface is owned by @context and will be destroyed when
+The surface is owned by @drag and will be destroyed when
the drag operation is over.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
@@ -7231,15 +7257,15 @@ the drag operation is over.
</return>
</function>
-<function name="gdk_drag_context_get_formats">
+<function name="gdk_drag_get_formats">
<description>
-Retrieves the formats supported by this context.
+Retrieves the formats supported by this GdkDrag object.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
@@ -7247,15 +7273,15 @@ Retrieves the formats supported by this context.
</return>
</function>
-<function name="gdk_drag_context_get_selected_action">
+<function name="gdk_drag_get_selected_action">
<description>
Determines the action chosen by the drag destination.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
@@ -7263,15 +7289,15 @@ Determines the action chosen by the drag destination.
</return>
</function>
-<function name="gdk_drag_context_get_suggested_action">
+<function name="gdk_drag_get_suggested_action">
<description>
-Determines the suggested drag action of the context.
+Determines the suggested drag action of the GdkDrag object.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
</parameters>
@@ -7279,7 +7305,7 @@ Determines the suggested drag action of the context.
</return>
</function>
-<function name="gdk_drag_context_set_hotspot">
+<function name="gdk_drag_set_hotspot">
<description>
Sets the position of the drag surface that will be kept
under the cursor hotspot. Initially, the hotspot is at the
@@ -7287,8 +7313,8 @@ top left corner of the drag surface.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="drag">
+<parameter_description> a #GdkDrag
</parameter_description>
</parameter>
<parameter name="hot_x">
@@ -7303,33 +7329,6 @@ top left corner of the drag surface.
<return></return>
</function>
-<function name="gdk_drag_drop_done">
-<description>
-Inform GDK if the drop ended successfully. Passing %FALSE
-for @success may trigger a drag cancellation animation.
-
-This function is called by the drag source, and should
-be the last call before dropping the reference to the
-@context.
-
-The #GdkDragContext will only take the first gdk_drag_drop_done()
-call as effective, if this function is called multiple times,
-all subsequent calls will be ignored.
-
-</description>
-<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
-</parameter_description>
-</parameter>
-<parameter name="success">
-<parameter_description> whether the drag was ultimatively successful
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_draw_context_begin_frame">
<description>
Indicates that you are beginning the process of redrawing @region
diff --git a/gdk/src/gdk_docs_override.xml b/gdk/src/gdk_docs_override.xml
index 1dd7779c..e833009f 100644
--- a/gdk/src/gdk_docs_override.xml
+++ b/gdk/src/gdk_docs_override.xml
@@ -113,26 +113,6 @@ invalidate the whole region.
<return></return>
</function>
-<function name="gdk_drag_status">
- <mapping class="DragContext" />
-</function>
-
-<function name="gdk_keymap_get_for_display">
- <mapping class="Display" />
-</function>
-
-<function name="gdk_drop_finish">
- <mapping class="DragContext" />
-</function>
-
-<function name="gdk_drop_reply">
- <mapping class="DragContext" />
-</function>
-
-<function name="gdk_drag_get_selection">
- <mapping class="DragContext" />
-</function>
-
<function name="gdk_pixbuf_animation_iter_get_delay_time">
<description>
Gets the number of milliseconds the current pixbuf should be displayed,
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 3cefd194..a2352f1f 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -113,7 +113,7 @@
)
)
-;; From gdkdnd.h
+;; From gdkdrag.h
;; Original typedef:
;; typedef enum {
diff --git a/gdk/src/gdk_extra_objects.defs b/gdk/src/gdk_extra_objects.defs
index 04bc9f7e..495ee588 100644
--- a/gdk/src/gdk_extra_objects.defs
+++ b/gdk/src/gdk_extra_objects.defs
@@ -61,10 +61,10 @@
(gtype-id "GDK_TYPE_DISPLAY_MANAGER")
)
-(define-object DragContext
+(define-object Drag
(in-module "Gdk")
- (c-name "GdkDragContext")
- (gtype-id "GDK_TYPE_DRAG_CONTEXT")
+ (c-name "GdkDrag")
+ (gtype-id "GDK_TYPE_DRAG")
)
(define-object DrawContext
@@ -73,12 +73,6 @@
(gtype-id "GDK_TYPE_DRAW_CONTEXT")
)
-(define-object DrawingContext
- (in-module "Gdk")
- (c-name "GdkDrawingContext")
- (gtype-id "GDK_TYPE_DRAWING_CONTEXT")
-)
-
(define-object Drop
(in-module "Gdk")
(c-name "GdkDrop")
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 6384069d..25e241ca 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -2202,46 +2202,46 @@
-;; From gdkdnd.h
+;; From gdkdrag.h
-(define-function gdk_drag_context_get_type
- (c-name "gdk_drag_context_get_type")
+(define-function gdk_drag_get_type
+ (c-name "gdk_drag_get_type")
(return-type "GType")
)
(define-method get_display
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_display")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_display")
(return-type "GdkDisplay*")
)
(define-method get_device
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_device")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_device")
(return-type "GdkDevice*")
)
(define-method get_formats
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_formats")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_formats")
(return-type "GdkContentFormats*")
)
(define-method get_actions
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_actions")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_actions")
(return-type "GdkDragAction")
)
(define-method get_suggested_action
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_suggested_action")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_suggested_action")
(return-type "GdkDragAction")
)
(define-method get_selected_action
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_selected_action")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_selected_action")
(return-type "GdkDragAction")
)
@@ -2256,7 +2256,7 @@
(define-function gdk_drag_begin
(c-name "gdk_drag_begin")
- (return-type "GdkDragContext*")
+ (return-type "GdkDrag*")
(parameters
'("GdkSurface*" "surface")
'("GdkDevice*" "device")
@@ -2267,24 +2267,24 @@
)
)
-(define-function gdk_drag_drop_done
+(define-method drop_done
+ (of-object "GdkDrag")
(c-name "gdk_drag_drop_done")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
'("gboolean" "success")
)
)
(define-method get_drag_surface
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_get_drag_surface")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_get_drag_surface")
(return-type "GdkSurface*")
)
(define-method set_hotspot
- (of-object "GdkDragContext")
- (c-name "gdk_drag_context_set_hotspot")
+ (of-object "GdkDrag")
+ (c-name "gdk_drag_set_hotspot")
(return-type "none")
(parameters
'("gint" "hot_x")
@@ -2377,7 +2377,7 @@
(define-method get_drag
(of-object "GdkDrop")
(c-name "gdk_drop_get_drag")
- (return-type "GdkDragContext*")
+ (return-type "GdkDrag*")
)
(define-method status
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index 44cd6465..aeec4ab8 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -80,74 +80,6 @@
(construct-only #f)
)
-;; From GdkDragContext
-
-(define-signal cancel
- (of-object "GdkDragContext")
- (return-type "void")
- (flags "Run Last")
- (parameters
- '("GdkDragCancelReason" "p0")
- )
-)
-
-(define-signal drop-performed
- (of-object "GdkDragContext")
- (return-type "void")
- (flags "Run Last")
-)
-
-(define-signal dnd-finished
- (of-object "GdkDragContext")
- (return-type "void")
- (flags "Run Last")
-)
-
-(define-signal action-changed
- (of-object "GdkDragContext")
- (return-type "void")
- (flags "Run Last")
- (parameters
- '("GdkDragAction" "p0")
- )
-)
-
-(define-property content
- (of-object "GdkDragContext")
- (prop-type "GParamObject")
- (docs "The content being dragged")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
-(define-property device
- (of-object "GdkDragContext")
- (prop-type "GParamObject")
- (docs "The device performing the drag")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
-(define-property display
- (of-object "GdkDragContext")
- (prop-type "GParamObject")
- (docs "Display this drag belongs to")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property formats
- (of-object "GdkDragContext")
- (prop-type "GParamBoxed")
- (docs "The possible formats for data")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
;; From GdkCursor
(define-property fallback
@@ -495,6 +427,74 @@
(construct-only #f)
)
+;; From GdkDrag
+
+(define-signal cancel
+ (of-object "GdkDrag")
+ (return-type "void")
+ (flags "Run Last")
+ (parameters
+ '("GdkDragCancelReason" "p0")
+ )
+)
+
+(define-signal drop-performed
+ (of-object "GdkDrag")
+ (return-type "void")
+ (flags "Run Last")
+)
+
+(define-signal dnd-finished
+ (of-object "GdkDrag")
+ (return-type "void")
+ (flags "Run Last")
+)
+
+(define-signal action-changed
+ (of-object "GdkDrag")
+ (return-type "void")
+ (flags "Run Last")
+ (parameters
+ '("GdkDragAction" "p0")
+ )
+)
+
+(define-property content
+ (of-object "GdkDrag")
+ (prop-type "GParamObject")
+ (docs "The content being dragged")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property device
+ (of-object "GdkDrag")
+ (prop-type "GParamObject")
+ (docs "The device performing the drag")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property display
+ (of-object "GdkDrag")
+ (prop-type "GParamObject")
+ (docs "Display this drag belongs to")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property formats
+ (of-object "GdkDrag")
+ (prop-type "GParamBoxed")
+ (docs "The possible formats for data")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
;; From GdkDrawContext
(define-property display
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index f0d05df2..e840e51e 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -4051,6 +4051,60 @@ The widget receiving the #GdkEvents that the controller will handle.
</description>
</property>
+<signal name="GtkEventControllerKey::key-pressed">
+<description>
+This signal is emitted whenever a key is pressed.
+
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> the object which received the signal.
+</parameter_description>
+</parameter>
+<parameter name="keyval">
+<parameter_description> the pressed key.
+</parameter_description>
+</parameter>
+<parameter name="keycode">
+<parameter_description> the raw code of the pressed key.
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> the bitmask, representing the state of modifier keys and pointer buttons. See
#GdkModifierType.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the key press was handled, %FALSE otherwise.
+</return>
+</signal>
+
+<signal name="GtkEventControllerKey::key-released">
+<description>
+This signal is emitted whenever a key is released.
+
+</description>
+<parameters>
+<parameter name="controller">
+<parameter_description> the object which received the signal.
+</parameter_description>
+</parameter>
+<parameter name="keyval">
+<parameter_description> the released key.
+</parameter_description>
+</parameter>
+<parameter name="keycode">
+<parameter_description> the raw code of the released key.
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> the bitmask, representing the state of modifier keys and pointer buttons. See
#GdkModifierType.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
<signal name="GtkEventControllerMotion::enter">
<description>
Signals that the pointer has entered the widget.
@@ -8082,6 +8136,15 @@ The label for the button.
</description>
</property>
+<property name="GtkModelButton:use-markup">
+<description>
+If %TRUE, XML tags in the text of the button are interpreted as by
+pango_parse_markup() to format the enclosed spans of text. If %FALSE, the
+text will be displayed verbatim.
+
+</description>
+</property>
+
<enum name="GtkMovementStep">
<description>
@@ -10504,7 +10567,7 @@ the scrolled window adjustments in a given orientation.
<signal name="GtkScrolledWindow::edge-overshot">
<description>
The ::edge-overshot signal is emitted whenever user initiated scrolling
-makes the scrolledwindow firmly surpass (ie. with some edge resistance)
+makes the scrolled window firmly surpass (i.e. with some edge resistance)
the lower or upper limits defined by the adjustment in that orientation.
A similar behavior without edge resistance is provided by the
@@ -10530,7 +10593,7 @@ if intending to provide behavior on horizontal edges.
<signal name="GtkScrolledWindow::edge-reached">
<description>
The ::edge-reached signal is emitted whenever user-initiated scrolling
-makes the scrolledwindow exactly reaches the lower or upper limits
+makes the scrolled window exactly reach the lower or upper limits
defined by the adjustment in that orientation.
A similar behavior with edge resistance is provided by the
@@ -10559,9 +10622,9 @@ The ::move-focus-out signal is a
[keybinding signal][GtkBindingSignal] which gets
emitted when focus is moved away from the scrolled window by a
keybinding. The #GtkWidget::move-focus signal is emitted with
-@direction_type on this scrolled windows toplevel parent in the
+@direction_type on this scrolled window’s toplevel parent in the
container hierarchy. The default bindings for this signal are
-`Tab + Ctrl` and `Tab + Ctrl + Shift`.
+`Ctrl + Tab` to move forward and `Ctrl + Shift + Tab` to move backward.
</description>
<parameters>
@@ -10584,7 +10647,7 @@ The ::scroll-child signal is a
[keybinding signal][GtkBindingSignal]
which gets emitted when a keybinding that scrolls is pressed.
The horizontal or vertical adjustment is updated which triggers a
-signal that the scrolled windows child may listen to and scroll itself.
+signal that the scrolled window’s child may listen to and scroll itself.
</description>
<parameters>
@@ -10654,7 +10717,7 @@ as narrow indicators.
<property name="GtkScrolledWindow:propagate-natural-height">
<description>
Whether the natural height of the child should be calculated and propagated
-through the scrolled windows requested natural height.
+through the scrolled window’s requested natural height.
This is useful in cases where an attempt should be made to allocate exactly
enough space for the natural size of the child.
@@ -10665,7 +10728,7 @@ enough space for the natural size of the child.
<property name="GtkScrolledWindow:propagate-natural-width">
<description>
Whether the natural width of the child should be calculated and propagated
-through the scrolled windows requested natural width.
+through the scrolled window’s requested natural width.
This is useful in cases where an attempt should be made to allocate exactly
enough space for the natural size of the child.
@@ -14274,7 +14337,7 @@ override what the default handler did.
</parameter_description>
</parameter>
<parameter name="context">
-<parameter_description> the drag context
+<parameter_description> the drag context
</parameter_description>
</parameter>
</parameters>
@@ -28562,8 +28625,8 @@ If a drag is cancelled in this way, the @result argument of
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext, as e.g. returned by gtk_drag_begin_with_coordinates()
+<parameter name="drag">
+<parameter_description> a drag context, as e.g. returned by gtk_drag_begin_with_coordinates()
</parameter_description>
</parameter>
</parameters>
@@ -28751,7 +28814,7 @@ the action to use depending on whether the control key is pressed or not:
|[<!-- language="C" -->
static void
drag_motion (GtkWidget *widget,
-GdkDragContext *context,
+GdkDrag *drag,
gint x,
gint y,
guint time)
@@ -28887,8 +28950,8 @@ Determines the source widget for a drag.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a (destination side) drag context
+<parameter name="drag">
+<parameter_description> a drag context
</parameter_description>
</parameter>
</parameters>
@@ -28921,9 +28984,8 @@ icon.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> the context for a drag (This must be called
-with a context for the source side of a drag)
+<parameter name="drag">
+<parameter_description> the context for a drag
</parameter_description>
</parameter>
</parameters>
@@ -28938,9 +29000,8 @@ for more details about using icons in drag and drop.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> the context for a drag (This must be called
-with a context for the source side of a drag)
+<parameter name="drag">
+<parameter_description> the context for a drag
</parameter_description>
</parameter>
<parameter name="icon">
@@ -28969,9 +29030,8 @@ loaded at the symbolic size #GTK_ICON_SIZE_DND), thus
</description>
<parameters>
-<parameter name="context">
-<parameter_description> the context for a drag (This must be called
-with a context for the source side of a drag)
+<parameter name="drag">
+<parameter_description> the context for a drag
</parameter_description>
</parameter>
<parameter name="icon_name">
@@ -29002,9 +29062,8 @@ mouse cursor.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> the context for a drag (This must be called
-with a context for the source side of a drag)
+<parameter name="drag">
+<parameter_description> the context for a drag
</parameter_description>
</parameter>
<parameter name="paintable">
@@ -29032,9 +29091,8 @@ signal and destroy it yourself.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> the context for a drag. (This must be called
- with a context for the source side of a drag)
+<parameter name="drag">
+<parameter_description> the context for a drag
</parameter_description>
</parameter>
<parameter name="widget">
@@ -49420,7 +49478,7 @@ will initiate a drag cancel animation.
|[<!-- language="C" -->
static void
on_drag_data_received (GtkWidget *widget,
-GdkDragContext *context,
+GdkDrag *drag,
GtkSelectionData *data,
guint time,
gpointer user_data)
@@ -49428,7 +49486,7 @@ gpointer user_data)
GtkWidget *notebook;
GtkWidget **child;
-notebook = gtk_drag_get_source_widget (context);
+notebook = gtk_drag_get_source_widget (drag);
child = (void*) gtk_selection_data_get_data (data);
// process_widget (*child);
@@ -59969,7 +60027,7 @@ for the vertical scrollbar, or %NULL
<function name="gtk_scrolled_window_get_propagate_natural_height">
<description>
Reports whether the natural height of the child will be calculated and propagated
-through the scrolled windows requested natural height.
+through the scrolled window’s requested natural height.
</description>
@@ -59986,7 +60044,7 @@ through the scrolled windows requested natural height.
<function name="gtk_scrolled_window_get_propagate_natural_width">
<description>
Reports whether the natural width of the child will be calculated and propagated
-through the scrolled windows requested natural width.
+through the scrolled window’s requested natural width.
</description>
@@ -60310,7 +60368,7 @@ than the trough — the display is larger than the page size).
<function name="gtk_scrolled_window_set_propagate_natural_height">
<description>
Sets whether the natural height of the child should be calculated and propagated
-through the scrolled windows requested natural height.
+through the scrolled window’s requested natural height.
</description>
<parameters>
@@ -60329,7 +60387,7 @@ through the scrolled windows requested natural height.
<function name="gtk_scrolled_window_set_propagate_natural_width">
<description>
Sets whether the natural width of the child should be calculated and propagated
-through the scrolled windows requested natural width.
+through the scrolled window’s requested natural width.
</description>
<parameters>
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index d5f41d6c..fcb66cb4 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -8052,7 +8052,7 @@
(c-name "gtk_drag_get_source_widget")
(return-type "GtkWidget*")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
)
)
@@ -8074,7 +8074,7 @@
(define-function gtk_drag_begin_with_coordinates
(c-name "gtk_drag_begin_with_coordinates")
- (return-type "GdkDragContext*")
+ (return-type "GdkDrag*")
(parameters
'("GtkWidget*" "widget")
'("GdkDevice*" "device")
@@ -8089,7 +8089,7 @@
(c-name "gtk_drag_cancel")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
)
)
@@ -8097,7 +8097,7 @@
(c-name "gtk_drag_set_icon_widget")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
'("GtkWidget*" "widget")
'("gint" "hot_x")
'("gint" "hot_y")
@@ -8108,7 +8108,7 @@
(c-name "gtk_drag_set_icon_paintable")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
'("GdkPaintable*" "paintable")
'("int" "hot_x")
'("int" "hot_y")
@@ -8119,7 +8119,7 @@
(c-name "gtk_drag_set_icon_name")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
'("const-gchar*" "icon_name")
'("gint" "hot_x")
'("gint" "hot_y")
@@ -8130,7 +8130,7 @@
(c-name "gtk_drag_set_icon_gicon")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
'("GIcon*" "icon")
'("gint" "hot_x")
'("gint" "hot_y")
@@ -8141,7 +8141,7 @@
(c-name "gtk_drag_set_icon_default")
(return-type "none")
(parameters
- '("GdkDragContext*" "context")
+ '("GdkDrag*" "drag")
)
)
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index e2df0aa3..907430ed 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -6090,6 +6090,16 @@
(default-value "")
)
+(define-property use-markup
+ (of-object "GtkModelButton")
+ (prop-type "GParamBoolean")
+ (docs "The text of the button includes XML markup. See pango_parse_markup()")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+ (default-value "FALSE")
+)
+
(define-property active
(of-object "GtkModelButton")
(prop-type "GParamBoolean")
@@ -11246,7 +11256,7 @@
(return-type "void")
(flags "Run Last")
(parameters
- '("GdkDragContext*" "p0")
+ '("GdkDrag*" "p0")
)
)
@@ -11255,7 +11265,7 @@
(return-type "void")
(flags "Run Last")
(parameters
- '("GdkDragContext*" "p0")
+ '("GdkDrag*" "p0")
)
)
@@ -11264,7 +11274,7 @@
(return-type "void")
(flags "Run Last")
(parameters
- '("GdkDragContext*" "p0")
+ '("GdkDrag*" "p0")
)
)
@@ -11273,7 +11283,7 @@
(return-type "gboolean")
(flags "Run Last")
(parameters
- '("GdkDragContext*" "p0")
+ '("GdkDrag*" "p0")
'("GtkDragResult" "p1")
)
)
@@ -11305,7 +11315,7 @@
(return-type "void")
(flags "Run Last")
(parameters
- '("GdkDragContext*" "p0")
+ '("GdkDrag*" "p0")
'("GtkSelectionData*" "p1")
)
)
diff --git a/tools/extra_defs_gen/generate_defs_gdk.cc b/tools/extra_defs_gen/generate_defs_gdk.cc
index c512204e..98a5d6bc 100644
--- a/tools/extra_defs_gen/generate_defs_gdk.cc
+++ b/tools/extra_defs_gen/generate_defs_gdk.cc
@@ -38,7 +38,6 @@ int main(int /* argc */, char** /* argv */)
std::cout << get_defs( GDK_TYPE_APP_LAUNCH_CONTEXT )
<< get_defs( GDK_TYPE_CLIPBOARD )
<< get_defs( GDK_TYPE_CONTENT_PROVIDER )
- << get_defs( GDK_TYPE_DRAG_CONTEXT )
<< get_defs( GDK_TYPE_CURSOR )
<< get_defs( GDK_TYPE_DEVICE )
<< get_defs( GDK_TYPE_DEVICE_TOOL )
@@ -46,6 +45,7 @@ int main(int /* argc */, char** /* argv */)
#if !defined(G_OS_WIN32)
<< get_defs( GDK_TYPE_DISPLAY_MANAGER )
#endif /* G_OS_WIN32 */
+ << get_defs( GDK_TYPE_DRAG )
<< get_defs( GDK_TYPE_DRAW_CONTEXT )
<< get_defs( GDK_TYPE_DROP )
<< get_defs( GDK_TYPE_EVENT )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
