From f84234065374557687a25d8670de4ef5899ecf4f Mon Sep 17 00:00:00 2001 From: riccardom Date: Sun, 1 Aug 2010 14:35:15 +0000 Subject: [PATCH] gtk: kill gdk_draw_* apis that will go away in gtk 2.22 So it's summer cleanup in gnome land and some functions will go away in the next gtk release. So remove the usage. Reference: http://blogs.gnome.org/otte/2010/07/27/rendering-cleanup/ --- desmume/src/gtk/main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp index a95d9d7a0..90a82447b 100644 --- a/desmume/src/gtk/main.cpp +++ b/desmume/src/gtk/main.cpp @@ -1128,6 +1128,7 @@ static gboolean ExposeDrawingArea (GtkWidget *widget, GdkEventExpose *event, gpo { GdkPixbuf *resizedPixbuf, *drawPixbuf; guchar rgb[SCREENS_PIXEL_SIZE*SCREEN_BYTES_PER_PIXEL]; + cairo_t *cr; gfloat vratio, hratio, nscreen_ratio; gint daW, daH, imgW, imgH, screenW, screenH, gapW, gapH; @@ -1215,15 +1216,15 @@ static gboolean ExposeDrawingArea (GtkWidget *widget, GdkEventExpose *event, gpo drawPixbuf = resizedPixbuf; } - gdk_draw_pixbuf(widget->window, NULL, drawPixbuf, 0, 0, primaryOffsetX, primaryOffsetY, screenW, screenH, - GDK_RGB_DITHER_NONE, 0,0); + cr = gdk_cairo_create(widget->window); + gdk_cairo_set_source_pixbuf(cr, drawPixbuf, 0, 0); if (nds_screen.orientation != ORIENT_SINGLE) { - gdk_draw_pixbuf(widget->window, NULL, drawPixbuf, secondaryPixbufOffsetX, secondaryPixbufOffsetY, secondaryOffsetX, secondaryOffsetY, screenW, screenH, - GDK_RGB_DITHER_NONE, 0,0); + gdk_cairo_set_source_pixbuf(cr, drawPixbuf, primaryOffsetX, primaryOffsetY); } - g_object_unref(drawPixbuf); + cairo_paint(cr); + cairo_destroy(cr); return TRUE; }