[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: Mon, 30 Apr 2018 08:45:03 +0000 (UTC)
commit d9768609a572b667fc93b66151409fa59f1bbbd5
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Mon Apr 30 10:40:56 2018 +0200
Gdk, Gtk: Regenerate docs.xml and .defs files
and update tools/extra_defs_gen/generate_defs_gdk.cc.
gdk/src/gdk_docs.xml | 378 ++++++++++++++++-------------
gdk/src/gdk_methods.defs | 84 +++----
gdk/src/gdk_signals.defs | 42 +---
gtk/src/gtk_docs.xml | 231 +++++++-----------
gtk/src/gtk_methods.defs | 138 +++++------
gtk/src/gtk_signals.defs | 10 +
tools/extra_defs_gen/generate_defs_gdk.cc | 1 -
7 files changed, 412 insertions(+), 472 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index ff546e9..0e0fd08 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -861,27 +861,6 @@ The #GdkSurface the gl context is bound to.
</description>
</property>
-<property name="GdkDrawingContext:clip">
-<description>
-The clip region applied to the drawing context.
-
-</description>
-</property>
-
-<property name="GdkDrawingContext:paint-context">
-<description>
-The #GdkDrawContext used to draw or %NULL if Cairo is used.
-
-</description>
-</property>
-
-<property name="GdkDrawingContext:surface">
-<description>
-The #GdkSurface that created the drawing context.
-
-</description>
-</property>
-
<enum name="GdkEventMask">
<description>
A set of bit-flags to indicate which events a surface is to receive.
@@ -1675,6 +1654,64 @@ See gdk_keymap_get_caps_lock_state().
<return></return>
</signal>
+<enum name="GdkMemoryFormat">
+<description>
+#GdkMemoryFormat describes a format that bytes can have in memory.
+
+It describes formats by listing the contents of the memory passed to it.
+So GDK_MEMORY_A8R8G8B8 will be 1 byte (8 bits) of alpha, followed by a
+byte each of red, green and blue. It is not endian-dependent, so
+CAIRO_FORMAT_ARGB32 is represented by different #GdkMemoryFormats on
+architectures with different endiannesses.
+
+Its naming is modelled after VkFormat (see
+https://www.khronos.org/registry/vulkan/specs/1.0/html/vkspec.html#VkFormat
+for details).
+
+</description>
+<parameters>
+<parameter name="GDK_MEMORY_B8G8R8A8_PREMULTIPLIED">
+<parameter_description> 4 bytes; for blue, green, red, alpha.
+The color values are premultiplied with the alpha value.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_A8R8G8B8_PREMULTIPLIED">
+<parameter_description> 4 bytes; for alpha, red, green, blue.
+The color values are premultiplied with the alpha value.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_B8G8R8A8">
+<parameter_description> 4 bytes; for blue, green, red, alpha.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_A8R8G8B8">
+<parameter_description> 4 bytes; for alpha, red, green, blue.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_R8G8B8A8">
+<parameter_description> 4 bytes; for red, green, blue, alpha.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_A8B8G8R8">
+<parameter_description> 4 bytes; for alpha, blue, green, red.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_R8G8B8">
+<parameter_description> 3 bytes; for red, green, blue. The data is opaque.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_B8G8R8">
+<parameter_description> 3 bytes; for blue, green, red. The data is opaque.
+</parameter_description>
+</parameter>
+<parameter name="GDK_MEMORY_N_FORMATS">
+<parameter_description> The number of formats. This value will change as
+more formats get added, so do not rely on its concrete integer.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
<enum name="GdkModifierIntent">
<description>
This enum is used with gdk_keymap_get_modifier_mask()
@@ -3180,6 +3217,29 @@ prevention'.
<return></return>
</function>
+<function name="gdk_cairo_context_cairo_create">
+<description>
+Retrieves a Cairo context to be used to draw on the #GdkSurface
+of @context. A call to gdk_draw_context_begin_frame() with this
+@context must have been done or this function will return %NULL.
+
+The returned context is guaranteed to be valid until
+gdk_draw_context_end_frame() is called.
+
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkCairoContext that is currently drawing
+</parameter_description>
+</parameter>
+</parameters>
+<return> a Cairo context to be used
+to draw the contents of the #GdkSurface. %NULL is returned
+when @contet is not drawing.
+</return>
+</function>
+
<function name="gdk_cairo_draw_from_gl">
<description>
This is the main way to draw GL content in GTK+. It takes a render buffer ID
@@ -7215,25 +7275,6 @@ Determines the suggested drag action of the context.
</return>
</function>
-<function name="gdk_drag_context_set_device">
-<description>
-Associates a #GdkDevice to @context, so all Drag and Drop events
-for @context are emitted as if they came from this device.
-
-</description>
-<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
-</parameter_description>
-</parameter>
-<parameter name="device">
-<parameter_description> a #GdkDevice
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_drag_context_set_hotspot">
<description>
Sets the position of the drag surface that will be kept
@@ -7330,10 +7371,55 @@ or 0 to indicate that a drop will not be accepted
<return></return>
</function>
-<function name="gdk_draw_context_get_display">
+<function name="gdk_draw_context_begin_frame">
<description>
-Retrieves the #GdkDisplay the @context is created for
+Indicates that you are beginning the process of redrawing @region
+on the @context's surface.
+
+Calling this function begins a drawing operation using @context on the
+surface that @context was created from. The actual requirements and
+guarantees for the drawing operation vary for different implementations
+of drawing, so a #GdkCairoContext and a #GdkGLContext need to be treated
+differently.
+
+A call to this function is a requirement for drawing and must be followed
+by a call to gdk_draw_context_end_frame(), which will complete the
+drawing operation and ensure the contents become visible on screen.
+Note that the @region passed to this function is the minimum region that
+needs to be drawn and depending on implementation, windowing system and
+hardware in use, it might be necessary to draw a larger region. Drawing
+implementation must use gdk_draw_context_get_frame_region() to query the
+region that must be drawn.
+
+When using GTK+, the widget system automatically places calls to
+gdk_draw_context_begin_frame() and gdk_draw_context_end_frame() via the
+use of #GskRenderers, so application code does not need to call these
+functions explicitly.
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> the context used to draw the frame
+</parameter_description>
+</parameter>
+<parameter name="region">
+<parameter_description> minimum region that should be drawn
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gdk_draw_context_end_frame">
+<description>
+Ends a drawing operation started with gdk_draw_context_begin_frame()
+and makes the drawing available on screen. See that function for more
+details about drawing.
+
+When using a #GdkGLContext, this function may call `glFlush()`
+implicitly before returning; it is not recommended to call `glFlush()`
+explicitly before calling this function.
</description>
<parameters>
@@ -7342,13 +7428,12 @@ Retrieves the #GdkDisplay the @context is created for
</parameter_description>
</parameter>
</parameters>
-<return> a #GdkDisplay or %NULL
-</return>
+<return></return>
</function>
-<function name="gdk_draw_context_get_surface">
+<function name="gdk_draw_context_get_display">
<description>
-Retrieves the #GdkSurface used by the @context.
+Retrieves the #GdkDisplay the @context is created for
</description>
@@ -7358,66 +7443,67 @@ Retrieves the #GdkSurface used by the @context.
</parameter_description>
</parameter>
</parameters>
-<return> a #GdkSurface or %NULL
+<return> a #GdkDisplay or %NULL
</return>
</function>
-<function name="gdk_drawing_context_get_cairo_context">
+<function name="gdk_draw_context_get_frame_region">
<description>
-Retrieves a Cairo context to be used to draw on the #GdkSurface
-that created the #GdkDrawingContext. The @context must have been
-created without a #GdkDrawContext for this function to work. If
-gdk_drawing_context_get_paint_context() does not return %NULL,
-then this function will.
+Retrieves the region that is currently in the process of being repainted.
+
+After a call to gdk_draw_context_begin_frame() this function will return
+a union of the region passed to that function and the area of the surface
+that the @context determined needs to be repainted.
-The returned context is guaranteed to be valid as long as the
-#GdkDrawingContext is valid, that is between a call to
-gdk_surface_begin_draw_frame() and gdk_surface_end_draw_frame().
+If @context is not inbetween calls to gdk_draw_context_begin_frame() and
+gdk_draw_context_end_frame(), %NULL will be returned.
</description>
<parameters>
<parameter name="context">
-<parameter_description> a #GdkDrawingContext created with a %NULL paint context
+<parameter_description> a #GdkDrawContext
</parameter_description>
</parameter>
</parameters>
-<return> a Cairo context to be used to draw
-the contents of the #GdkSurface. The context is owned by the
-#GdkDrawingContext and should not be destroyed. %NULL is
-returned when a paint context is in used.
+<return> a Cairo region or %NULL if not drawing
+a frame.
</return>
</function>
-<function name="gdk_drawing_context_get_clip">
+<function name="gdk_draw_context_get_surface">
<description>
-Retrieves a copy of the clip region used when creating the @context.
+Retrieves the #GdkSurface used by the @context.
</description>
<parameters>
<parameter name="context">
-<parameter_description> a #GdkDrawingContext
+<parameter_description> a #GdkDrawContext
</parameter_description>
</parameter>
</parameters>
-<return> a Cairo region
+<return> a #GdkSurface or %NULL
</return>
</function>
-<function name="gdk_drawing_context_get_paint_context">
+<function name="gdk_draw_context_is_in_frame">
<description>
-Retrieves the paint context used to draw with.
+Returns %TRUE if @context is in the process of drawing to its surface
+after a call to gdk_draw_context_begin_frame() and not yet having called
+gdk_draw_context_end_frame().
+In this situation, drawing commands may be effecting the contents of a
+@context's surface.
</description>
<parameters>
<parameter name="context">
-<parameter_description> a #GdkDrawingContext
+<parameter_description> a #GdkDrawContext
</parameter_description>
</parameter>
</parameters>
-<return> a #GdkDrawContext or %NULL
+<return> %TRUE if the context is between begin_frame() and end_frame() calls.
</return>
</function>
@@ -9045,24 +9131,6 @@ Retrieves the current #GdkGLContext.
</return>
</function>
-<function name="gdk_gl_context_get_damage">
-<description>
-Returns the part of the backbuffer that is known to be damaged and would
-need to be redrawn. This is the area that needs to be respected in addition
-to areas invalidated by GTK or the windowing system itself.
-
-
-</description>
-<parameters>
-<parameter name="context">
-<parameter_description> a #GdkGLContext
-</parameter_description>
-</parameter>
-</parameters>
-<return> The damage to the backbuffer
-</return>
-</function>
-
<function name="gdk_gl_context_get_debug_enabled">
<description>
Retrieves the value set using gdk_gl_context_set_debug_enabled().
@@ -10005,6 +10073,40 @@ in upper case or it is not subject to case conversion.
</return>
</function>
+<function name="gdk_memory_texture_new">
+<description>
+Creates a new texture for a blob of image data.
+The #GBytes must contain @stride x @height pixels
+in the given format.
+
+
+</description>
+<parameters>
+<parameter name="width">
+<parameter_description> the width of the texture
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> the height of the texture
+</parameter_description>
+</parameter>
+<parameter name="format">
+<parameter_description> the format of the data
+</parameter_description>
+</parameter>
+<parameter name="bytes">
+<parameter_description> the #GBytes containing the pixel data
+</parameter_description>
+</parameter>
+<parameter name="stride">
+<parameter_description> rowstride for the data
+</parameter_description>
+</parameter>
+</parameters>
+<return> A newly-created #GdkTexture
+</return>
+</function>
+
<function name="gdk_monitor_get_display">
<description>
Gets the display that this monitor belongs to.
@@ -15053,58 +15155,6 @@ the display just as gdk_display_beep().
<return></return>
</function>
-<function name="gdk_surface_begin_draw_frame">
-<description>
-Indicates that you are beginning the process of redrawing @region
-on @surface, and provides you with a #GdkDrawingContext.
-
-If @surface is a top level #GdkSurface, backed by a native surface
-implementation, a backing store (offscreen buffer) large enough to
-contain @region will be created. The backing store will be initialized
-with the background color or background surface for @surface. Then, all
-drawing operations performed on @surface will be diverted to the
-backing store. When you call gdk_surface_end_frame(), the contents of
-the backing store will be copied to @surface, making it visible
-on screen. Only the part of @surface contained in @region will be
-modified; that is, drawing operations are clipped to @region.
-
-The net result of all this is to remove flicker, because the user
-sees the finished product appear all at once when you call
-gdk_surface_end_draw_frame(). If you draw to @surface directly without
-calling gdk_surface_begin_draw_frame(), the user may see flicker
-as individual drawing operations are performed in sequence.
-
-When using GTK+, the widget system automatically places calls to
-gdk_surface_begin_draw_frame() and gdk_surface_end_draw_frame() around
-emissions of the `GtkWidget::draw` signal. That is, if you’re
-drawing the contents of the widget yourself, you can assume that the
-widget has a cleared background, is already set as the clip region,
-and already has a backing store. Therefore in most cases, application
-code in GTK does not need to call gdk_surface_begin_draw_frame()
-explicitly.
-
-
-</description>
-<parameters>
-<parameter name="surface">
-<parameter_description> a #GdkSurface
-</parameter_description>
-</parameter>
-<parameter name="context">
-<parameter_description> the context used to draw the frame
-</parameter_description>
-</parameter>
-<parameter name="region">
-<parameter_description> a Cairo region
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GdkDrawingContext context that should be
-used to draw the contents of the surface; the returned context is owned
-by GDK.
-</return>
-</function>
-
<function name="gdk_surface_begin_move_drag">
<description>
Begins a surface move operation (for a toplevel surface).
@@ -15365,6 +15415,22 @@ in parent’s coordinate system, or %NULL
<return></return>
</function>
+<function name="gdk_surface_create_cairo_context">
+<description>
+Creates a new #GdkCairoContext for rendering on @surface.
+
+
+</description>
+<parameters>
+<parameter name="surface">
+<parameter_description> a #GdkSurface
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly created #GdkCairoContext
+</return>
+</function>
+
<function name="gdk_surface_create_gl_context">
<description>
Creates a new #GdkGLContext matching the
@@ -15497,30 +15563,6 @@ reaches zero. You must call this function yourself before that happens.
<return></return>
</function>
-<function name="gdk_surface_end_draw_frame">
-<description>
-Indicates that the drawing of the contents of @surface started with
-gdk_surface_begin_frame() has been completed.
-
-This function will take care of destroying the #GdkDrawingContext.
-
-It is an error to call this function without a matching
-gdk_surface_begin_frame() first.
-
-</description>
-<parameters>
-<parameter name="surface">
-<parameter_description> a #GdkSurface
-</parameter_description>
-</parameter>
-<parameter name="context">
-<parameter_description> the #GdkDrawingContext created by gdk_surface_begin_draw_frame()
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_surface_focus">
<description>
Sets keyboard focus to @surface. In most cases, gtk_window_present()
@@ -18250,9 +18292,8 @@ Gets the Vulkan device that this context is using.
<description>
Gets the index of the image that is currently being drawn.
-This function can only be used between gdk_surface_begin_draw_frame() and
-gdk_surface_end_draw_frame() calls for the toplevel surface that the
-@context is associated with.
+This function can only be used between gdk_cairo_context_begin_frame() and
+gdk_draw_context_end_frame() calls.
</description>
@@ -18271,9 +18312,8 @@ gdk_surface_end_draw_frame() calls for the toplevel surface that the
Gets the Vulkan semaphore that protects access to the image that is
currently being drawn.
-This function can only be used between gdk_surface_begin_draw_frame() and
-gdk_surface_end_draw_frame() calls for the toplevel surface that the
-@context is associated with.
+This function can only be used between gdk_cairo_context_begin_frame() and
+gdk_draw_context_end_frame() calls.
</description>
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 702d2a0..bad3545 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -672,6 +672,21 @@
+;; From gdkcairocontext.h
+
+(define-function gdk_cairo_context_get_type
+ (c-name "gdk_cairo_context_get_type")
+ (return-type "GType")
+)
+
+(define-method cairo_create
+ (of-object "GdkCairoContext")
+ (c-name "gdk_cairo_context_cairo_create")
+ (return-type "cairo_t*")
+)
+
+
+
;; From gdkcairo.h
(define-function gdk_cairo_get_clip_rectangle
@@ -2360,31 +2375,31 @@
(return-type "GdkSurface*")
)
-
-
-;; From gdkdrawingcontext.h
-
-(define-function gdk_drawing_context_get_type
- (c-name "gdk_drawing_context_get_type")
- (return-type "GType")
+(define-method begin_frame
+ (of-object "GdkDrawContext")
+ (c-name "gdk_draw_context_begin_frame")
+ (return-type "none")
+ (parameters
+ '("const-cairo_region_t*" "region")
+ )
)
-(define-method get_paint_context
- (of-object "GdkDrawingContext")
- (c-name "gdk_drawing_context_get_paint_context")
- (return-type "GdkDrawContext*")
+(define-method end_frame
+ (of-object "GdkDrawContext")
+ (c-name "gdk_draw_context_end_frame")
+ (return-type "none")
)
-(define-method get_clip
- (of-object "GdkDrawingContext")
- (c-name "gdk_drawing_context_get_clip")
- (return-type "cairo_region_t*")
+(define-method is_in_frame
+ (of-object "GdkDrawContext")
+ (c-name "gdk_draw_context_is_in_frame")
+ (return-type "gboolean")
)
-(define-method get_cairo_context
- (of-object "GdkDrawingContext")
- (c-name "gdk_drawing_context_get_cairo_context")
- (return-type "cairo_t*")
+(define-method get_frame_region
+ (of-object "GdkDrawContext")
+ (c-name "gdk_draw_context_get_frame_region")
+ (return-type "const-cairo_region_t*")
)
@@ -3143,12 +3158,6 @@
)
)
-(define-method get_damage
- (of-object "GdkGLContext")
- (c-name "gdk_gl_context_get_damage")
- (return-type "cairo_region_t*")
-)
-
(define-method make_current
(of-object "GdkGLContext")
(c-name "gdk_gl_context_make_current")
@@ -4172,25 +4181,6 @@
)
)
-(define-method begin_draw_frame
- (of-object "GdkSurface")
- (c-name "gdk_surface_begin_draw_frame")
- (return-type "GdkDrawingContext*")
- (parameters
- '("GdkDrawContext*" "context")
- '("const-cairo_region_t*" "region")
- )
-)
-
-(define-method end_draw_frame
- (of-object "GdkSurface")
- (c-name "gdk_surface_end_draw_frame")
- (return-type "none")
- (parameters
- '("GdkDrawingContext*" "context")
- )
-)
-
(define-method set_title
(of-object "GdkSurface")
(c-name "gdk_surface_set_title")
@@ -4800,6 +4790,12 @@
)
)
+(define-method create_cairo_context
+ (of-object "GdkSurface")
+ (c-name "gdk_surface_create_cairo_context")
+ (return-type "GdkCairoContext*")
+)
+
(define-method create_gl_context
(of-object "GdkSurface")
(c-name "gdk_surface_create_gl_context")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index a2cd89c..ad73d85 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -124,15 +124,24 @@
(construct-only #t)
)
-(define-property display
+(define-property device
(of-object "GdkDragContext")
(prop-type "GParamObject")
- (docs "Display owning this clipboard")
+ (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")
@@ -509,35 +518,6 @@
(construct-only #t)
)
-;; From GdkDrawingContext
-
-(define-property surface
- (of-object "GdkDrawingContext")
- (prop-type "GParamObject")
- (docs "The surface that created the context")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
-(define-property clip
- (of-object "GdkDrawingContext")
- (prop-type "GParamBoxed")
- (docs "The clip region of the context")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
-(define-property paint-context
- (of-object "GdkDrawingContext")
- (prop-type "GParamObject")
- (docs "The context used to draw")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
;; From GdkEvent
(define-property event-type
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index e550d78..95b82b3 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -1633,7 +1633,9 @@ value from the @cell_editable.
Implementations of #GtkCellEditable are responsible for
emitting this signal when they are done editing, e.g.
-#GtkEntry is emitting it when the user presses Enter.
+#GtkEntry emits this signal when the user presses Enter. Typical things to
+do in a handler for ::editing-done are to capture the edited value,
+disconnect the @cell_editable from signals on the #GtkCellRenderer, etc.
gtk_cell_editable_editing_done() is a convenience method
for emitting #GtkCellEditable::editing-done.
@@ -1651,7 +1653,8 @@ for emitting #GtkCellEditable::editing-done.
<signal name="GtkCellEditable::remove-widget">
<description>
This signal is meant to indicate that the cell is finished
-editing, and the widget may now be destroyed.
+editing, and the @cell_editable widget is being removed and may
+subsequently be destroyed.
Implementations of #GtkCellEditable are responsible for
emitting this signal when they are done editing. It must
@@ -1704,6 +1707,9 @@ The intended use of this signal is to do special setup
on @editable, e.g. adding a #GtkEntryCompletion or setting
up additional columns in a #GtkComboBox.
+See gtk_cell_editable_start_editing() for information on the lifecycle of
+the @editable and a way to do setup that doesn’t depend on the @renderer.
+
Note that GTK+ doesn't guarantee that cell renderers will
continue to use the same kind of widget for editing in future
releases, therefore you should check the type of @editable
@@ -23996,9 +24002,16 @@ Emits the #GtkCellEditable::remove-widget signal.
<function name="gtk_cell_editable_start_editing">
<description>
-Begins editing on a @cell_editable. @event is the #GdkEvent that began
-the editing process. It may be %NULL, in the instance that editing was
-initiated through programatic means.
+Begins editing on a @cell_editable.
+
+The #GtkCellRenderer for the cell creates and returns a #GtkCellEditable from
+gtk_cell_renderer_start_editing(), configured for the #GtkCellRenderer type.
+
+gtk_cell_editable_start_editing() can then set up @cell_editable suitably for
+editing a cell, e.g. making the Esc key emit #GtkCellEditable::editing-done.
+
+Note that the @cell_editable is created on-demand for the current edit; its
+lifetime is temporary and does not persist across other edits and/or cells.
</description>
<parameters>
@@ -24007,7 +24020,8 @@ initiated through programatic means.
</parameter_description>
</parameter>
<parameter name="event">
-<parameter_description> A #GdkEvent, or %NULL
+<parameter_description> The #GdkEvent that began the editing process, or
+%NULL if editing was initiated programmatically
</parameter_description>
</parameter>
</parameters>
@@ -24883,7 +24897,8 @@ activity.
<function name="gtk_cell_renderer_start_editing">
<description>
-Passes an activate event to the cell renderer for possible processing.
+Starts editing the contents of this @cell, through a new #GtkCellEditable
+widget created by the #GtkCellRendererClass.start_editing virtual function.
</description>
@@ -24918,7 +24933,8 @@ e.g. for #GtkTreeView, a string representation of #GtkTreePath
</parameter_description>
</parameter>
</parameters>
-<return> A new #GtkCellEditable, or %NULL
+<return> A new #GtkCellEditable for editing this
+@cell, or %NULL if editing is not possible
</return>
</function>
@@ -46484,15 +46500,16 @@ as if you passed %GTK_ARROW_DOWN (although you won’t see any arrows).
<function name="gtk_menu_button_set_menu_model">
<description>
Sets the #GMenuModel from which the popup will be constructed,
-or %NULL to disable the button.
+or %NULL to dissociate any existing menu model and disable the button.
Depending on the value of #GtkMenuButton:use-popover, either a
#GtkMenu will be created with gtk_menu_new_from_model(), or a
#GtkPopover with gtk_popover_new_from_model(). In either case,
actions will be connected as documented for these functions.
-If #GtkMenuButton:popup or #GtkMenuButton:popover are already set,
-their content will be lost and replaced by the newly created popup.
+If #GtkMenuButton:popup or #GtkMenuButton:popover are already set, those
+widgets are dissociated from the @menu_button, and those properties are set
+to %NULL.
</description>
<parameters>
@@ -46501,7 +46518,8 @@ their content will be lost and replaced by the newly created popup.
</parameter_description>
</parameter>
<parameter name="menu_model">
-<parameter_description> a #GMenuModel
+<parameter_description> a #GMenuModel, or %NULL to unset and disable the
+button
</parameter_description>
</parameter>
</parameters>
@@ -46510,9 +46528,11 @@ their content will be lost and replaced by the newly created popup.
<function name="gtk_menu_button_set_popover">
<description>
-Sets the #GtkPopover that will be popped up when the button is
-clicked, or %NULL to disable the button. If #GtkMenuButton:menu-model
-or #GtkMenuButton:popup are set, they will be set to %NULL.
+Sets the #GtkPopover that will be popped up when the @menu_button is clicked,
+or %NULL to dissociate any existing popover and disable the button.
+
+If #GtkMenuButton:menu-model or #GtkMenuButton:popup are set, those objects
+are dissociated from the @menu_button, and those properties are set to %NULL.
</description>
<parameters>
@@ -46521,7 +46541,7 @@ or #GtkMenuButton:popup are set, they will be set to %NULL.
</parameter_description>
</parameter>
<parameter name="popover">
-<parameter_description> a #GtkPopover
+<parameter_description> a #GtkPopover, or %NULL to unset and disable the button
</parameter_description>
</parameter>
</parameters>
@@ -46530,9 +46550,11 @@ or #GtkMenuButton:popup are set, they will be set to %NULL.
<function name="gtk_menu_button_set_popup">
<description>
-Sets the #GtkMenu that will be popped up when the button is clicked,
-or %NULL to disable the button. If #GtkMenuButton:menu-model or
-#GtkMenuButton:popover are set, they will be set to %NULL.
+Sets the #GtkMenu that will be popped up when the @menu_button is clicked, or
+%NULL to dissociate any existing menu and disable the button.
+
+If #GtkMenuButton:menu-model or #GtkMenuButton:popover are set, those objects
+are dissociated from the @menu_button, and those properties are set to %NULL.
</description>
<parameters>
@@ -46541,7 +46563,7 @@ or %NULL to disable the button. If #GtkMenuButton:menu-model or
</parameter_description>
</parameter>
<parameter name="menu">
-<parameter_description> a #GtkMenu
+<parameter_description> a #GtkMenu, or %NULL to unset and disable the button
</parameter_description>
</parameter>
</parameters>
@@ -47455,7 +47477,7 @@ it first with g_intern_static_string().
</parameter_description>
</parameter>
<parameter name="accel_path">
-<parameter_description> a valid accelerator path
+<parameter_description> a valid accelerator path, or %NULL to unset the path
</parameter_description>
</parameter>
</parameters>
@@ -55283,6 +55305,47 @@ see gtk_printer_has_details() and gtk_printer_request_details().
</return>
</function>
+<function name="gtk_printer_get_hard_margins_for_paper_size">
+<description>
+Retrieve the hard margins of @printer for @paper_size, i.e. the
+margins that define the area at the borders of the paper that the
+printer cannot print to.
+
+Note: This will not succeed unless the printer's details are available,
+see gtk_printer_has_details() and gtk_printer_request_details().
+
+
+</description>
+<parameters>
+<parameter name="printer">
+<parameter_description> a #GtkPrinter
+</parameter_description>
+</parameter>
+<parameter name="paper_size">
+<parameter_description> a #GtkPaperSize
+</parameter_description>
+</parameter>
+<parameter name="top">
+<parameter_description> a location to store the top margin in
+</parameter_description>
+</parameter>
+<parameter name="bottom">
+<parameter_description> a location to store the bottom margin in
+</parameter_description>
+</parameter>
+<parameter name="left">
+<parameter_description> a location to store the left margin in
+</parameter_description>
+</parameter>
+<parameter name="right">
+<parameter_description> a location to store the right margin in
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE iff the hard margins were retrieved
+</return>
+</function>
+
<function name="gtk_printer_get_icon_name">
<description>
Gets the name of the icon to use for the printer.
@@ -61132,14 +61195,6 @@ node of @snapshot, without changing the current node.
<parameter_description> the bounds for the new node
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> a printf() style format string for the name for the new node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments to insert into the format string
-</parameter_description>
-</parameter>
</parameters>
<return> a cairo_t suitable for drawing the contents of the newly
created render node
@@ -61167,14 +61222,6 @@ You should try to avoid calling this function if @color is transparent.
<parameter_description> the bounds for the new node
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> a printf() style format string for the name for the new node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments to insert into the format string
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
@@ -61199,14 +61246,6 @@ current node.
<parameter_description> the foreground color to render the layout in
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> a printf() style format string for the name for the new node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments to insert into the format string
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
@@ -61251,38 +61290,10 @@ to the current render node of @snapshot.
<parameter_description> the bounds for the new node
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> a printf() style format string for the name for the new node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments to insert into the format string
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
-<function name="gtk_snapshot_clips_rect">
-<description>
-Tests whether the rectangle is entirely outside the clip region of @snapshot.
-
-
-</description>
-<parameters>
-<parameter name="snapshot">
-<parameter_description> a #GtkSnapshot
-</parameter_description>
-</parameter>
-<parameter name="bounds">
-<parameter_description> a rectangle
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if @bounds is entirely outside the clip region
-</return>
-</function>
-
<function name="gtk_snapshot_free_to_node">
<description>
Returns the node that was constructed by @snapshot
@@ -61353,23 +61364,6 @@ you.
<return></return>
</function>
-<function name="gtk_snapshot_get_record_names">
-<description>
-Obtains whether the snapshot is recording names
-for debugging.
-
-
-</description>
-<parameters>
-<parameter name="snapshot">
-<parameter_description> a #GtkSnapshot
-</parameter_description>
-</parameter>
-</parameters>
-<return> whether the snapshot records names
-</return>
-</function>
-
<function name="gtk_snapshot_new">
<description>
Creates a new #GtkSnapshot.
@@ -61377,18 +61371,6 @@ Creates a new #GtkSnapshot.
</description>
<parameters>
-<parameter name="record_names">
-<parameter_description> whether to keep node names (for debugging purposes)
-</parameter_description>
-</parameter>
-<parameter name="name">
-<parameter_description> a printf-style format string to create the node name
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments for @name
-</parameter_description>
-</parameter>
</parameters>
<return> a newly-allocated #GtkSnapshot
</return>
@@ -61431,35 +61413,6 @@ and appends it to the node underneath it.
<return></return>
</function>
-<function name="gtk_snapshot_push">
-<description>
-Creates a new render node, appends it to the current render
-node of @snapshot, and makes it the new current render node.
-
-</description>
-<parameters>
-<parameter name="snapshot">
-<parameter_description> a #GtkSnapshot
-</parameter_description>
-</parameter>
-<parameter name="keep_coordinates">
-<parameter_description> If %TRUE, the current offset and clip will be kept.
-Otherwise, the clip will be unset and the offset will be reset to
-(0, 0).
-</parameter_description>
-</parameter>
-<parameter name="name">
-<parameter_description> a printf() style format string for the name for the new node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments to insert into the format string
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gtk_snapshot_push_blend">
<description>
Blends together 2 images with the given blend mode.
@@ -61480,14 +61433,6 @@ Calling this function requires 2 subsequent calls to gtk_snapshot_pop().
<parameter_description> blend mode to use
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> printf format string for name of the pushed node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> printf-style arguments for the @name string
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
@@ -61513,14 +61458,6 @@ Calling this function requires 2 calls to gtk_snapshot_pop().
<parameter_description> progress between 0.0 and 1.0
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> printf format string for name of the pushed node
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> printf-style arguments for the @name string
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index ecbabfa..434f880 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -8537,6 +8537,24 @@
+;; From gtkemojicompletion.h
+
+(define-function gtk_emoji_completion_get_type
+ (c-name "gtk_emoji_completion_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_emoji_completion_new
+ (c-name "gtk_emoji_completion_new")
+ (is-constructor-of "GtkEmojiCompletion")
+ (return-type "GtkWidget*")
+ (parameters
+ '("GtkEntry*" "entry")
+ )
+)
+
+
+
;; From gtkentrybuffer.h
(define-function gtk_entry_buffer_get_type
@@ -18257,6 +18275,19 @@
)
)
+(define-method get_hard_margins_for_paper_size
+ (of-object "GtkPrinter")
+ (c-name "gtk_printer_get_hard_margins_for_paper_size")
+ (return-type "gboolean")
+ (parameters
+ '("GtkPaperSize*" "paper_size")
+ '("gdouble*" "top")
+ '("gdouble*" "bottom")
+ '("gdouble*" "left")
+ '("gdouble*" "right")
+ )
+)
+
(define-function gtk_enumerate_printers
(c-name "gtk_enumerate_printers")
(return-type "none")
@@ -22284,11 +22315,6 @@
(c-name "gtk_snapshot_new")
(is-constructor-of "GtkSnapshot")
(return-type "GtkSnapshot*")
- (parameters
- '("gboolean" "record_names")
- '("const-char*" "name")
- )
- (varargs #t)
)
(define-method free_to_node
@@ -22321,19 +22347,12 @@
)
)
-(define-method get_record_names
- (of-object "GtkSnapshot")
- (c-name "gtk_snapshot_get_record_names")
- (return-type "gboolean")
-)
-
-(define-method push
+(define-method push_debug
(of-object "GtkSnapshot")
- (c-name "gtk_snapshot_push")
+ (c-name "gtk_snapshot_push_debug")
(return-type "none")
(parameters
- '("gboolean" "keep_coordinates")
- '("const-char*" "name")
+ '("const-char*" "message")
)
(varargs #t)
)
@@ -22344,9 +22363,7 @@
(return-type "none")
(parameters
'("const-graphene_matrix_t*" "transform")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_opacity
@@ -22355,9 +22372,7 @@
(return-type "none")
(parameters
'("double" "opacity")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_blur
@@ -22366,9 +22381,7 @@
(return-type "none")
(parameters
'("double" "radius")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_color_matrix
@@ -22378,9 +22391,7 @@
(parameters
'("const-graphene_matrix_t*" "color_matrix")
'("const-graphene_vec4_t*" "color_offset")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_repeat
@@ -22390,9 +22401,7 @@
(parameters
'("const-graphene_rect_t*" "bounds")
'("const-graphene_rect_t*" "child_bounds")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_clip
@@ -22401,9 +22410,7 @@
(return-type "none")
(parameters
'("const-graphene_rect_t*" "bounds")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_rounded_clip
@@ -22412,9 +22419,7 @@
(return-type "none")
(parameters
'("const-GskRoundedRect*" "bounds")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_shadow
@@ -22424,9 +22429,7 @@
(parameters
'("const-GskShadow*" "shadow")
'("gsize" "n_shadows")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_blend
@@ -22435,9 +22438,7 @@
(return-type "none")
(parameters
'("GskBlendMode" "blend_mode")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method push_cross_fade
@@ -22446,9 +22447,7 @@
(return-type "none")
(parameters
'("double" "progress")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method pop
@@ -22492,9 +22491,7 @@
(return-type "cairo_t*")
(parameters
'("const-graphene_rect_t*" "bounds")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method append_texture
@@ -22504,9 +22501,7 @@
(parameters
'("GdkTexture*" "texture")
'("const-graphene_rect_t*" "bounds")
- '("const-char*" "name")
)
- (varargs #t)
)
(define-method append_color
@@ -22516,29 +22511,42 @@
(parameters
'("const-GdkRGBA*" "color")
'("const-graphene_rect_t*" "bounds")
- '("const-char*" "name")
)
- (varargs #t)
)
-(define-method append_layout
+(define-method append_linear_gradient
(of-object "GtkSnapshot")
- (c-name "gtk_snapshot_append_layout")
+ (c-name "gtk_snapshot_append_linear_gradient")
(return-type "none")
(parameters
- '("PangoLayout*" "layout")
- '("const-GdkRGBA*" "color")
- '("const-char*" "name")
+ '("const-graphene_rect_t*" "bounds")
+ '("const-graphene_point_t*" "start_point")
+ '("const-graphene_point_t*" "end_point")
+ '("const-GskColorStop*" "stops")
+ '("gsize" "n_stops")
)
- (varargs #t)
)
-(define-method clips_rect
+(define-method append_repeating_linear_gradient
(of-object "GtkSnapshot")
- (c-name "gtk_snapshot_clips_rect")
- (return-type "gboolean")
+ (c-name "gtk_snapshot_append_repeating_linear_gradient")
+ (return-type "none")
(parameters
'("const-graphene_rect_t*" "bounds")
+ '("const-graphene_point_t*" "start_point")
+ '("const-graphene_point_t*" "end_point")
+ '("const-GskColorStop*" "stops")
+ '("gsize" "n_stops")
+ )
+)
+
+(define-method append_layout
+ (of-object "GtkSnapshot")
+ (c-name "gtk_snapshot_append_layout")
+ (return-type "none")
+ (parameters
+ '("PangoLayout*" "layout")
+ '("const-GdkRGBA*" "color")
)
)
@@ -22607,36 +22615,6 @@
)
)
-(define-method append_linear_gradient
- (of-object "GtkSnapshot")
- (c-name "gtk_snapshot_append_linear_gradient")
- (return-type "none")
- (parameters
- '("const-graphene_rect_t*" "bounds")
- '("const-graphene_point_t*" "start_point")
- '("const-graphene_point_t*" "end_point")
- '("const-GskColorStop*" "stops")
- '("gsize" "n_stops")
- '("const-char*" "name")
- )
- (varargs #t)
-)
-
-(define-method append_repeating_linear_gradient
- (of-object "GtkSnapshot")
- (c-name "gtk_snapshot_append_repeating_linear_gradient")
- (return-type "none")
- (parameters
- '("const-graphene_rect_t*" "bounds")
- '("const-graphene_point_t*" "start_point")
- '("const-graphene_point_t*" "end_point")
- '("const-GskColorStop*" "stops")
- '("gsize" "n_stops")
- '("const-char*" "name")
- )
- (varargs #t)
-)
-
;; From gtkspinbutton.h
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index acc9e39..c48f909 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -3209,6 +3209,16 @@
(default-value "FALSE")
)
+(define-property enable-emoji-completion
+ (of-object "GtkEntry")
+ (prop-type "GParamBoolean")
+ (docs "Whether to suggest Emoji replacements")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+ (default-value "FALSE")
+)
+
;; From GtkEntryCompletion
(define-signal insert-prefix
diff --git a/tools/extra_defs_gen/generate_defs_gdk.cc b/tools/extra_defs_gen/generate_defs_gdk.cc
index 7371ef7..4b030fa 100644
--- a/tools/extra_defs_gen/generate_defs_gdk.cc
+++ b/tools/extra_defs_gen/generate_defs_gdk.cc
@@ -47,7 +47,6 @@ int main(int /* argc */, char** /* argv */)
<< get_defs( GDK_TYPE_DISPLAY_MANAGER )
#endif /* G_OS_WIN32 */
<< get_defs( GDK_TYPE_DRAW_CONTEXT )
- << get_defs( GDK_TYPE_DRAWING_CONTEXT )
<< get_defs( GDK_TYPE_EVENT )
<< get_defs( GDK_TYPE_FRAME_CLOCK )
<< get_defs( GDK_TYPE_MONITOR )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]