diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-04-18 15:11:01 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-04-18 15:11:01 +0000 |
| commit | 9725c8d752fff8989a5496d58ef090a6858d476f (patch) | |
| tree | c27e52445f1e421102e2b0a6ed956609c0716fb8 /gdk | |
| parent | 9bd53c868336b97bfa3e9c79450bd0e4ce668c21 (diff) | |
| download | gtk+-9725c8d752fff8989a5496d58ef090a6858d476f.tar.gz | |
gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c Update to
2005-04-18 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c
* gdk/gdkcolor.c gdk/gdkwindow.c gdk/gdkpixbuf-render.c
gdk/gdkpango.c tests/testcairo.c: Update to new Cairo API for
setting color and opacity. (#301066, Vincent Noel)
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkcolor.c | 8 | ||||
| -rw-r--r-- | gdk/gdkpango.c | 12 | ||||
| -rw-r--r-- | gdk/gdkpixbuf-render.c | 2 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index f33ff790c4..8c7b4a3841 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -383,10 +383,10 @@ void gdk_cairo_set_source_color (cairo_t *cr, GdkColor *color) { - cairo_set_rgb_color (cr, - color->red / 65535., - color->green / 65535., - color->blue / 65535.); + cairo_set_source_rgb (cr, + color->red / 65535., + color->green / 65535., + color->blue / 65535.); } #define __GDK_COLOR_C__ diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 1fe43e7071..bf5b517cf2 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -129,7 +129,7 @@ emboss_context (cairo_t *cr) tmp_matrix.y0 += 1.0; cairo_set_matrix (cr, &tmp_matrix); - cairo_set_rgb_color (cr, 1.0, 1.0, 1.0); + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); } static void @@ -141,10 +141,10 @@ set_part_color (GdkPangoRenderer *gdk_renderer, part); if (color) { - cairo_set_rgb_color (cr, - color->red / 65535., - color->green / 65535., - color->blue / 65535.); + cairo_set_source_rgb (cr, + color->red / 65535., + color->green / 65535., + color->blue / 65535.); } else { @@ -224,7 +224,7 @@ create_cairo_context (GdkPangoRenderer *gdk_renderer, cairo_matrix_destroy (matrix); } - cairo_set_pattern (cr, pattern); + cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); } else diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c index e88e5a6ad5..6e3891f758 100644 --- a/gdk/gdkpixbuf-render.c +++ b/gdk/gdkpixbuf-render.c @@ -433,7 +433,7 @@ gdk_pixbuf_set_as_cairo_source (GdkPixbuf *pixbuf, cairo_pattern_set_matrix (pattern, matrix); cairo_matrix_destroy (matrix); - cairo_set_pattern (cr, pattern); + cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); } diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 54a0f00010..03829181bc 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1755,7 +1755,7 @@ gdk_window_set_bg_pattern (GdkWindow *window, } cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - cairo_set_pattern (cr, pattern); + cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); } else |