summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog42
-rw-r--r--codegen/reversewrapper.py21
-rw-r--r--gtk/gdk-2.10.defs5
-rw-r--r--gtk/gdk-base.defs730
-rw-r--r--gtk/gdk.override2
5 files changed, 762 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index b073118e..9c7b898b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,47 @@
2006-07-22 John Finlay <finlay@moeraki.com>
+ * codegen/reversewrapper.py (VoidReturn.write_conversion)
+ (DoubleReturn.write_conversion, GBoxedReturn.write_conversion): Use
+ failure_exception instead of failure_cleanup
+ (GtkTreePathReturn): Add.
+
+ * gtk/gdk-base.defs (get_display_name, get_n_screens, get_screen)
+ (get_default_screen, closed): Add GdkDisplay virtual defs
+ (create_gc, draw_rectangle, draw_arc, draw_polygon, draw_text)
+ (draw_text_wc, draw_drawable, draw_points, draw_segments)
+ (draw_lines, draw_glyphs, draw_image, get_depth, get_size)
+ (set_colormap, get_colormap, get_visual, get_screen, get_image)
+ (get_clip_region, get_visible_region, get_composite_drawable)
+ (draw_pixbuf, draw_glyphs_transformed, draw_trapezoids)
+ (ref_cairo_surface): Add GdkDrawable virtual defs
+ (get_values, set_values, set_dashes): Add GdkGC virtual defs
+ (direction_changed, keys_changed): Add GdkKeymap virtual defs
+ (size_changed): Add GdkScreen virtual def
+ (gdk_pixbuf_animation_ref, pixbuf_animation_unref): Add
+ GdkPixbufAnimation method defs
+ (non_anim_new, is_static_image, get_static_image, get_size)
+ (get_iter): Add GdkPixbufAnimation method and virtual defs with
+ GDK_PIXBUF_ENABLE_BACKEND ifdef
+ (get_delay_time, get_pixbuf, on_currently_loading_frame, advance): Add
+ GdkPixbufAnimationIter virtual defs with GDK_PIXBUF_ENABLE_BACKEND
+ ifdef
+ (pixbuf_error_quark, pixbuf_get_type, ref, unref)
+ (pixbuf_new_from_file_at_scale, save_to_callbackv)
+ (save_to_buffer, save_to_bufferv): Add misc GdkPixbuf method and
+ function defs
+ (is_scalable, is_disabled, set_disabled, get_license): Add
+ GdkPixbufFormat methods defs
+ (set_option): Add GdkPixbuf method def with GDK_PIXBUF_ENABLE_BACKEND
+ ifdef
+ (size_prepared, area_prepared, area_updated, closed): Add
+ GdkPixbufLoader virtual defs
+ (serialize, deserialize, from_pixbuf, pixbuf_from_pixdata)
+ (to_csource): Add GdkPixdata method and function defs
+
+ * gtk/gdk-2.10.defs (composited_changed): Add GdkScreen virtual def
+
+ * gtk/gdk.override (gdk_pixbuf_from_pixdata, gdk_pixdata_*): Ignore
+
* codegen/reversewrapper.py (GdkRegionPtrReturn): Add.
2006-07-22 Gustavo J. A. M. Carneiro <gjc@gnome.org>
diff --git a/codegen/reversewrapper.py b/codegen/reversewrapper.py
index 4bb48130..edf12ffc 100644
--- a/codegen/reversewrapper.py
+++ b/codegen/reversewrapper.py
@@ -426,7 +426,7 @@ class VoidReturn(ReturnType):
self.wrapper.write_code(
code=None,
failure_expression="py_retval != Py_None",
- failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be None");')
+ failure_exception='PyErr_SetString(PyExc_TypeError, "retval should be None");')
argtypes.matcher.register_reverse_ret('void', VoidReturn)
argtypes.matcher.register_reverse_ret('none', VoidReturn)
@@ -578,6 +578,21 @@ class GtkTreePathParam(IntParam):
argtypes.matcher.register_reverse("GtkTreePath*", GtkTreePathParam)
+class GtkTreePathReturn(ReturnType):
+ def get_c_type(self):
+ return self.props.get('c_type', 'GtkTreePath *')
+ def write_decl(self):
+ self.wrapper.add_declaration("GtkTreePath * retval;")
+ def write_error_return(self):
+ self.wrapper.write_code("return NULL;")
+ def write_conversion(self):
+ self.wrapper.write_code("retval = pygtk_tree_path_from_pyobject(py_retval);\n",
+ failure_expression=('!retval'),
+ failure_exception=('PyErr_SetString(PyExc_TypeError, "retval should be a GtkTreePath");'))
+
+argtypes.matcher.register_reverse_ret("GtkTreePath*", GtkTreePathReturn)
+
+
class BooleanReturn(ReturnType):
def get_c_type(self):
return "gboolean"
@@ -640,7 +655,7 @@ class DoubleReturn(ReturnType):
self.wrapper.write_code(
code=None,
failure_expression="!PyFloat_AsDouble(py_retval)",
- failure_cleanup='PyErr_SetString(PyExc_TypeError, "retval should be a float");')
+ failure_exception='PyErr_SetString(PyExc_TypeError, "retval should be a float");')
self.wrapper.write_code("retval = PyFloat_AsDouble(py_retval);")
for argtype in ('float', 'double', 'gfloat', 'gdouble'):
@@ -682,7 +697,7 @@ class GBoxedReturn(ReturnType):
self.wrapper.write_code(code = None,
failure_expression=("!pyg_boxed_check(py_retval, %s)" %
(self.props['typecode'],)),
- failure_cleanup=('PyErr_SetString(PyExc_TypeError, "retval should be a %s");'
+ failure_exception=('PyErr_SetString(PyExc_TypeError, "retval should be a %s");'
% (self.props['typename'],)))
self.wrapper.write_code('retval = pyg_boxed_get(py_retval, %s);' %
self.props['typename'])
diff --git a/gtk/gdk-2.10.defs b/gtk/gdk-2.10.defs
index f280a293..5ddaa488 100644
--- a/gtk/gdk-2.10.defs
+++ b/gtk/gdk-2.10.defs
@@ -191,6 +191,11 @@
(return-type "GList*")
)
+(define-virtual composited_changed
+ (of-object "GdkScreen")
+ (return-type "none")
+)
+
;; From gdkselection.h
diff --git a/gtk/gdk-base.defs b/gtk/gdk-base.defs
index a8c3f648..cb09c945 100644
--- a/gtk/gdk-base.defs
+++ b/gtk/gdk-base.defs
@@ -837,39 +837,6 @@
(return-type "gboolean")
)
-;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdisplaymanager.h
-
-(define-function gdk_display_manager_get_type
- (c-name "gdk_display_manager_get_type")
- (return-type "GType")
-)
-
-(define-function display_manager_get
- (c-name "gdk_display_manager_get")
- (return-type "GdkDisplayManager*")
-)
-
-(define-method get_default_display
- (of-object "GdkDisplayManager")
- (c-name "gdk_display_manager_get_default_display")
- (return-type "GdkDisplay*")
-)
-
-(define-method set_default_display
- (of-object "GdkDisplayManager")
- (c-name "gdk_display_manager_set_default_display")
- (return-type "none")
- (parameters
- '("GdkDisplay*" "display")
- )
-)
-
-(define-method list_displays
- (of-object "GdkDisplayManager")
- (c-name "gdk_display_manager_list_displays")
- (return-type "GSList*")
-)
-
(define-method flush
(of-object "GdkDisplay")
(c-name "gdk_display_flush")
@@ -918,8 +885,6 @@
(return-type "GdkWindow*")
)
-;; From gdkdisplay.h
-
(define-method warp_pointer
(of-object "GdkDisplay")
(c-name "gdk_display_warp_pointer")
@@ -931,6 +896,82 @@
)
)
+(define-virtual get_display_name
+ (of-object "GdkDisplay")
+ (return-type "const-gchar*")
+)
+
+(define-virtual get_n_screens
+ (of-object "GdkDisplay")
+ (return-type "gint")
+)
+
+(define-virtual get_screen
+ (of-object "GdkDisplay")
+ (return-type "GdkScreen*")
+ (parameters
+ '("gint" "screen_num")
+ )
+)
+
+(define-virtual get_default_screen
+ (of-object "GdkDisplay")
+ (return-type "GdkScreen*")
+)
+
+(define-virtual closed
+ (of-object "GdkDisplay")
+ (return-type "none")
+ (parameters
+ '("gboolean" "is_error")
+ )
+)
+
+
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdisplaymanager.h
+
+(define-function gdk_display_manager_get_type
+ (c-name "gdk_display_manager_get_type")
+ (return-type "GType")
+)
+
+(define-function display_manager_get
+ (c-name "gdk_display_manager_get")
+ (return-type "GdkDisplayManager*")
+)
+
+(define-method get_default_display
+ (of-object "GdkDisplayManager")
+ (c-name "gdk_display_manager_get_default_display")
+ (return-type "GdkDisplay*")
+)
+
+(define-method set_default_display
+ (of-object "GdkDisplayManager")
+ (c-name "gdk_display_manager_set_default_display")
+ (return-type "none")
+ (parameters
+ '("GdkDisplay*" "display")
+ )
+)
+
+(define-method list_displays
+ (of-object "GdkDisplayManager")
+ (c-name "gdk_display_manager_list_displays")
+ (return-type "GSList*")
+)
+
+(define-virtual display_opened
+ (of-object "GdkDisplayManager")
+ (return-type "none")
+ (parameters
+ '("GdkDisplay*" "display")
+ )
+)
+
+;;
+
(define-function display_open_default_libgtk_only
(c-name "gdk_display_open_default_libgtk_only")
(return-type "GdkDisplay*")
@@ -1507,6 +1548,270 @@
(caller-owns-return #t)
)
+(define-virtual create_gc
+ (of-object "GdkDrawable")
+ (return-type "GdkGC*")
+ (parameters
+ '("GdkGCValues*" "values")
+ '("GdkGCValuesMask" "mask")
+ )
+)
+
+(define-virtual draw_rectangle
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("gboolean" "filled")
+ '("gint" "x")
+ '("gint" "y")
+ '("gint" "width")
+ '("gint" "height")
+ )
+)
+
+(define-virtual draw_arc
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("gboolean" "filled")
+ '("gint" "x")
+ '("gint" "y")
+ '("gint" "width")
+ '("gint" "height")
+ '("gint" "angle1")
+ '("gint" "angle2")
+ )
+)
+
+(define-virtual draw_polygon
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("gboolean" "filled")
+ '("GdkPoint*" "points")
+ '("gint" "npoints")
+ )
+)
+
+(define-virtual draw_text
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkFont*" "font")
+ '("GdkGC*" "gc")
+ '("gint" "x")
+ '("gint" "y")
+ '("const-gchar*" "text")
+ '("gint" "text_length")
+ )
+)
+
+(define-virtual draw_text_wc
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkFont*" "font")
+ '("GdkGC*" "gc")
+ '("gint" "x")
+ '("gint" "y")
+ '("const-GdkWChar*" "text")
+ '("gint" "text_length")
+ )
+)
+
+(define-virtual draw_drawable
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkDrawable*" "src")
+ '("gint" "xsrc")
+ '("gint" "ysrc")
+ '("gint" "xdest")
+ '("gint" "ydest")
+ '("gint" "width")
+ '("gint" "height")
+ )
+)
+
+(define-virtual draw_points
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkPoint*" "points")
+ '("gint" "npoints")
+ )
+)
+
+(define-virtual draw_segments
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkSegment*" "segs")
+ '("gint" "nsegs")
+ )
+)
+
+(define-virtual draw_lines
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkPoint*" "points")
+ '("gint" "npoints")
+ )
+)
+
+(define-virtual draw_glyphs
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("PangoFont*" "font")
+ '("gint" "x")
+ '("gint" "y")
+ '("PangoGlyphString*" "glyphs")
+ )
+)
+
+(define-virtual draw_image
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkImage*" "image")
+ '("gint" "xsrc")
+ '("gint" "ysrc")
+ '("gint" "xdest")
+ '("gint" "ydest")
+ '("gint" "width")
+ '("gint" "height")
+ )
+)
+
+(define-virtual get_depth
+ (of-object "GdkDrawable")
+ (return-type "gint")
+)
+
+(define-virtual get_size
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("gint*" "width")
+ '("gint*" "height")
+ )
+)
+
+(define-virtual set_colormap
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkColormap*" "cmap")
+ )
+)
+
+(define-virtual get_colormap
+ (of-object "GdkDrawable")
+ (return-type "GdkColormap*")
+)
+
+(define-virtual get_visual
+ (of-object "GdkDrawable")
+ (return-type "GdkVisual*")
+)
+
+(define-virtual get_screen
+ (of-object "GdkDrawable")
+ (return-type "GdkScreen*")
+)
+
+(define-virtual get_image
+ (of-object "GdkDrawable")
+ (return-type "GdkImage*")
+ (parameters
+ '("gint" "x")
+ '("gint" "y")
+ '("gint" "width")
+ '("gint" "height")
+ )
+)
+
+(define-virtual get_clip_region
+ (of-object "GdkDrawable")
+ (return-type "GdkRegion*")
+)
+
+(define-virtual get_visible_region
+ (of-object "GdkDrawable")
+ (return-type "GdkRegion*")
+)
+
+(define-virtual get_composite_drawable
+ (of-object "GdkDrawable")
+ (return-type "GdkDrawable*")
+ (parameters
+ '("gint" "x")
+ '("gint" "y")
+ '("gint" "width")
+ '("gint" "height")
+ '("gint*" "composite_x_offset")
+ '("gint*" "composite_y_offset")
+ )
+)
+
+(define-virtual draw_pixbuf
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkPixbuf*" "pixbuf")
+ '("gint" "src_x")
+ '("gint" "src_y")
+ '("gint" "dest_x")
+ '("gint" "dest_y")
+ '("gint" "width")
+ '("gint" "height")
+ '("GdkRgbDither" "dither")
+ '("gint" "x_dither")
+ '("gint" "y_dither")
+ )
+)
+
+(define-virtual draw_glyphs_transformed
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("PangoMatrix*" "matrix")
+ '("PangoFont*" "font")
+ '("gint" "x")
+ '("gint" "y")
+ '("PangoGlyphString*" "glyphs")
+ )
+)
+
+(define-virtual draw_trapezoids
+ (of-object "GdkDrawable")
+ (return-type "none")
+ (parameters
+ '("GdkGC*" "gc")
+ '("GdkTrapezoid*" "trapezoids")
+ '("gint" "n_trapezoids")
+ )
+)
+
+(define-virtual ref_cairo_surface
+ (of-object "GdkDrawable")
+ (return-type "cairo_surface_t*")
+)
+
+
;; From /opt/gtk2/include/gtk-2.0/gdk/gdkevents.h
@@ -2188,6 +2493,35 @@
)
+(define-virtual get_values
+ (of-object "GdkGC")
+ (return-type "none")
+ (parameters
+ '("GdkGCValues*" "values")
+ )
+)
+
+(define-virtual set_values
+ (of-object "GdkGC")
+ (return-type "none")
+ (parameters
+ '("GdkGCValues*" "values")
+ '("GdkGCValuesMask" "mask")
+ )
+)
+
+(define-virtual set_dashes
+ (of-object "GdkGC")
+ (return-type "none")
+ (parameters
+ '("gint" "dash_offset")
+ '("gint8[]" "dash_list")
+ '("gint" "n")
+ )
+)
+
+
+
;; From /opt/gtk2/include/gtk-2.0/gdk/gdkimage.h
(define-function gdk_image_get_type
@@ -2541,6 +2875,16 @@
)
)
+(define-virtual direction_changed
+ (of-object "GdkKeymap")
+ (return-type "none")
+)
+
+(define-virtual keys_changed
+ (of-object "GdkKeymap")
+ (return-type "none")
+)
+
;; From /home/jdahlin/dev/gtk-2.8/gtk+/gdk/gdkpango.h
@@ -3538,6 +3882,12 @@
(return-type "gboolean")
)
+
+(define-virtual size_changed
+ (of-object "GdkScreen")
+ (return-type "none")
+)
+
;; From /opt/gtk2/include/gtk-2.0/gdk/gdkselection.h
(define-function selection_owner_set
@@ -5063,6 +5413,8 @@
)
)
+;; From gdk-pixbuf-animation.h
+
(define-function pixbuf_animation_get_type
(c-name "gdk_pixbuf_animation_get_type")
(return-type "GType")
@@ -5078,6 +5430,18 @@
)
)
+(define-method ref
+ (of-object "GdkPixbufAnimation")
+ (c-name "gdk_pixbuf_animation_ref")
+ (return-type "GdkPixbufAnimation*")
+)
+
+(define-method unref
+ (of-object "GdkPixbufAnimation")
+ (c-name "gdk_pixbuf_animation_unref")
+ (return-type "none")
+)
+
(define-method get_width
(of-object "GdkPixbufAnimation")
(c-name "gdk_pixbuf_animation_get_width")
@@ -5111,6 +5475,42 @@
)
)
+(ifdef GDK_PIXBUF_ENABLE_BACKEND
+
+(define-method non_anim_new
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_non_anim_new")
+ (return-type "GdkPixbufAnimation*")
+)
+
+(define-virtual is_static_image
+ (of-object "GdkPixbufAnimation")
+ (return-type "gboolean")
+)
+
+(define-virtual get_static_image
+ (of-object "GdkPixbufAnimation")
+ (return-type "GdkPixbuf*")
+)
+
+(define-virtual get_size
+ (of-object "GdkPixbufAnimation")
+ (return-type "none")
+ (parameters
+ '("int*" "width")
+ '("int*" "height")
+ )
+)
+
+(define-virtual get_iter
+ (of-object "GdkPixbufAnimation")
+ (return-type "GdkPixbufAnimationIter*")
+ (parameters
+ '("const-GTimeVal*" "start_time")
+ )
+)
+)
+
(define-function pixbuf_animation_iter_get_type
(c-name "gdk_pixbuf_animation_iter_get_type")
(return-type "GType")
@@ -5143,6 +5543,110 @@
)
)
+(ifdef GDK_PIXBUF_ENABLE_BACKEND
+
+(define-virtual get_delay_time
+ (of-object "GdkPixbufAnimationIter")
+ (return-type "int")
+)
+
+(define-virtual get_pixbuf
+ (of-object "GdkPixbufAnimationIter")
+ (return-type "GdkPixbuf*")
+)
+
+(define-virtual on_currently_loading_frame
+ (of-object "GdkPixbufAnimationIter")
+ (return-type "gboolean")
+)
+
+(define-virtual advance
+ (of-object "GdkPixbufAnimationIter")
+ (return-type "gboolean")
+ (parameters
+ '("const-GTimeVal*" "current_time")
+ )
+)
+)
+
+
+;; From gdk-pixbuf-core.h
+
+(define-function pixbuf_error_quark
+ (c-name "gdk_pixbuf_error_quark")
+ (return-type "GQuark")
+)
+
+(define-function pixbuf_get_type
+ (c-name "gdk_pixbuf_get_type")
+ (return-type "GType")
+)
+
+(define-method ref
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_ref")
+ (return-type "GdkPixbuf*")
+)
+
+(define-method unref
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_unref")
+ (return-type "none")
+)
+
+(define-function pixbuf_new_from_file_at_scale
+ (c-name "gdk_pixbuf_new_from_file_at_scale")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("const-char*" "filename")
+ '("int" "width")
+ '("int" "height")
+ '("gboolean" "preserve_aspect_ratio")
+ '("GError**" "error")
+ )
+)
+
+(define-method save_to_callbackv
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_save_to_callbackv")
+ (return-type "gboolean")
+ (parameters
+ '("GdkPixbufSaveFunc" "save_func")
+ '("gpointer" "user_data")
+ '("const-char*" "type")
+ '("char**" "option_keys")
+ '("char**" "option_values")
+ '("GError**" "error")
+ )
+)
+
+(define-method save_to_buffer
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_save_to_buffer")
+ (return-type "gboolean")
+ (parameters
+ '("gchar**" "buffer")
+ '("gsize*" "buffer_size")
+ '("const-char*" "type")
+ '("GError**" "error")
+ )
+ (varargs #t)
+)
+
+(define-method save_to_bufferv
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_save_to_bufferv")
+ (return-type "gboolean")
+ (parameters
+ '("gchar**" "buffer")
+ '("gsize*" "buffer_size")
+ '("const-char*" "type")
+ '("char**" "option_keys")
+ '("char**" "option_values")
+ '("GError**" "error")
+ )
+)
+
(define-method get_option
(of-object "GdkPixbuf")
(c-name "gdk_pixbuf_get_option")
@@ -5152,6 +5656,35 @@
)
)
+;; From gdk-pixbuf-enum-types.h
+
+(define-function pixbuf_alpha_mode_get_type
+ (c-name "gdk_pixbuf_alpha_mode_get_type")
+ (return-type "GType")
+)
+
+(define-function colorspace_get_type
+ (c-name "gdk_colorspace_get_type")
+ (return-type "GType")
+)
+
+(define-function pixbuf_error_get_type
+ (c-name "gdk_pixbuf_error_get_type")
+ (return-type "GType")
+)
+
+(define-function interp_type_get_type
+ (c-name "gdk_interp_type_get_type")
+ (return-type "GType")
+)
+
+(define-function pixbuf_rotation_get_type
+ (c-name "gdk_pixbuf_rotation_get_type")
+ (return-type "GType")
+)
+
+
+
(define-function pixbuf_get_formats
(c-name "gdk_pixbuf_get_formats")
(return-type "GSList*")
@@ -5196,6 +5729,47 @@
(return-type "gboolean")
)
+(define-method is_scalable
+ (of-object "GdkPixbufFormat")
+ (c-name "gdk_pixbuf_format_is_scalable")
+ (return-type "gboolean")
+)
+
+(define-method is_disabled
+ (of-object "GdkPixbufFormat")
+ (c-name "gdk_pixbuf_format_is_disabled")
+ (return-type "gboolean")
+)
+
+(define-method set_disabled
+ (of-object "GdkPixbufFormat")
+ (c-name "gdk_pixbuf_format_set_disabled")
+ (return-type "none")
+ (parameters
+ '("gboolean" "disabled")
+ )
+)
+
+(define-method get_license
+ (of-object "GdkPixbufFormat")
+ (c-name "gdk_pixbuf_format_get_license")
+ (return-type "gchar*")
+)
+
+(ifdef GDK_PIXBUF_ENABLE_BACKEND
+
+(define-method set_option
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_set_option")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "key")
+ '("const-gchar*" "value")
+ )
+)
+)
+
+
;; From /opt/gnome/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -5278,6 +5852,38 @@
(return-type "GdkPixbufFormat*")
)
+(define-virtual size_prepared
+ (of-object "GdkPixbufLoader")
+ (return-type "none")
+ (parameters
+ '("int" "width")
+ '("int" "height")
+ )
+)
+
+(define-virtual area_prepared
+ (of-object "GdkPixbufLoader")
+ (return-type "none")
+)
+
+(define-virtual area_updated
+ (of-object "GdkPixbufLoader")
+ (return-type "none")
+ (parameters
+ '("int" "x")
+ '("int" "y")
+ '("int" "width")
+ '("int" "height")
+ )
+)
+
+(define-virtual closed
+ (of-object "GdkPixbufLoader")
+ (return-type "none")
+)
+
+
+
;; From gdk-pixbuf-simple-anim.h
(define-function pixbuf_simple_anim_get_type
@@ -5323,6 +5929,60 @@
)
)
+;; From gdk-pixdata.h
+
+(define-method serialize
+ (of-object "GdkPixdata")
+ (c-name "gdk_pixdata_serialize")
+ (return-type "guint8*")
+ (parameters
+ '("guint*" "stream_length_p")
+ )
+)
+
+(define-method deserialize
+ (of-object "GdkPixdata")
+ (c-name "gdk_pixdata_deserialize")
+ (return-type "gboolean")
+ (parameters
+ '("guint" "stream_length")
+ '("const-guint8*" "stream")
+ '("GError**" "error")
+ )
+)
+
+(define-method from_pixbuf
+ (of-object "GdkPixdata")
+ (c-name "gdk_pixdata_from_pixbuf")
+ (return-type "gpointer")
+ (parameters
+ '("const-GdkPixbuf*" "pixbuf")
+ '("gboolean" "use_rle")
+ )
+)
+
+(define-function pixbuf_from_pixdata
+ (c-name "gdk_pixbuf_from_pixdata")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("const-GdkPixdata*" "pixdata")
+ '("gboolean" "copy_pixels")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_csource
+ (of-object "GdkPixdata")
+ (c-name "gdk_pixdata_to_csource")
+ (return-type "GString*")
+ (parameters
+ '("const-gchar*" "name")
+ '("GdkPixdataDumpType" "dump_type")
+ )
+)
+
+
+
;;
(define-method intersect
diff --git a/gtk/gdk.override b/gtk/gdk.override
index 79a7d0a9..f3a03fd4 100644
--- a/gtk/gdk.override
+++ b/gtk/gdk.override
@@ -97,6 +97,7 @@ ignore
gdk_window_set_debug_updates
gdk_region_destroy
gdk_atom_intern_static_string
+ gdk_pixbuf_from_pixdata
%%
ignore-glob
*_get_type
@@ -105,6 +106,7 @@ ignore-glob
*_unref
gdk_spawn_*
*_libgtk_only
+ gdk_pixdata_*
%%
ignore-type
GdkPixmapObject