diff options
| author | Manish Singh <yosh@gimp.org> | 2004-11-16 01:20:47 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2004-11-16 01:20:47 +0000 |
| commit | aa04eae7b7366f4d4c2c5a9be19178d41af2565b (patch) | |
| tree | 69b2c6b87d2b362a73871fc4e83748f77858db80 /modules | |
| parent | 22456af9b0843b4d22d7e8f910bb7dd8f66a6366 (diff) | |
| download | gtk+-aa04eae7b7366f4d4c2c5a9be19178d41af2565b.tar.gz | |
Output Makefile for the pixbuf engine directory.
Mon Nov 15 17:17:17 2004 Manish Singh <yosh@gimp.org>
* configure.in: Output Makefile for the pixbuf engine directory.
* gtk/gtk.symbols: Add gtk_button_{get,set}_image.
* modules/engines/pixbuf/pixbuf-render.c: Replace usage of deprecated
functions.
* modules/engines/pixbuf/pixbuf-draw.c: undef GDK_DISABLE_DEPRECATED
for gdk_draw_string (ick).
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/engines/pixbuf/pixbuf-draw.c | 2 | ||||
| -rw-r--r-- | modules/engines/pixbuf/pixbuf-render.c | 29 |
2 files changed, 16 insertions, 15 deletions
diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c index cababbe38a..8b220da0a4 100644 --- a/modules/engines/pixbuf/pixbuf-draw.c +++ b/modules/engines/pixbuf/pixbuf-draw.c @@ -23,6 +23,8 @@ #include <math.h> #include <string.h> +#undef GDK_DISABLE_DEPRECATED + #include "pixbuf.h" #include "pixbuf-rc-style.h" #include "pixbuf-style.h" diff --git a/modules/engines/pixbuf/pixbuf-render.c b/modules/engines/pixbuf/pixbuf-render.c index 08baf939b4..03ec060834 100644 --- a/modules/engines/pixbuf/pixbuf-render.c +++ b/modules/engines/pixbuf/pixbuf-render.c @@ -424,13 +424,12 @@ pixbuf_render (GdkPixbuf *src, 128); } - gdk_pixbuf_render_to_drawable_alpha (tmp_pixbuf, window, - x_offset, y_offset, - rect.x, rect.y, - rect.width, rect.height, - GDK_PIXBUF_ALPHA_FULL, 128, - GDK_RGB_DITHER_NORMAL, - 0, 0); + gdk_draw_pixbuf (window, NULL, tmp_pixbuf, + x_offset, y_offset, + rect.x, rect.y, + rect.width, rect.height, + GDK_RGB_DITHER_NORMAL, + 0, 0); g_object_unref (tmp_pixbuf); } @@ -778,13 +777,13 @@ theme_pixbuf_render (ThemePixbuf *theme_pb, pixbuf_height, -1); tmp_gc = gdk_gc_new (tmp_pixmap); - gdk_pixbuf_render_to_drawable (pixbuf, tmp_pixmap, tmp_gc, - 0, 0, - 0, 0, - pixbuf_width, pixbuf_height, - GDK_RGB_DITHER_NORMAL, - 0, 0); - gdk_gc_unref (tmp_gc); + gdk_draw_pixbuf (tmp_pixmap, tmp_gc, pixbuf, + 0, 0, + 0, 0, + pixbuf_width, pixbuf_height, + GDK_RGB_DITHER_NORMAL, + 0, 0); + g_object_unref (tmp_gc); gc_values.fill = GDK_TILED; gc_values.tile = tmp_pixmap; @@ -796,7 +795,7 @@ theme_pixbuf_render (ThemePixbuf *theme_pb, else gdk_draw_rectangle (window, tmp_gc, TRUE, x, y, width, height); - gdk_gc_unref (tmp_gc); + g_object_unref (tmp_gc); g_object_unref (tmp_pixmap); } } |