summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-06-28 14:44:12 +0200
committerBenjamin Otte <otte@redhat.com>2010-06-29 16:06:38 +0200
commit3e96cfe8fcfeedabc09b2a8b3aa87007a3b5a2a0 (patch)
treea5b8a39ad674b77e2d1beeb234c0cdd48d218b20 /gtk/gtklabel.c
parent52200eee01cc055adaefb678d6c6f04455d1a593 (diff)
downloadgtk+-3e96cfe8fcfeedabc09b2a8b3aa87007a3b5a2a0.tar.gz
Deprecate the GdkRegion API
Includes fixing all callers to use the cairo region API instead. This is usually just replacing the function names, the only difference is gdk_region_get_rectangles() being replaced by cairo_region_num_rectangles() and cairo_region_get_rectangle() which required a bit more work. https://bugzilla.gnome.org/show_bug.cgi?id=613284
Diffstat (limited to 'gtk/gtklabel.c')
-rw-r--r--gtk/gtklabel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f35910784c..41c4a6fb98 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4015,7 +4015,7 @@ gtk_label_expose (GtkWidget *widget,
x, y,
range,
1);
- gdk_region_intersect (clip, event->region);
+ cairo_region_intersect (clip, event->region);
/* FIXME should use gtk_paint, but it can't use a clip
* region
@@ -4036,7 +4036,7 @@ gtk_label_expose (GtkWidget *widget,
&widget->style->base[state]);
gdk_gc_set_clip_region (widget->style->black_gc, NULL);
- gdk_region_destroy (clip);
+ cairo_region_destroy (clip);
}
else if (info)
{
@@ -4086,7 +4086,7 @@ gtk_label_expose (GtkWidget *widget,
gdk_color_free (visited_link_color);
gdk_gc_set_clip_region (widget->style->black_gc, NULL);
- gdk_region_destroy (clip);
+ cairo_region_destroy (clip);
}
if (focus_link && gtk_widget_has_focus (widget))
@@ -4098,13 +4098,13 @@ gtk_label_expose (GtkWidget *widget,
x, y,
range,
1);
- gdk_region_get_clipbox (clip, &rect);
+ cairo_region_get_extents (clip, &rect);
gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget),
&event->area, widget, "label",
rect.x, rect.y, rect.width, rect.height);
- gdk_region_destroy (clip);
+ cairo_region_destroy (clip);
}
}
}