Adapt to uscore-ification of gtktextiterprivate

[~andy/gtk] / gtk / gtklabel.c

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index ab5c2cf4c13ee55c5d771d2339233712d0dc9604..e443c2dfa7554d7114b722a40f4f1e2bf264b60e 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -721,12 +721,6 @@ gtk_label_expose (GtkWidget      *widget,
        xalign = misc->xalign;
       else
        xalign = 1. - misc->xalign;
-
-      /*
-       * GC Clipping
-       */
-      gdk_gc_set_clip_rectangle (widget->style->white_gc, &event->area);
-      gdk_gc_set_clip_rectangle (widget->style->fg_gc[widget->state], &event->area);
       
       x = floor (widget->allocation.x + (gint)misc->xpad
                 + ((widget->allocation.width - widget->requisition.width) * xalign)
@@ -736,10 +730,15 @@ gtk_label_expose (GtkWidget      *widget,
                 + ((widget->allocation.height - widget->requisition.height) * misc->yalign)
                 + 0.5);
 
-      gdk_draw_layout (widget->window, widget->style->fg_gc [widget->state], x, y, label->layout);
       
-      gdk_gc_set_clip_rectangle (widget->style->white_gc, NULL);
-      gdk_gc_set_clip_rectangle (widget->style->fg_gc[widget->state], NULL);
+      gtk_paint_layout (widget->style,
+                        widget->window,
+                        GTK_WIDGET_STATE (widget),
+                        &event->area,
+                        widget,
+                        "label",
+                        x, y,
+                        label->layout);
     }
 
   return TRUE;