[gtkmm] Gdk: Regenerate gdk_docs.xml and the .defs files



commit 05dbe8dcbfe861ccd6ca78a311d4ab09d0d2ab5a
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri Nov 18 16:20:36 2016 +0100

    Gdk: Regenerate gdk_docs.xml and the .defs files

 gdk/src/gdk_docs.xml            |  267 ++++++++++++++++++++++++++++++++-------
 gdk/src/gdk_enums.defs          |   18 ---
 gdk/src/gdk_methods.defs        |   45 ++++---
 gdk/src/gdk_pixbuf_methods.defs |   54 ++++++++
 4 files changed, 300 insertions(+), 84 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index b62fa1e..5efb625 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -3397,32 +3397,6 @@ Since: 3.90
 </description>
 </property>
 
-<enum name="GdkWindowAttributesType">
-<description>
-Used to indicate which fields in the #GdkWindowAttr struct should be honored.
-For example, if you filled in the “x” and “y” fields of #GdkWindowAttr,
-pass “@GDK_WA_X | @GDK_WA_Y” to gdk_window_new(). Fields in
-#GdkWindowAttr not covered by a bit in this enum are required; for example,
-the @width/@height, @wclass, and @window_type fields are required, they have
-no corresponding flag in #GdkWindowAttributesType.
-
-</description>
-<parameters>
-<parameter name="GDK_WA_X">
-<parameter_description> Honor the X coordinate field
-</parameter_description>
-</parameter>
-<parameter name="GDK_WA_Y">
-<parameter_description> Honor the Y coordinate field
-</parameter_description>
-</parameter>
-<parameter name="GDK_WA_TYPE_HINT">
-<parameter_description> Honor the type_hint field
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
 <enum name="GdkWindowEdge">
 <description>
 Determines a window edge or corner.
@@ -10452,6 +10426,29 @@ allocate the image buffer, or the image file contained invalid data.
 </return>
 </function>
 
+<function name="gdk_pixbuf_animation_new_from_file_utf8">
+<description>
+Same as gdk_pixbuf_animation_new_from_file()
+
+
+</description>
+<parameters>
+<parameter name="filename">
+<parameter_description> Name of file to load, in the GLib file name encoding
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> return location for error
+</parameter_description>
+</parameter>
+</parameters>
+<return> A newly-created animation with a reference count of 1, or %NULL
+if any of several error conditions ocurred:  the file could not be opened,
+there was no loader for the file's format, there was not enough memory to
+allocate the image buffer, or the image file contained invalid data.
+</return>
+</function>
+
 <function name="gdk_pixbuf_animation_new_from_resource">
 <description>
 Creates a new pixbuf animation by loading an image from an resource.
@@ -12438,6 +12435,43 @@ allocate the image buffer, or the image file contained invalid data.
 </return>
 </function>
 
+<function name="gdk_pixbuf_new_from_file_at_scale_utf8">
+<description>
+Same as gdk_pixbuf_new_from_file_at_scale().
+
+Since: 2.6
+
+</description>
+<parameters>
+<parameter name="filename">
+<parameter_description> Name of file to load, in the GLib file name encoding
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> The width the image should have or -1 to not constrain the width
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> The height the image should have or -1 to not constrain the height
+</parameter_description>
+</parameter>
+<parameter name="preserve_aspect_ratio">
+<parameter_description> %TRUE to preserve the image's aspect ratio
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> Return location for an error
+</parameter_description>
+</parameter>
+</parameters>
+<return> A newly-created pixbuf with a reference count of 1, or %NULL
+if any of several error conditions occurred:  the file could not be opened,
+there was no loader for the file's format, there was not enough memory to
+allocate the image buffer, or the image file contained invalid data.
+
+</return>
+</function>
+
 <function name="gdk_pixbuf_new_from_file_at_size">
 <description>
 Creates a new pixbuf by loading an image from a file.  
@@ -12481,6 +12515,63 @@ invalid data.
 </return>
 </function>
 
+<function name="gdk_pixbuf_new_from_file_at_size_utf8">
+<description>
+Same as gdk_pixbuf_new_from_file_at_size()
+
+Since: 2.4
+
+</description>
+<parameters>
+<parameter name="filename">
+<parameter_description> Name of file to load, in the GLib file name encoding
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> The width the image should have or -1 to not constrain the width
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> The height the image should have or -1 to not constrain the height
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> Return location for an error
+</parameter_description>
+</parameter>
+</parameters>
+<return> A newly-created pixbuf with a reference count of 1, or
+%NULL if any of several error conditions occurred:  the file could not
+be opened, there was no loader for the file's format, there was not
+enough memory to allocate the image buffer, or the image file contained
+invalid data.
+
+</return>
+</function>
+
+<function name="gdk_pixbuf_new_from_file_utf8">
+<description>
+Same as gdk_pixbuf_new_from_file()
+
+
+</description>
+<parameters>
+<parameter name="filename">
+<parameter_description> Name of file to load, in the GLib file name encoding
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> Return location for an error
+</parameter_description>
+</parameter>
+</parameters>
+<return> A newly-created pixbuf with a reference count of 1, or %NULL if
+any of several error conditions occurred:  the file could not be opened,
+there was no loader for the file's format, there was not enough memory to
+allocate the image buffer, or the image file contained invalid data.
+</return>
+</function>
+
 <function name="gdk_pixbuf_new_from_inline">
 <description>
 Create a #GdkPixbuf from a flat representation that is suitable for
@@ -13544,6 +13635,42 @@ See gdk_pixbuf_save () for more details.
 </return>
 </function>
 
+<function name="gdk_pixbuf_savev_utf8">
+<description>
+Same as gdk_pixbuf_savev()
+
+
+</description>
+<parameters>
+<parameter name="pixbuf">
+<parameter_description> a #GdkPixbuf.
+</parameter_description>
+</parameter>
+<parameter name="filename">
+<parameter_description> name of file to save.
+</parameter_description>
+</parameter>
+<parameter name="type">
+<parameter_description> name of file format.
+</parameter_description>
+</parameter>
+<parameter name="option_keys">
+<parameter_description> name of options to set, %NULL-terminated
+</parameter_description>
+</parameter>
+<parameter name="option_values">
+<parameter_description> values for named options
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> return location for error, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> whether an error was set
+</return>
+</function>
+
 <function name="gdk_pixbuf_scale">
 <description>
 Creates a transformation of the source image @src by scaling by
@@ -17849,38 +17976,35 @@ point
 <return></return>
 </function>
 
-<function name="gdk_window_new">
+<function name="gdk_window_new_child">
 <description>
-Creates a new #GdkWindow using the attributes from
-@attributes. See #GdkWindowAttr and #GdkWindowAttributesType for
-more details.  Note: to use this on displays other than the default
-display, @parent must be specified.
+Creates a new client-side child window.
 
+Since: 3.90
 
 </description>
 <parameters>
 <parameter name="parent">
-<parameter_description> a #GdkWindow, or %NULL to create the window as a child of
-the default root window for the default display.
+<parameter_description> the parent window
 </parameter_description>
 </parameter>
-<parameter name="attributes">
-<parameter_description> attributes of the new window
+<parameter name="event_mask">
+<parameter_description> event mask (see gdk_window_set_events())
 </parameter_description>
 </parameter>
-<parameter name="attributes_mask">
-<parameter_description> mask indicating which
-fields in @attributes are valid
+<parameter name="position">
+<parameter_description> placement of the window inside @parent
 </parameter_description>
 </parameter>
 </parameters>
 <return> the new #GdkWindow
+
 </return>
 </function>
 
-<function name="gdk_window_new_child">
+<function name="gdk_window_new_input">
 <description>
-Creates a new client-side child window.
+Creates a new client-side input-only window.
 
 Since: 3.90
 
@@ -17904,16 +18028,17 @@ Since: 3.90
 </return>
 </function>
 
-<function name="gdk_window_new_input">
+<function name="gdk_window_new_popup">
 <description>
-Creates a new client-side input-only window.
+Creates a new toplevel popup window. The window will bypass window
+management.
 
 Since: 3.90
 
 </description>
 <parameters>
-<parameter name="parent">
-<parameter_description> the parent window
+<parameter name="display">
+<parameter_description> the display to create the window on
 </parameter_description>
 </parameter>
 <parameter name="event_mask">
@@ -17921,7 +18046,59 @@ Since: 3.90
 </parameter_description>
 </parameter>
 <parameter name="position">
-<parameter_description> placement of the window inside @parent
+<parameter_description> position of the window on screen
+</parameter_description>
+</parameter>
+</parameters>
+<return> the new #GdkWindow
+
+</return>
+</function>
+
+<function name="gdk_window_new_temp">
+<description>
+Creates a new toplevel temporary window. The window will be
+situated off-screen and not handle output.
+
+You most likely do not want to use this function.
+
+Since: 3.90
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> the display to create the window on
+</parameter_description>
+</parameter>
+</parameters>
+<return> the new #GdkWindow
+
+</return>
+</function>
+
+<function name="gdk_window_new_toplevel">
+<description>
+Creates a new toplevel window. The window will be managed by the window
+manager.
+
+Since: 3.90
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> the display to create the window on
+</parameter_description>
+</parameter>
+<parameter name="event_mask">
+<parameter_description> event mask (see gdk_window_set_events())
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> width of new window
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> height of new window
 </parameter_description>
 </parameter>
 </parameters>
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 9efa820..901e80b 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -1245,24 +1245,6 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GDK_WA_X     = 1 << 1,
-;;   GDK_WA_Y     = 1 << 2,
-;;   GDK_WA_TYPE_HINT = 1 << 3
-;; } GdkWindowAttributesType;
-
-(define-flags-extended WindowAttributesType
-  (in-module "Gdk")
-  (c-name "GdkWindowAttributesType")
-  (values
-    '("x" "GDK_WA_X" "1 << 1")
-    '("y" "GDK_WA_Y" "1 << 2")
-    '("type-hint" "GDK_WA_TYPE_HINT" "1 << 3")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
 ;;   GDK_HINT_POS             = 1 << 0,
 ;;   GDK_HINT_MIN_SIZE    = 1 << 1,
 ;;   GDK_HINT_MAX_SIZE    = 1 << 2,
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 1994033..45f65af 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -611,17 +611,6 @@
   )
 )
 
-(define-flags WindowAttributesType
-  (in-module "Gdk")
-  (c-name "GdkWindowAttributesType")
-  (gtype-id "GDK_TYPE_WINDOW_ATTRIBUTES_TYPE")
-  (values
-    '("x" "GDK_WA_X")
-    '("y" "GDK_WA_Y")
-    '("type-hint" "GDK_WA_TYPE_HINT")
-  )
-)
-
 (define-flags WindowHints
   (in-module "Gdk")
   (c-name "GdkWindowHints")
@@ -2136,11 +2125,6 @@
   (return-type "GType")
 )
 
-(define-function gdk_window_attributes_type_get_type
-  (c-name "gdk_window_attributes_type_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_window_hints_get_type
   (c-name "gdk_window_hints_get_type")
   (return-type "GType")
@@ -3873,13 +3857,32 @@
   (return-type "GType")
 )
 
-(define-method new
-  (of-object "GdkWindow")
-  (c-name "gdk_window_new")
+(define-function gdk_window_new_toplevel
+  (c-name "gdk_window_new_toplevel")
   (return-type "GdkWindow*")
   (parameters
-    '("GdkWindowAttr*" "attributes")
-    '("gint" "attributes_mask")
+    '("GdkDisplay*" "display")
+    '("gint" "event_mask")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
+(define-function gdk_window_new_popup
+  (c-name "gdk_window_new_popup")
+  (return-type "GdkWindow*")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("gint" "event_mask")
+    '("const-GdkRectangle*" "position")
+  )
+)
+
+(define-function gdk_window_new_temp
+  (c-name "gdk_window_new_temp")
+  (return-type "GdkWindow*")
+  (parameters
+    '("GdkDisplay*" "display")
   )
 )
 
diff --git a/gdk/src/gdk_pixbuf_methods.defs b/gdk/src/gdk_pixbuf_methods.defs
index cdfed8e..be38cbd 100644
--- a/gdk/src/gdk_pixbuf_methods.defs
+++ b/gdk/src/gdk_pixbuf_methods.defs
@@ -132,6 +132,15 @@
   (return-type "GType")
 )
 
+(define-function gdk_pixbuf_animation_new_from_file_utf8
+  (c-name "gdk_pixbuf_animation_new_from_file_utf8")
+  (return-type "GdkPixbufAnimation*")
+  (parameters
+    '("const-char*" "filename")
+    '("GError**" "error")
+  )
+)
+
 (define-function gdk_pixbuf_animation_new_from_file
   (c-name "gdk_pixbuf_animation_new_from_file")
   (return-type "GdkPixbufAnimation*")
@@ -404,6 +413,38 @@
   )
 )
 
+(define-function gdk_pixbuf_new_from_file_utf8
+  (c-name "gdk_pixbuf_new_from_file_utf8")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("const-char*" "filename")
+    '("GError**" "error")
+  )
+)
+
+(define-function gdk_pixbuf_new_from_file_at_size_utf8
+  (c-name "gdk_pixbuf_new_from_file_at_size_utf8")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("const-char*" "filename")
+    '("int" "width")
+    '("int" "height")
+    '("GError**" "error")
+  )
+)
+
+(define-function gdk_pixbuf_new_from_file_at_scale_utf8
+  (c-name "gdk_pixbuf_new_from_file_at_scale_utf8")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("const-char*" "filename")
+    '("int" "width")
+    '("int" "height")
+    '("gboolean" "preserve_aspect_ratio")
+    '("GError**" "error")
+  )
+)
+
 (define-function gdk_pixbuf_new_from_file
   (c-name "gdk_pixbuf_new_from_file")
   (return-type "GdkPixbuf*")
@@ -540,6 +581,19 @@
   )
 )
 
+(define-method savev_utf8
+  (of-object "GdkPixbuf")
+  (c-name "gdk_pixbuf_savev_utf8")
+  (return-type "gboolean")
+  (parameters
+    '("const-char*" "filename")
+    '("const-char*" "type")
+    '("char**" "option_keys")
+    '("char**" "option_values")
+    '("GError**" "error")
+  )
+)
+
 (define-method save_to_callback
   (of-object "GdkPixbuf")
   (c-name "gdk_pixbuf_save_to_callback")


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