AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Output Makefile for the pixbuf engine directory.

Browse Source 
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).
This commit is contained in:
Manish Singh 2004-11-16 01:20:47 +00:00 committed by Manish Singh
parent 22456af9b0
commit aa04eae7b7
8 changed files with 67 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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).
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
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).
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
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).
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
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).
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter

1
configure.in
View File

@ -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

2
gtk/gtk.symbols
View File

@ -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

2
modules/engines/pixbuf/pixbuf-draw.c
View File

@ -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"

29
modules/engines/pixbuf/pixbuf-render.c
View File

@ -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);
}
}