diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-11-22 14:26:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:52:01 +0000 |
commit | 7c9c78bebd074d72270adaa8baed860bf554ad82 (patch) | |
tree | e28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch | |
parent | 8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff) | |
download | poky-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz |
gtk+: Update to 2.22.1
Remove disable-gio-png-sniff-test.diff as it alreay in upstream. gdk-pixbuf in
gtk+ is separated as another stand-alone package, so remove it.
In future need only pick up stable version(even number like 2.20.x, 2.22.x).
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch new file mode 100644 index 0000000000..92ce643125 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Index: gtk/gtkcellrenderer.c | ||
2 | =================================================================== | ||
3 | --- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800 | ||
4 | +++ gtk/gtkcellrenderer.c 2010-06-22 17:21:25.000000000 +0800 | ||
5 | @@ -566,6 +566,7 @@ | ||
6 | |||
7 | if (cell->cell_background_set && !selected) | ||
8 | { | ||
9 | +#ifdef USE_CAIRO_INTERNALLY | ||
10 | cairo_t *cr = gdk_cairo_create (window); | ||
11 | |||
12 | gdk_cairo_rectangle (cr, background_area); | ||
13 | @@ -573,6 +574,16 @@ | ||
14 | cairo_fill (cr); | ||
15 | |||
16 | cairo_destroy (cr); | ||
17 | +#else | ||
18 | + GdkGC *gc; | ||
19 | + | ||
20 | + gc = gdk_gc_new (window); | ||
21 | + gdk_gc_set_rgb_fg_color (gc, &priv->cell_background); | ||
22 | + gdk_draw_rectangle (window, gc, TRUE, | ||
23 | + background_area->x, background_area->y, | ||
24 | + background_area->width, background_area->height); | ||
25 | + g_object_unref (gc); | ||
26 | +#endif | ||
27 | } | ||
28 | |||
29 | GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, | ||