summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorGian Mario Tagliaretti <gianmt@gnome.org>2010-01-05 09:11:21 +0100
committerGian Mario Tagliaretti <gianmt@gnome.org>2010-01-05 09:12:57 +0100
commit90682a0f61ffad9fbf3e52b73c0b3fdd79466944 (patch)
tree853602591a02031cd23e4b3a8b32ad18dcbc1793 /gtk
parent68763a97385dd74ccd12ef4decd662de9dd2c2ab (diff)
downloadpygtk-90682a0f61ffad9fbf3e52b73c0b3fdd79466944.tar.gz
Wrap gtk.gdk.pixbuf_new_from_stream[at_scale] forgotten in 2.14
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gdk-2.14.defs26
-rw-r--r--gtk/gdk.override2
2 files changed, 28 insertions, 0 deletions
diff --git a/gtk/gdk-2.14.defs b/gtk/gdk-2.14.defs
index e43c30ae..be7de88a 100644
--- a/gtk/gdk-2.14.defs
+++ b/gtk/gdk-2.14.defs
@@ -128,6 +128,32 @@
+;; From gdk-pixbuf-core.h
+
+(define-function pixbuf_new_from_stream
+ (c-name "gdk_pixbuf_new_from_stream")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GInputStream*" "stream")
+ '("GCancellable*" "cancellable" (null-ok) (default "NULL"))
+ '("GError**" "error")
+ )
+)
+
+(define-function pixbuf_new_from_stream_at_scale
+ (c-name "gdk_pixbuf_new_from_stream_at_scale")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GInputStream*" "stream")
+ '("gint" "width" (default "-1"))
+ '("gint" "height" (default "-1"))
+ '("gboolean" "preserve_aspect_ratio" (default "1"))
+ '("GCancellable*" "cancellable" (null-ok) (default "NULL"))
+ '("GError**" "error")
+ )
+)
+
+
(ifdef GDK_TARGET_X11
;; From gdkx.h
diff --git a/gtk/gdk.override b/gtk/gdk.override
index 8c3eb35e..01015463 100644
--- a/gtk/gdk.override
+++ b/gtk/gdk.override
@@ -95,6 +95,8 @@ import pango.Layout as PyPangoLayout_Type
import pango.Renderer as PyPangoRenderer_Type
import gio.AppLaunchContext as PyGAppLaunchContext_Type for GAppLaunchContext
import gio.Icon as PyGIcon_Type for GIcon
+import gio.InputStream as PyGInputStream_Type
+import gio.Cancellable as PyGCancellable_Type
%%
ignore
gdk_window_set_debug_updates