From aa04eae7b7366f4d4c2c5a9be19178d41af2565b Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 16 Nov 2004 01:20:47 +0000 Subject: [PATCH] Output Makefile for the pixbuf engine directory. Mon Nov 15 17:17:17 2004 Manish Singh * 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). --- ChangeLog | 12 +++++++++++ ChangeLog.pre-2-10 | 12 +++++++++++ ChangeLog.pre-2-6 | 12 +++++++++++ ChangeLog.pre-2-8 | 12 +++++++++++ configure.in | 1 + gtk/gtk.symbols | 2 ++ modules/engines/pixbuf/pixbuf-draw.c | 2 ++ modules/engines/pixbuf/pixbuf-render.c | 29 +++++++++++++------------- 8 files changed, 67 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 086ebfeb33..83248c621a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Nov 15 17:17:17 2004 Manish Singh + + * 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). + 2004-11-15 Matthias Clasen * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 086ebfeb33..83248c621a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Mon Nov 15 17:17:17 2004 Manish Singh + + * 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). + 2004-11-15 Matthias Clasen * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 086ebfeb33..83248c621a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Mon Nov 15 17:17:17 2004 Manish Singh + + * 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). + 2004-11-15 Matthias Clasen * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 086ebfeb33..83248c621a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Mon Nov 15 17:17:17 2004 Manish Singh + + * 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). + 2004-11-15 Matthias Clasen * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter diff --git a/configure.in b/configure.in index f3cc063a3a..9d82b8490f 100644 --- a/configure.in +++ b/configure.in @@ -1673,6 +1673,7 @@ gtk/xdgmime/Makefile modules/Makefile modules/input/Makefile modules/engines/Makefile +modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile modules/engines/ms-windows/Theme/gtk-2.0/Makefile diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 94c8e61aa2..66145ad9ea 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -196,6 +196,7 @@ gtk_button_clicked gtk_button_enter gtk_button_get_alignment gtk_button_get_focus_on_click +gtk_button_get_image gtk_button_get_label gtk_button_get_relief gtk_button_get_type @@ -210,6 +211,7 @@ gtk_button_pressed gtk_button_released gtk_button_set_alignment gtk_button_set_focus_on_click +gtk_button_set_image gtk_button_set_label gtk_button_set_relief gtk_button_set_use_stock 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 #include +#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); } }