[gtk+/rendering-cleanup-next: 150/155] API: Rename gtk_cairo_paint_*() to gtk_paint_*()



commit a28470873da5243807830b01458c69cb5134daef
Author: Benjamin Otte <otte redhat com>
Date:   Sat Sep 11 01:30:27 2010 +0200

    API: Rename gtk_cairo_paint_*() to gtk_paint_*()
    
    Large patch, but just renaming.
    Indentation should still mostly be correct because I took care of
    keeping the indentation for this function name.

 demos/gtk-demo/offscreen_window.c  |    2 +-
 demos/gtk-demo/offscreen_window2.c |    2 +-
 gtk/gtkaccellabel.c                |    2 +-
 gtk/gtkarrow.c                     |    2 +-
 gtk/gtkbutton.c                    |    6 +-
 gtk/gtkcalendar.c                  |   10 +-
 gtk/gtkcellrendererprogress.c      |   10 +-
 gtk/gtkcellrendererspinner.c       |    2 +-
 gtk/gtkcellrenderertext.c          |    2 +-
 gtk/gtkcellrenderertoggle.c        |    4 +-
 gtk/gtkcheckbutton.c               |    8 +-
 gtk/gtkcheckmenuitem.c             |    4 +-
 gtk/gtkcombobox.c                  |    2 +-
 gtk/gtkdnd-quartz.c                |    2 +-
 gtk/gtkdnd.c                       |    2 +-
 gtk/gtkentry.c                     |   10 +-
 gtk/gtkeventbox.c                  |    2 +-
 gtk/gtkexpander.c                  |    6 +-
 gtk/gtkfilechooserentry.c          |    2 +-
 gtk/gtkframe.c                     |    6 +-
 gtk/gtkhandlebox.c                 |   10 +-
 gtk/gtkhsv.c                       |    4 +-
 gtk/gtkiconview.c                  |   16 +-
 gtk/gtkinfobar.c                   |    2 +-
 gtk/gtklabel.c                     |    4 +-
 gtk/gtkmenu.c                      |   12 +-
 gtk/gtkmenubar.c                   |    2 +-
 gtk/gtkmenuitem.c                  |    8 +-
 gtk/gtknotebook.c                  |   12 +-
 gtk/gtkpaned.c                     |    2 +-
 gtk/gtkprogressbar.c               |   12 +-
 gtk/gtkradiobutton.c               |    4 +-
 gtk/gtkrange.c                     |   14 +-
 gtk/gtkruler.c                     |    6 +-
 gtk/gtkscale.c                     |   10 +-
 gtk/gtkscrolledwindow.c            |    2 +-
 gtk/gtkseparator.c                 |    8 +-
 gtk/gtkspinbutton.c                |    6 +-
 gtk/gtkspinner.c                   |    2 +-
 gtk/gtkstatusbar.c                 |    2 +-
 gtk/gtkstyle.c                     |  458 ++++++++++++++++++------------------
 gtk/gtkstyle.h                     |   40 ++--
 gtk/gtktearoffmenuitem.c           |    6 +-
 gtk/gtktextview.c                  |    2 +-
 gtk/gtktoolbar.c                   |   10 +-
 gtk/gtktoolitemgroup.c             |    2 +-
 gtk/gtktooltip.c                   |    2 +-
 gtk/gtktrayicon-x11.c              |    2 +-
 gtk/gtktreeview.c                  |   18 +-
 gtk/gtktreeviewcolumn.c            |    2 +-
 gtk/gtkviewport.c                  |    4 +-
 gtk/gtkwindow.c                    |    2 +-
 tests/gtkoffscreenbox.c            |    4 +-
 tests/testgtk.c                    |    2 +-
 54 files changed, 389 insertions(+), 389 deletions(-)
---
diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c
index c269024..62259ec 100644
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -513,7 +513,7 @@ gtk_rotated_bin_draw (GtkWidget *widget,
     {
       gdk_drawable_get_size (bin->offscreen_window, &width, &height);
 
-      gtk_cairo_paint_flat_box (gtk_widget_get_style (widget), cr,
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "blah",
                           0, 0, width, height);
diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c
index a6ad8dd..81279e2 100644
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -423,7 +423,7 @@ gtk_mirror_bin_draw (GtkWidget *widget,
     {
       gdk_drawable_get_size (bin->offscreen_window, &width, &height);
 
-      gtk_cairo_paint_flat_box (gtk_widget_get_style (widget), cr,
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "blah",
                           0, 0, width, height);
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index b8619eb..6305b57 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -457,7 +457,7 @@ gtk_accel_label_draw (GtkWidget *widget,
 
 	  y += get_first_baseline (label_layout) - get_first_baseline (accel_layout) - allocation.y;
 
-          gtk_cairo_paint_layout (gtk_widget_get_style (widget),
+          gtk_paint_layout (gtk_widget_get_style (widget),
                             cr,
                             gtk_widget_get_state (widget),
 			    FALSE,
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index 4eab60a..2b93803 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -364,7 +364,7 @@ gtk_arrow_draw (GtkWidget *widget,
         shadow_type = GTK_SHADOW_ETCHED_IN;
     }
 
-  gtk_cairo_paint_arrow (gtk_widget_get_style (widget), cr,
+  gtk_paint_arrow (gtk_widget_get_style (widget), cr,
                    state, shadow_type,
                    widget, "arrow",
                    effective_arrow_type, TRUE,
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index fe1e84a..d27904f 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1571,7 +1571,7 @@ _gtk_button_paint (GtkButton          *button,
   if (gtk_widget_has_default (widget) &&
       GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL)
     {
-      gtk_cairo_paint_box (style, cr,
+      gtk_paint_box (style, cr,
                      GTK_STATE_NORMAL, GTK_SHADOW_IN,
                      widget, "buttondefault",
                      x, y, width, height);
@@ -1599,7 +1599,7 @@ _gtk_button_paint (GtkButton          *button,
 
   if (button->relief != GTK_RELIEF_NONE || button->depressed ||
       gtk_widget_get_state(widget) == GTK_STATE_PRELIGHT)
-    gtk_cairo_paint_box (style, cr,
+    gtk_paint_box (style, cr,
                    state_type,
                    shadow_type, widget, "button",
                    x, y, width, height);
@@ -1637,7 +1637,7 @@ _gtk_button_paint (GtkButton          *button,
           y += child_displacement_y;
         }
 
-      gtk_cairo_paint_focus (style, cr,
+      gtk_paint_focus (style, cr,
                        gtk_widget_get_state (widget),
                        widget, "button",
                        x, y, width, height);
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 554c752..c8e95de 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -2343,7 +2343,7 @@ calendar_paint_header (GtkCalendar *calendar, cairo_t *cr)
   max_month_width = priv->max_month_width;
   max_year_width = priv->max_year_width;
 
-  gtk_cairo_paint_shadow (style, cr,
+  gtk_paint_shadow (style, cr,
 		    GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 		    widget, "calendar",
 		    0, 0, header_width, priv->header_h);
@@ -2814,7 +2814,7 @@ calendar_paint_day (GtkCalendar *calendar,
       else
 	state = GTK_STATE_NORMAL;
 
-      gtk_cairo_paint_focus (style, cr,
+      gtk_paint_focus (style, cr,
 	               state, widget, "calendar-day",
 		       day_rect.x,     day_rect.y, 
 		       day_rect.width, day_rect.height);
@@ -2889,12 +2889,12 @@ calendar_paint_arrow (GtkCalendar *calendar,
       
       gdk_drawable_get_size (window, &width, &height);
       if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
-        gtk_cairo_paint_arrow (style, cr, state,
+        gtk_paint_arrow (style, cr, state,
 			 GTK_SHADOW_OUT, widget, "calendar",
 			 GTK_ARROW_LEFT, TRUE, 
 			 width/2 - 3, height/2 - 4, 8, 8);
       else 
-        gtk_cairo_paint_arrow (style, cr, state,
+        gtk_paint_arrow (style, cr, state,
 			 GTK_SHADOW_OUT, widget, "calendar",
 			 GTK_ARROW_RIGHT, TRUE, 
 			 width/2 - 4, height/2 - 4, 8, 8);
@@ -2913,7 +2913,7 @@ gtk_calendar_draw (GtkWidget *widget,
 
   if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
     {
-      gtk_cairo_paint_shadow (gtk_widget_get_style (widget), cr,
+      gtk_paint_shadow (gtk_widget_get_style (widget), cr,
                         gtk_widget_get_state (widget), GTK_SHADOW_IN,
                         widget, "calendar",
                         0, 0,
diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index f9cfba1..486075d 100644
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -557,7 +557,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer      *cell,
    * but some engines don't paint anything with that detail for
    * non-GtkProgressBar widgets.
    */
-  gtk_cairo_paint_box (style,
+  gtk_paint_box (style,
                        cr,
                        GTK_STATE_NORMAL, GTK_SHADOW_IN, 
                        widget, NULL,
@@ -604,7 +604,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer      *cell,
       clip.y = bar_position;
     }
 
-  gtk_cairo_paint_box (style,
+  gtk_paint_box (style,
                        cr,
                        GTK_STATE_SELECTED, GTK_SHADOW_OUT,
                        widget, "bar",
@@ -633,7 +633,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer      *cell,
       gdk_cairo_rectangle (cr, &clip);
       cairo_clip (cr);
 
-      gtk_cairo_paint_layout (style, cr,
+      gtk_paint_layout (style, cr,
                               GTK_STATE_SELECTED,
                               FALSE, widget, "progressbar",
                               x_pos, y_pos, 
@@ -658,7 +658,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer      *cell,
           gdk_cairo_rectangle (cr, &clip);
           cairo_clip (cr);
 
-          gtk_cairo_paint_layout (style, cr,
+          gtk_paint_layout (style, cr,
                                   GTK_STATE_NORMAL,
                                   FALSE, widget, "progressbar",
                                   x_pos, y_pos,
@@ -684,7 +684,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer      *cell,
           gdk_cairo_rectangle (cr, &clip);
           cairo_clip (cr);
 
-          gtk_cairo_paint_layout (style, cr,
+          gtk_paint_layout (style, cr,
                                   GTK_STATE_NORMAL,
                                   FALSE, widget, "progressbar",
                                   x_pos, y_pos,
diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index 2a0ad01..843d90f 100644
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -371,7 +371,7 @@ gtk_cell_renderer_spinner_render (GtkCellRenderer      *cellr,
         state = GTK_STATE_PRELIGHT;
     }
 
-  gtk_cairo_paint_spinner (gtk_widget_get_style (widget),
+  gtk_paint_spinner (gtk_widget_get_style (widget),
                            cr,
                            state,
                            widget,
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 0912c3e..e38aad0 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1750,7 +1750,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
   else if (priv->wrap_width == -1)
     pango_layout_set_width (layout, -1);
 
-  gtk_cairo_paint_layout (gtk_widget_get_style (widget),
+  gtk_paint_layout (gtk_widget_get_style (widget),
                           cr,
                           state,
                           TRUE,
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index e7433f2..d0e8f3a 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -374,7 +374,7 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer      *cell,
 
   if (priv->radio)
     {
-      gtk_cairo_paint_option (gtk_widget_get_style (widget),
+      gtk_paint_option (gtk_widget_get_style (widget),
                               cr,
                               state, shadow,
                               widget, "cellradio",
@@ -384,7 +384,7 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer      *cell,
     }
   else
     {
-      gtk_cairo_paint_check (gtk_widget_get_style (widget),
+      gtk_paint_check (gtk_widget_get_style (widget),
                              cr,
                              state, shadow,
                              widget, "cellcheck",
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index fe7713d..efad508 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -163,7 +163,7 @@ gtk_check_button_paint (GtkWidget    *widget,
           GtkAllocation child_allocation;
 
           gtk_widget_get_allocation (child, &child_allocation);
-          gtk_cairo_paint_focus (style, cr, state,
+          gtk_paint_focus (style, cr, state,
                            widget, "checkbutton",
                            child_allocation.x - allocation.x - focus_width - focus_pad,
                            child_allocation.y - allocation.y - focus_width - focus_pad,
@@ -172,7 +172,7 @@ gtk_check_button_paint (GtkWidget    *widget,
         }
       else
         {
-          gtk_cairo_paint_focus (style, cr, state,
+          gtk_paint_focus (style, cr, state,
                            widget, "checkbutton",
                            border_width,
                            border_width,
@@ -419,7 +419,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
   if (gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT)
     {
 
-      gtk_cairo_paint_flat_box (style, cr, GTK_STATE_PRELIGHT,
+      gtk_paint_flat_box (style, cr, GTK_STATE_PRELIGHT,
                           GTK_SHADOW_ETCHED_OUT, 
                           widget, "checkbutton",
                           border_width, border_width,
@@ -427,7 +427,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
                           allocation.height - (2 * border_width));
     }
 
-  gtk_cairo_paint_check (style, cr,
+  gtk_paint_check (style, cr,
                    state_type, shadow_type,
                    widget, "checkbutton",
                    x, y, indicator_size, indicator_size);
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 7ead339..428fd23 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -519,14 +519,14 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
 
 	  if (priv->draw_as_radio)
 	    {
-              gtk_cairo_paint_option (style, cr,
+              gtk_paint_option (style, cr,
 				state_type, shadow_type,
 				widget, "option",
 				x, y, indicator_size, indicator_size);
 	    }
 	  else
 	    {
-              gtk_cairo_paint_check (style, cr,
+              gtk_paint_check (style, cr,
 			       state_type, shadow_type,
 			       widget, "check",
 			       x, y, indicator_size, indicator_size);
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 347bb67..5c2c4e6 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2488,7 +2488,7 @@ gtk_combo_box_draw (GtkWidget *widget,
 
   if (priv->shadow_type != GTK_SHADOW_NONE)
     {
-      gtk_cairo_paint_shadow (gtk_widget_get_style (widget),
+      gtk_paint_shadow (gtk_widget_get_style (widget),
                         cr,
                         GTK_STATE_NORMAL, priv->shadow_type,
                         widget, "combobox",
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index be37bc4..fa7a557 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -349,7 +349,7 @@ gtk_drag_highlight_draw (GtkWidget *widget,
   int width = gtk_widget_get_allocated_width (widget);
   int height = gtk_widget_get_allocated_height (widget);
 
-  gtk_cairo_paint_shadow (gtk_widget_get_style (widget), cr,
+  gtk_paint_shadow (gtk_widget_get_style (widget), cr,
                     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
                     widget, "dnd",
                     0, 0, width, height);
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 21f4389..744b696 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1112,7 +1112,7 @@ gtk_drag_highlight_draw (GtkWidget *widget,
   int width = gtk_widget_get_allocated_width (widget);
   int height = gtk_widget_get_allocated_height (widget);
 
-  gtk_cairo_paint_shadow (gtk_widget_get_style (widget), cr,
+  gtk_paint_shadow (gtk_widget_get_style (widget), cr,
                     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
                     widget, "dnd",
                     0, 0, width, height);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 38c52e2..4015392 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3313,7 +3313,7 @@ gtk_entry_draw_frame (GtkWidget      *widget,
   state = gtk_widget_has_focus (widget) ?
     GTK_STATE_ACTIVE : gtk_widget_get_state (widget);
 
-  gtk_cairo_paint_shadow (style, cr,
+  gtk_paint_shadow (style, cr,
                     state, priv->shadow_type,
                     widget, "entry", x, y, width, height);
 
@@ -3327,7 +3327,7 @@ gtk_entry_draw_frame (GtkWidget      *widget,
       width += 2 * priv->focus_width;
       height += 2 * priv->focus_width;
 
-      gtk_cairo_paint_focus (style, cr,
+      gtk_paint_focus (style, cr,
                        gtk_widget_get_state (widget),
 		       widget, "entry",
 		       0, 0, width, height);
@@ -3445,7 +3445,7 @@ gtk_entry_draw_progress (GtkWidget      *widget,
   if (!gtk_widget_get_sensitive (widget))
     state = GTK_STATE_INSENSITIVE;
 
-  gtk_cairo_paint_box (gtk_widget_get_style (widget), cr,
+  gtk_paint_box (gtk_widget_get_style (widget), cr,
                  state, GTK_SHADOW_OUT,
                  widget, "entry-progress",
                  x, y,
@@ -3480,7 +3480,7 @@ gtk_entry_draw (GtkWidget *widget,
       gdk_window_get_position (entry->text_area, &x, &y);
       cairo_translate (cr, x, y);
 
-      gtk_cairo_paint_flat_box (style, cr,
+      gtk_paint_flat_box (style, cr,
 			  state, GTK_SHADOW_NONE,
 			  widget, "entry_bg",
 			  0, 0, width, height);
@@ -3515,7 +3515,7 @@ gtk_entry_draw (GtkWidget *widget,
           gdk_window_get_position (icon_info->window, &x, &y);
           cairo_translate (cr, x, y);
 
-          gtk_cairo_paint_flat_box (style, cr,
+          gtk_paint_flat_box (style, cr,
                               state, GTK_SHADOW_NONE,
                               widget, "entry_bg",
                               0, 0, width, height);
diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index 3ca697c..57f6204 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -563,7 +563,7 @@ gtk_event_box_draw (GtkWidget      *widget,
 {
   if (gtk_widget_get_has_window (widget) &&
       !gtk_widget_get_app_paintable (widget))
-    gtk_cairo_paint_flat_box (gtk_widget_get_style (widget),
+    gtk_paint_flat_box (gtk_widget_get_style (widget),
                         cr,
 			gtk_widget_get_state (widget),
                         GTK_SHADOW_NONE,
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index a152e7e..5d8b692 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -767,7 +767,7 @@ gtk_expander_paint_prelight (GtkExpander *expander, cairo_t *cr)
   area.height = MAX (area.height, expander_size + 2 * expander_spacing);
   area.height += !interior_focus ? (focus_width + focus_pad) * 2 : 0;
 
-  gtk_cairo_paint_flat_box (gtk_widget_get_style (widget),
+  gtk_paint_flat_box (gtk_widget_get_style (widget),
                       cr,
 		      GTK_STATE_PRELIGHT,
 		      GTK_SHADOW_ETCHED_OUT,
@@ -797,7 +797,7 @@ gtk_expander_paint (GtkExpander *expander, cairo_t *cr)
       gtk_expander_paint_prelight (expander, cr);
     }
 
-  gtk_cairo_paint_expander (gtk_widget_get_style (widget),
+  gtk_paint_expander (gtk_widget_get_style (widget),
 		      cr,
 		      state,
 		      widget,
@@ -886,7 +886,7 @@ gtk_expander_paint_focus (GtkExpander *expander,
       height = rect.height + 2 * focus_pad;
     }
 
-  gtk_cairo_paint_focus (gtk_widget_get_style (widget),
+  gtk_paint_focus (gtk_widget_get_style (widget),
                    cr,
                    gtk_widget_get_state (widget),
 		   widget, "expander",
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 4ca734f..104f61c 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -887,7 +887,7 @@ completion_feedback_window_draw_cb (GtkWidget *widget,
 
   GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
 
-  gtk_cairo_paint_flat_box (gtk_widget_get_style (chooser_entry->completion_feedback_window),
+  gtk_paint_flat_box (gtk_widget_get_style (chooser_entry->completion_feedback_window),
                       cr,
 		      GTK_STATE_NORMAL,
 		      GTK_SHADOW_OUT,
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index b62d78f..29d2af3 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -617,12 +617,12 @@ gtk_frame_draw (GtkWidget *widget,
       x2 = style->xthickness + (priv->child_allocation.width - priv->label_allocation.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD;
       /* If the label is completely over or under the frame we can omit the gap */
       if (priv->label_yalign == 0.0 || priv->label_yalign == 1.0)
-        gtk_cairo_paint_shadow (style, cr,
+        gtk_paint_shadow (style, cr,
                           state, priv->shadow_type,
                           widget, "frame",
                           x, y, width, height);
       else
-        gtk_cairo_paint_shadow_gap (style, cr,
+        gtk_paint_shadow_gap (style, cr,
                               state, priv->shadow_type,
                               widget, "frame",
                               x, y, width, height,
@@ -630,7 +630,7 @@ gtk_frame_draw (GtkWidget *widget,
                               x2, priv->label_allocation.width + 2 * LABEL_PAD);
     }
    else
-     gtk_cairo_paint_shadow (style, cr,
+     gtk_paint_shadow (style, cr,
                        state, priv->shadow_type,
                        widget, "frame",
                        x, y, width, height);
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index d295366..dda6df1 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -761,7 +761,7 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb,
   window = gtk_widget_get_window (widget);
   state = gtk_widget_get_state (widget);
 
-  gtk_cairo_paint_shadow (style,
+  gtk_paint_shadow (style,
 		    cr,
 		    state,
 		    GTK_SHADOW_ETCHED_IN,
@@ -772,7 +772,7 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb,
 		    height);
    if (handle_position == GTK_POS_LEFT ||
        handle_position == GTK_POS_RIGHT)
-     gtk_cairo_paint_hline (style,
+     gtk_paint_hline (style,
 		      cr,
 		      state,
 		      widget, "handlebox",
@@ -780,7 +780,7 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb,
 		      handle_position == GTK_POS_LEFT ? allocation_width : allocation_width - DRAG_HANDLE_SIZE,
 		      allocation_height / 2);
    else
-     gtk_cairo_paint_vline (style,
+     gtk_paint_vline (style,
 		      cr,
 		      state,
 		      widget, "handlebox",
@@ -933,7 +933,7 @@ gtk_handle_box_paint (GtkWidget      *widget,
 
   gdk_drawable_get_size (priv->bin_window, &width, &height);
 
-  gtk_cairo_paint_box (gtk_widget_get_style (widget),
+  gtk_paint_box (gtk_widget_get_style (widget),
                  cr,
                  gtk_widget_get_state (widget),
                  priv->shadow_type,
@@ -975,7 +975,7 @@ gtk_handle_box_paint (GtkWidget      *widget,
       break;
     }
 
-  gtk_cairo_paint_handle (gtk_widget_get_style (widget), cr,
+  gtk_paint_handle (gtk_widget_get_style (widget), cr,
                     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
                     widget, "handlebox",
                     rect.x, rect.y, rect.width, rect.height, 
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 67e026e..62b4182 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -1190,7 +1190,7 @@ paint_triangle (GtkHSV      *hsv,
 			    "focus-padding", &focus_pad,
 			    NULL);
 
-      gtk_cairo_paint_focus (gtk_widget_get_style (widget),
+      gtk_paint_focus (gtk_widget_get_style (widget),
                        cr,
 		       gtk_widget_get_state (widget),
 		       widget, detail,
@@ -1213,7 +1213,7 @@ gtk_hsv_draw (GtkWidget      *widget,
   paint_triangle (hsv, cr);
 
   if (gtk_widget_has_focus (widget) && priv->focus_on_ring)
-    gtk_cairo_paint_focus (gtk_widget_get_style (widget),
+    gtk_paint_focus (gtk_widget_get_style (widget),
                      cr,
 		     gtk_widget_get_state (widget),
 		     widget, NULL,
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 03254c7..62dc83c 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1623,7 +1623,7 @@ gtk_icon_view_draw (GtkWidget *widget,
       switch (dest_pos)
 	{
 	case GTK_ICON_VIEW_DROP_INTO:
-	  gtk_cairo_paint_focus (style,
+	  gtk_paint_focus (style,
                                  cr,
                                  state,
                                  widget,
@@ -1632,7 +1632,7 @@ gtk_icon_view_draw (GtkWidget *widget,
                                  dest_item->width, dest_item->height);
 	  break;
 	case GTK_ICON_VIEW_DROP_ABOVE:
-	  gtk_cairo_paint_focus (style,
+	  gtk_paint_focus (style,
                                  cr,
                                  state,
                                  widget,
@@ -1641,7 +1641,7 @@ gtk_icon_view_draw (GtkWidget *widget,
                                  dest_item->width, 2);
 	  break;
 	case GTK_ICON_VIEW_DROP_LEFT:
-	  gtk_cairo_paint_focus (style,
+	  gtk_paint_focus (style,
                                  cr,
                                  state,
                                  widget,
@@ -1650,7 +1650,7 @@ gtk_icon_view_draw (GtkWidget *widget,
                                  2, dest_item->height);
 	  break;
 	case GTK_ICON_VIEW_DROP_BELOW:
-	  gtk_cairo_paint_focus (style,
+	  gtk_paint_focus (style,
                                  cr,
                                  state,
                                  widget,
@@ -1659,7 +1659,7 @@ gtk_icon_view_draw (GtkWidget *widget,
                                  dest_item->width, 2);
 	  break;
 	case GTK_ICON_VIEW_DROP_RIGHT:
-	  gtk_cairo_paint_focus (style,
+	  gtk_paint_focus (style,
                                  cr,
                                  state,
                                  widget,
@@ -3208,7 +3208,7 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
 
   if (item->selected)
     {
-      gtk_cairo_paint_flat_box (style,
+      gtk_paint_flat_box (style,
                           cr,
                           GTK_STATE_SELECTED,
                           GTK_SHADOW_NONE,
@@ -3258,7 +3258,7 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
 
           if (i == icon_view->priv->cursor_cell)
             {
-              gtk_cairo_paint_focus (style,
+              gtk_paint_focus (style,
                                cr,
                                GTK_STATE_NORMAL,
                                widget,
@@ -3275,7 +3275,7 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
        * around the whole item.
        */
       if (icon_view->priv->cursor_cell < 0)
-        gtk_cairo_paint_focus (style,
+        gtk_paint_focus (style,
                          cr,
                          GTK_STATE_NORMAL,
                          widget,
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 4cddc3c..a907b22 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -314,7 +314,7 @@ gtk_info_bar_draw (GtkWidget      *widget,
 
       detail = type_detail[priv->message_type];
 
-      gtk_cairo_paint_box (gtk_widget_get_style (widget),
+      gtk_paint_box (gtk_widget_get_style (widget),
                      cr,
                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 278ad8c..ea27460 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4081,7 +4081,7 @@ gtk_label_draw (GtkWidget *widget,
       x -= allocation.x;
       y -= allocation.y;
 
-      gtk_cairo_paint_layout (style,
+      gtk_paint_layout (style,
                         cr,
                         gtk_widget_get_state (widget),
 			FALSE,
@@ -4203,7 +4203,7 @@ gtk_label_draw (GtkWidget *widget,
                                                        1);
               cairo_region_get_extents (clip, &rect);
 
-              gtk_cairo_paint_focus (style, cr, gtk_widget_get_state (widget),
+              gtk_paint_focus (style, cr, gtk_widget_get_state (widget),
                                widget, "label",
                                rect.x, rect.y, rect.width, rect.height);
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 11deafe..ce851c5 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2911,7 +2911,7 @@ gtk_menu_draw (GtkWidget *widget,
       gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
       arrow_size = arrow_scaling * arrow_space;
 
-      gtk_cairo_paint_box (style,
+      gtk_paint_box (style,
 		     cr,
 		     GTK_STATE_NORMAL,
 		     GTK_SHADOW_OUT,
@@ -2922,7 +2922,7 @@ gtk_menu_draw (GtkWidget *widget,
 
       if (menu->upper_arrow_visible && !menu->tearoff_active)
 	{
-	  gtk_cairo_paint_box (style,
+	  gtk_paint_box (style,
 			 cr,
 			 priv->upper_arrow_state,
                          GTK_SHADOW_OUT,
@@ -2932,7 +2932,7 @@ gtk_menu_draw (GtkWidget *widget,
                          upper.width,
                          upper.height);
 
-	  gtk_cairo_paint_arrow (style,
+	  gtk_paint_arrow (style,
 			   cr,
 			   priv->upper_arrow_state,
 			   GTK_SHADOW_OUT,
@@ -2946,7 +2946,7 @@ gtk_menu_draw (GtkWidget *widget,
 
       if (menu->lower_arrow_visible && !menu->tearoff_active)
 	{
-	  gtk_cairo_paint_box (style,
+	  gtk_paint_box (style,
 			 cr,
 			 priv->lower_arrow_state,
                          GTK_SHADOW_OUT,
@@ -2956,7 +2956,7 @@ gtk_menu_draw (GtkWidget *widget,
                          lower.width,
                          lower.height);
 
-	  gtk_cairo_paint_arrow (style,
+	  gtk_paint_arrow (style,
 			   cr,
 			   priv->lower_arrow_state,
 			   GTK_SHADOW_OUT,
@@ -2988,7 +2988,7 @@ gtk_menu_draw (GtkWidget *widget,
           y -= arrow_border.top;
         }
 
-      gtk_cairo_paint_box (style,
+      gtk_paint_box (style,
 		     cr,
 		     GTK_STATE_NORMAL,
 		     GTK_SHADOW_OUT,
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index fe27e38..57069a2 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -522,7 +522,7 @@ gtk_menu_bar_draw (GtkWidget *widget,
 
   border = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-  gtk_cairo_paint_box (gtk_widget_get_style (widget),
+  gtk_paint_box (gtk_widget_get_style (widget),
                  cr,
                  gtk_widget_get_state (widget),
                  get_shadow_type (GTK_MENU_BAR (widget)),
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index bab9439..763ef2f 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1536,7 +1536,7 @@ gtk_menu_item_draw (GtkWidget *widget,
       gtk_widget_style_get (widget,
                             "selected-shadow-type", &selected_shadow_type,
                             NULL);
-      gtk_cairo_paint_box (style,
+      gtk_paint_box (style,
                      cr,
                      GTK_STATE_PRELIGHT,
                      selected_shadow_type,
@@ -1577,7 +1577,7 @@ gtk_menu_item_draw (GtkWidget *widget,
 
       arrow_y = y + (h - arrow_size) / 2;
 
-      gtk_cairo_paint_arrow (style, cr,
+      gtk_paint_arrow (style, cr,
                        state_type, shadow_type, 
                        widget, "menuitem", 
                        arrow_type, TRUE,
@@ -1597,7 +1597,7 @@ gtk_menu_item_draw (GtkWidget *widget,
                             NULL);
 
       if (wide_separators)
-        gtk_cairo_paint_box (style, cr,
+        gtk_paint_box (style, cr,
                        GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_OUT,
                        widget, "hseparator",
                        horizontal_padding + style->xthickness,
@@ -1605,7 +1605,7 @@ gtk_menu_item_draw (GtkWidget *widget,
                        width - 2 * (horizontal_padding + style->xthickness),
                        separator_height);
       else
-        gtk_cairo_paint_hline (style, cr,
+        gtk_paint_hline (style, cr,
                          GTK_STATE_NORMAL, widget, "menuitem",
                          horizontal_padding + style->xthickness,
                          width - horizontal_padding - style->xthickness - 1,
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 1ab13dc..e9ea067 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3303,7 +3303,7 @@ on_drag_icon_draw (GtkWidget *widget,
   gtk_widget_size_request (widget, &requisition);
   gap_pos = get_tab_gap_pos (GTK_NOTEBOOK (notebook));
 
-  gtk_cairo_paint_extension (gtk_widget_get_style (notebook),
+  gtk_paint_extension (gtk_widget_get_style (notebook),
                        cr,
 		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 		       widget, "tab",
@@ -4835,7 +4835,7 @@ gtk_notebook_paint (GtkWidget    *widget,
 
   if (priv->show_border && (!priv->show_tabs || !priv->children))
     {
-      gtk_cairo_paint_box (gtk_widget_get_style (widget), cr,
+      gtk_paint_box (gtk_widget_get_style (widget), cr,
 		     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 		     widget, "notebook",
 		     x, y, width, height);
@@ -4898,7 +4898,7 @@ gtk_notebook_paint (GtkWidget    *widget,
 	  break;
 	}
     }
-  gtk_cairo_paint_box_gap (gtk_widget_get_style (widget), cr,
+  gtk_paint_box_gap (gtk_widget_get_style (widget), cr,
 		     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 		     widget, "notebook",
 		     x, y, width, height,
@@ -4957,7 +4957,7 @@ gtk_notebook_draw_tab (GtkNotebook     *notebook,
   else 
     state_type = GTK_STATE_ACTIVE;
 
-  gtk_cairo_paint_extension (gtk_widget_get_style (widget), cr,
+  gtk_paint_extension (gtk_widget_get_style (widget), cr,
                        state_type, GTK_SHADOW_OUT,
                        widget, "tab",
                        page->allocation.x,
@@ -4975,7 +4975,7 @@ gtk_notebook_draw_tab (GtkNotebook     *notebook,
       gtk_widget_get_allocation (page->tab_label, &allocation);
       gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
 
-      gtk_cairo_paint_focus (gtk_widget_get_style (widget), cr,
+      gtk_paint_focus (gtk_widget_get_style (widget), cr,
                        gtk_widget_get_state (widget), widget, "tab",
                        allocation.x - focus_width,
                        allocation.y - focus_width,
@@ -5048,7 +5048,7 @@ gtk_notebook_draw_arrow (GtkNotebook      *notebook,
       arrow_size = scroll_arrow_hlength;
     }
  
-  gtk_cairo_paint_arrow (gtk_widget_get_style (widget),
+  gtk_paint_arrow (gtk_widget_get_style (widget),
                    cr, state_type, 
                    shadow_type, widget, "notebook",
                    arrow, TRUE, arrow_rect.x, arrow_rect.y, 
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index fbaccd8..636e973 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1145,7 +1145,7 @@ gtk_paned_draw (GtkWidget *widget,
       else
 	state = gtk_widget_get_state (widget);
 
-      gtk_cairo_paint_handle (gtk_widget_get_style (widget),
+      gtk_paint_handle (gtk_widget_get_style (widget),
                         cr,
 			state, GTK_SHADOW_NONE,
 			widget, "paned",
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 9ba9f38..a0fe787 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -685,7 +685,7 @@ gtk_progress_bar_paint_activity (GtkProgressBar *pbar,
       area.width = width - 2 * style->xthickness;
     }
 
-  gtk_cairo_paint_box (style,
+  gtk_paint_box (style,
                  cr,
                  GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
                  widget, "bar",
@@ -731,7 +731,7 @@ gtk_progress_bar_paint_continuous (GtkProgressBar *pbar,
         area.y = height - amount - area.y;
     }
 
-  gtk_cairo_paint_box (style,
+  gtk_paint_box (style,
                  cr,
                  GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
                  widget, "bar",
@@ -838,7 +838,7 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
       cairo_save (cr);
       gdk_cairo_rectangle (cr, &start_clip);
       cairo_clip (cr);
-      gtk_cairo_paint_layout (style,
+      gtk_paint_layout (style,
                         cr,
                         GTK_STATE_NORMAL,
                         FALSE,
@@ -854,7 +854,7 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
       cairo_save (cr);
       gdk_cairo_rectangle (cr, &end_clip);
       cairo_clip (cr);
-      gtk_cairo_paint_layout (style,
+      gtk_paint_layout (style,
                         cr,
                         GTK_STATE_NORMAL,
                         FALSE,
@@ -868,7 +868,7 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
   cairo_save (cr);
   gdk_cairo_rectangle (cr, &prelight_clip);
   cairo_clip (cr);
-  gtk_cairo_paint_layout (style,
+  gtk_paint_layout (style,
                     cr,
                     GTK_STATE_PRELIGHT,
                     FALSE,
@@ -905,7 +905,7 @@ gtk_progress_bar_draw (GtkWidget      *widget,
   width = gtk_widget_get_allocated_width (widget);
   height = gtk_widget_get_allocated_height (widget);
 
-  gtk_cairo_paint_box (style,
+  gtk_paint_box (style,
                  cr,
                  GTK_STATE_NORMAL, GTK_SHADOW_IN,
                  widget, "trough",
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 8b872fc..7dd37da 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -934,7 +934,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
 
   if (gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT)
     {
-      gtk_cairo_paint_flat_box (style, cr,
+      gtk_paint_flat_box (style, cr,
                           GTK_STATE_PRELIGHT,
                           GTK_SHADOW_ETCHED_OUT, 
                           widget, "checkbutton",
@@ -943,7 +943,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
                           allocation.height - (2 * border_width));
     }
 
-  gtk_cairo_paint_option (style, cr,
+  gtk_paint_option (style, cr,
                     state_type, shadow_type,
                     widget, "radiobutton",
                     x, y, indicator_size, indicator_size);
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 86a4d25..571e39f 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1825,7 +1825,7 @@ draw_stepper (GtkRange     *range,
   style = gtk_widget_get_style (widget);
   window = gtk_widget_get_window (widget);
 
-  gtk_cairo_paint_box (style, cr,
+  gtk_paint_box (style, cr,
 		 state_type, shadow_type,
 		 widget,
 		 gtk_range_get_stepper_detail (range, stepper),
@@ -1854,7 +1854,7 @@ draw_stepper (GtkRange     *range,
       arrow_y += arrow_displacement_y;
     }
 
-  gtk_cairo_paint_arrow (style, cr,
+  gtk_paint_arrow (style, cr,
                    state_type, shadow_type,
                    widget,
                    gtk_range_get_stepper_detail (range, stepper),
@@ -1986,7 +1986,7 @@ gtk_range_draw (GtkWidget      *widget,
                                    priv->slider.height / 2 -
                                    y);
 
-          gtk_cairo_paint_box (style, cr,
+          gtk_paint_box (style, cr,
                          sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
                          GTK_SHADOW_IN,
                          GTK_WIDGET (range),
@@ -1999,7 +1999,7 @@ gtk_range_draw (GtkWidget      *widget,
 	  else
 	    trough_change_pos_x = 0;
 
-          gtk_cairo_paint_box (style, cr,
+          gtk_paint_box (style, cr,
                          sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
                          GTK_SHADOW_IN,
                          GTK_WIDGET (range),
@@ -2058,7 +2058,7 @@ gtk_range_draw (GtkWidget      *widget,
 	  else
 	    fill_detail = "trough-fill-level";
 
-          gtk_cairo_paint_box (style, cr,
+          gtk_paint_box (style, cr,
                          sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
                          GTK_SHADOW_OUT,
                          GTK_WIDGET (range), fill_detail,
@@ -2067,7 +2067,7 @@ gtk_range_draw (GtkWidget      *widget,
 	}
 
       if (sensitive && gtk_widget_has_focus (widget))
-        gtk_cairo_paint_focus (style, cr,
+        gtk_paint_focus (style, cr,
                          gtk_widget_get_state (widget),
                          widget, "trough",
                          priv->range_rect.x,
@@ -2098,7 +2098,7 @@ gtk_range_draw (GtkWidget      *widget,
   cairo_clip (cr);
 
     {
-      gtk_cairo_paint_slider (style,
+      gtk_paint_slider (style,
                         cr,
                         state,
                         shadow_type,
diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index d00107f..3d2d21d 100644
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -701,7 +701,7 @@ gtk_ruler_real_draw_ticks (GtkRuler *ruler,
 
   gdk_cairo_set_source_color (cr, &style->fg[gtk_widget_get_state (widget)]);
 
-  gtk_cairo_paint_box (style, cr,
+  gtk_paint_box (style, cr,
                        GTK_STATE_NORMAL, GTK_SHADOW_OUT,
                        widget,
                        priv->orientation == GTK_ORIENTATION_HORIZONTAL ?
@@ -822,7 +822,7 @@ gtk_ruler_real_draw_ticks (GtkRuler *ruler,
                   pango_layout_set_text (layout, unit_str, -1);
                   pango_layout_get_extents (layout, &logical_rect, NULL);
 
-                  gtk_cairo_paint_layout (style,
+                  gtk_paint_layout (style,
                                           cr,
                                           gtk_widget_get_state (widget),
                                           FALSE,
@@ -838,7 +838,7 @@ gtk_ruler_real_draw_ticks (GtkRuler *ruler,
                       pango_layout_set_text (layout, unit_str + j, 1);
                       pango_layout_get_extents (layout, NULL, &logical_rect);
 
-                      gtk_cairo_paint_layout (style,
+                      gtk_paint_layout (style,
                                               cr,
                                               gtk_widget_get_state (widget),
                                               FALSE,
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 7d87bbd..73dabdb 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1066,7 +1066,7 @@ gtk_scale_draw (GtkWidget *widget,
                   max_pos = find_next_pos (widget, m, marks + i, GTK_POS_TOP, 0) - min_sep;
                 }
 
-              gtk_cairo_paint_vline (style, cr, state_type,
+              gtk_paint_vline (style, cr, state_type,
                                widget, "scale-mark", y1, y2, x1);
 
               if (mark->markup)
@@ -1092,7 +1092,7 @@ gtk_scale_draw (GtkWidget *widget,
                       min_pos_after = x3 + logical_rect.width + min_sep;
                     }
 
-                  gtk_cairo_paint_layout (style, cr, state_type,
+                  gtk_paint_layout (style, cr, state_type,
                                     FALSE, widget, "scale-mark",
                                     x3, y3, layout);
                 }
@@ -1115,7 +1115,7 @@ gtk_scale_draw (GtkWidget *widget,
                 }
               y1 = marks[i];
 
-              gtk_cairo_paint_hline (style, cr, state_type,
+              gtk_paint_hline (style, cr, state_type,
                                widget, "range-mark", x1, x2, y1);
 
               if (mark->markup)
@@ -1141,7 +1141,7 @@ gtk_scale_draw (GtkWidget *widget,
                       min_pos_after = y3 + logical_rect.height + min_sep;
                     }
 
-                  gtk_cairo_paint_layout (style, cr, state_type,
+                  gtk_paint_layout (style, cr, state_type,
                                     FALSE, widget, "scale-mark",
                                     x3, y3, layout);
                 }
@@ -1165,7 +1165,7 @@ gtk_scale_draw (GtkWidget *widget,
       gtk_scale_get_layout_offsets (scale, &x, &y);
       gtk_widget_get_allocation (widget, &allocation);
 
-      gtk_cairo_paint_layout (style,
+      gtk_paint_layout (style,
                         cr,
                         state_type,
 			FALSE,
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index d107ae3..719db34 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1122,7 +1122,7 @@ gtk_scrolled_window_draw (GtkWidget *widget,
           relative_allocation.height = gtk_widget_get_allocated_height (widget) - 2 * border_width;
         }
 
-      gtk_cairo_paint_shadow (style,
+      gtk_paint_shadow (style,
                         cr,
 			GTK_STATE_NORMAL, priv->shadow_type,
 			widget, "scrolled_window",
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 333efbf..e3c1e6b 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -214,13 +214,13 @@ gtk_separator_draw (GtkWidget    *widget,
   if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
       if (wide_separators)
-        gtk_cairo_paint_box (style, cr,
+        gtk_paint_box (style, cr,
                        gtk_widget_get_state (widget), GTK_SHADOW_ETCHED_OUT,
                        widget, "hseparator",
                        0, (height - separator_height) / 2,
                        width, separator_height);
       else
-        gtk_cairo_paint_hline (style, cr,
+        gtk_paint_hline (style, cr,
                          gtk_widget_get_state (widget),
                          widget, "hseparator",
                          0, width - 1,
@@ -229,13 +229,13 @@ gtk_separator_draw (GtkWidget    *widget,
   else
     {
       if (wide_separators)
-        gtk_cairo_paint_box (style, cr,
+        gtk_paint_box (style, cr,
                        gtk_widget_get_state (widget), GTK_SHADOW_ETCHED_OUT,
                        widget, "vseparator",
                        (width - separator_width) / 2, 0,
                        separator_width, height);
       else
-        gtk_cairo_paint_vline (style, cr,
+        gtk_paint_vline (style, cr,
                          gtk_widget_get_state (widget),
                          widget, "vseparator",
                          0, height - 1,
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 3c808f6..16dc7d7 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -811,7 +811,7 @@ gtk_spin_button_draw (GtkWidget      *widget,
 
           gdk_drawable_get_size (priv->panel, &width, &height);
 
-          gtk_cairo_paint_box (gtk_widget_get_style (widget), cr,
+          gtk_paint_box (gtk_widget_get_style (widget), cr,
                          state, shadow_type,
                          widget, "spinbutton",
                          0, 0, width, height);
@@ -920,7 +920,7 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
         }
     }
   
-  gtk_cairo_paint_box (style, cr,
+  gtk_paint_box (style, cr,
                  state_type, shadow_type,
                  widget,
                  (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
@@ -956,7 +956,7 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
   height = h;
   width = w;
 
-  gtk_cairo_paint_arrow (style, cr,
+  gtk_paint_arrow (style, cr,
                    state_type, shadow_type, 
                    widget, "spinbutton",
                    arrow_type, TRUE, 
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index e706b2e..ea6b90e 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -259,7 +259,7 @@ gtk_spinner_draw (GtkWidget *widget,
   if (!gtk_widget_is_sensitive (widget))
    state_type = GTK_STATE_INSENSITIVE;
 
-  gtk_cairo_paint_spinner (gtk_widget_get_style (widget),
+  gtk_paint_spinner (gtk_widget_get_style (widget),
                      cr,
                      state_type,
                      widget,
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index df88384..a3a040f 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -1003,7 +1003,7 @@ gtk_statusbar_draw (GtkWidget *widget,
       get_grip_rect (statusbar, FALSE, &rect);
 
       style = gtk_widget_get_style (widget);
-      gtk_cairo_paint_resize_grip (style,
+      gtk_paint_resize_grip (style,
                              cr,
                              gtk_widget_get_state (widget),
                              widget,
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index c69d6cd..d9ae319 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -2496,7 +2496,7 @@ gtk_default_draw_box (GtkStyle      *style,
       return;
     }
 
-  gtk_cairo_paint_shadow (style, cr, state_type, shadow_type, widget, detail,
+  gtk_paint_shadow (style, cr, state_type, shadow_type, widget, detail,
                           x, y, width, height);
 
   if (detail && strcmp (detail, "optionmenu") == 0)
@@ -2512,7 +2512,7 @@ gtk_default_draw_box (GtkStyle      *style,
       else 
 	vline_x = x + width - (indicator_size.width + indicator_spacing.left + indicator_spacing.right) - style->xthickness;
 
-      gtk_cairo_paint_vline (style, cr, state_type, widget,
+      gtk_paint_vline (style, cr, state_type, widget,
                              detail,
                              y + style->ythickness + 1,
                              y + height - style->ythickness - 3,
@@ -3665,7 +3665,7 @@ gtk_default_draw_slider (GtkStyle      *style,
                          gint           height,
                          GtkOrientation orientation)
 {
-  gtk_cairo_paint_box (style, cr, state_type, shadow_type,
+  gtk_paint_box (style, cr, state_type, shadow_type,
                        widget, detail, x, y, width, height);
 
   if (detail &&
@@ -3673,11 +3673,11 @@ gtk_default_draw_slider (GtkStyle      *style,
        strcmp ("vscale", detail) == 0))
     {
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
-        gtk_cairo_paint_vline (style, cr, state_type, widget, detail, 
+        gtk_paint_vline (style, cr, state_type, widget, detail, 
                                y + style->ythickness, 
                                y + height - style->ythickness - 1, x + width / 2);
       else
-        gtk_cairo_paint_hline (style, cr, state_type, widget, detail, 
+        gtk_paint_hline (style, cr, state_type, widget, detail, 
                                x + style->xthickness, 
                                x + width - style->xthickness - 1, y + height / 2);
     }
@@ -3726,7 +3726,7 @@ gtk_default_draw_handle (GtkStyle      *style,
   gint xthick, ythick;
   GdkColor light, dark;
   
-  gtk_cairo_paint_box (style, cr, state_type, shadow_type, widget, 
+  gtk_paint_box (style, cr, state_type, shadow_type, widget, 
                        detail, x, y, width, height);
   
   if (detail && !strcmp (detail, "paned"))
@@ -4502,7 +4502,7 @@ hls_to_rgb (gdouble *h,
 
 
 /**
- * gtk_cairo_paint_hline:
+ * gtk_paint_hline:
  * @style: a #GtkStyle
  * @cr: a #caio_t
  * @state_type: a state
@@ -4516,14 +4516,14 @@ hls_to_rgb (gdouble *h,
  * using the given style and state.
  **/ 
 void 
-gtk_cairo_paint_hline (GtkStyle           *style,
-                       cairo_t            *cr,
-                       GtkStateType        state_type,
-                       GtkWidget          *widget,
-                       const gchar        *detail,
-                       gint                x1,
-                       gint                x2,
-                       gint                y)
+gtk_paint_hline (GtkStyle           *style,
+                 cairo_t            *cr,
+                 GtkStateType        state_type,
+                 GtkWidget          *widget,
+                 const gchar        *detail,
+                 gint                x1,
+                 gint                x2,
+                 gint                y)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (cr != NULL);
@@ -4539,7 +4539,7 @@ gtk_cairo_paint_hline (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_vline:
+ * gtk_paint_vline:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4553,14 +4553,14 @@ gtk_cairo_paint_hline (GtkStyle           *style,
  * using the given style and state.
  */
 void
-gtk_cairo_paint_vline (GtkStyle           *style,
-                       cairo_t            *cr,
-                       GtkStateType        state_type,
-                       GtkWidget          *widget,
-                       const gchar        *detail,
-                       gint                y1_,
-                       gint                y2_,
-                       gint                x)
+gtk_paint_vline (GtkStyle           *style,
+                 cairo_t            *cr,
+                 GtkStateType        state_type,
+                 GtkWidget          *widget,
+                 const gchar        *detail,
+                 gint                y1_,
+                 gint                y2_,
+                 gint                x)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (cr != NULL);
@@ -4576,7 +4576,7 @@ gtk_cairo_paint_vline (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_shadow:
+ * gtk_paint_shadow:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4592,16 +4592,16 @@ gtk_cairo_paint_vline (GtkStyle           *style,
  * using the given style and state and shadow type.
  */
 void
-gtk_cairo_paint_shadow (GtkStyle           *style,
-                        cairo_t            *cr,
-                        GtkStateType        state_type,
-                        GtkShadowType       shadow_type,
-                        GtkWidget          *widget,
-                        const gchar        *detail,
-                        gint                x,
-                        gint                y,
-                        gint                width,
-                        gint                height)
+gtk_paint_shadow (GtkStyle           *style,
+                  cairo_t            *cr,
+                  GtkStateType        state_type,
+                  GtkShadowType       shadow_type,
+                  GtkWidget          *widget,
+                  const gchar        *detail,
+                  gint                x,
+                  gint                y,
+                  gint                width,
+                  gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
@@ -4619,7 +4619,7 @@ gtk_cairo_paint_shadow (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_arrow:
+ * gtk_paint_arrow:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4637,18 +4637,18 @@ gtk_cairo_paint_shadow (GtkStyle           *style,
  * parameters. @arrow_type determines the direction of the arrow.
  */
 void
-gtk_cairo_paint_arrow (GtkStyle           *style,
-                       cairo_t            *cr,
-                       GtkStateType        state_type,
-                       GtkShadowType       shadow_type,
-                       GtkWidget          *widget,
-                       const gchar        *detail,
-                       GtkArrowType        arrow_type,
-                       gboolean            fill,
-                       gint                x,
-                       gint                y,
-                       gint                width,
-                       gint                height)
+gtk_paint_arrow (GtkStyle           *style,
+                 cairo_t            *cr,
+                 GtkStateType        state_type,
+                 GtkShadowType       shadow_type,
+                 GtkWidget          *widget,
+                 const gchar        *detail,
+                 GtkArrowType        arrow_type,
+                 gboolean            fill,
+                 gint                x,
+                 gint                y,
+                 gint                width,
+                 gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL);
@@ -4666,7 +4666,7 @@ gtk_cairo_paint_arrow (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_diamond:
+ * gtk_paint_diamond:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4682,16 +4682,16 @@ gtk_cairo_paint_arrow (GtkStyle           *style,
  * parameters.
  */
 void
-gtk_cairo_paint_diamond (GtkStyle           *style,
-                         cairo_t            *cr,
-                         GtkStateType        state_type,
-                         GtkShadowType       shadow_type,
-                         GtkWidget          *widget,
-                         const gchar        *detail,
-                         gint                x,
-                         gint                y,
-                         gint                width,
-                         gint                height)
+gtk_paint_diamond (GtkStyle           *style,
+                   cairo_t            *cr,
+                   GtkStateType        state_type,
+                   GtkShadowType       shadow_type,
+                   GtkWidget          *widget,
+                   const gchar        *detail,
+                   gint                x,
+                   gint                y,
+                   gint                width,
+                   gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL);
@@ -4709,7 +4709,7 @@ gtk_cairo_paint_diamond (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_box:
+ * gtk_paint_box:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4724,16 +4724,16 @@ gtk_cairo_paint_diamond (GtkStyle           *style,
  * Draws a box on @cr with the given parameters.
  */
 void
-gtk_cairo_paint_box (GtkStyle           *style,
-                     cairo_t            *cr,
-                     GtkStateType        state_type,
-                     GtkShadowType       shadow_type,
-                     GtkWidget          *widget,
-                     const gchar        *detail,
-                     gint                x,
-                     gint                y,
-                     gint                width,
-                     gint                height)
+gtk_paint_box (GtkStyle           *style,
+               cairo_t            *cr,
+               GtkStateType        state_type,
+               GtkShadowType       shadow_type,
+               GtkWidget          *widget,
+               const gchar        *detail,
+               gint                x,
+               gint                y,
+               gint                width,
+               gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL);
@@ -4749,7 +4749,7 @@ gtk_cairo_paint_box (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_flat_box:
+ * gtk_paint_flat_box:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4766,16 +4766,16 @@ gtk_cairo_paint_box (GtkStyle           *style,
  * Draws a flat box on @cr with the given parameters.
  */
 void
-gtk_cairo_paint_flat_box (GtkStyle           *style,
-                          cairo_t            *cr,
-                          GtkStateType        state_type,
-                          GtkShadowType       shadow_type,
-                          GtkWidget          *widget,
-                          const gchar        *detail,
-                          gint                x,
-                          gint                y,
-                          gint                width,
-                          gint                height)
+gtk_paint_flat_box (GtkStyle           *style,
+                    cairo_t            *cr,
+                    GtkStateType        state_type,
+                    GtkShadowType       shadow_type,
+                    GtkWidget          *widget,
+                    const gchar        *detail,
+                    gint                x,
+                    gint                y,
+                    gint                width,
+                    gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL);
@@ -4793,7 +4793,7 @@ gtk_cairo_paint_flat_box (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_check:
+ * gtk_paint_check:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4809,16 +4809,16 @@ gtk_cairo_paint_flat_box (GtkStyle           *style,
  * the given parameters.
  */
 void
-gtk_cairo_paint_check (GtkStyle           *style,
-                       cairo_t            *cr,
-                       GtkStateType        state_type,
-                       GtkShadowType       shadow_type,
-                       GtkWidget          *widget,
-                       const gchar        *detail,
-                       gint                x,
-                       gint                y,
-                       gint                width,
-                       gint                height)
+gtk_paint_check (GtkStyle           *style,
+                 cairo_t            *cr,
+                 GtkStateType        state_type,
+                 GtkShadowType       shadow_type,
+                 GtkWidget          *widget,
+                 const gchar        *detail,
+                 gint                x,
+                 gint                y,
+                 gint                width,
+                 gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL);
@@ -4834,7 +4834,7 @@ gtk_cairo_paint_check (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_option:
+ * gtk_paint_option:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4850,16 +4850,16 @@ gtk_cairo_paint_check (GtkStyle           *style,
  * the given parameters.
  */
 void
-gtk_cairo_paint_option (GtkStyle           *style,
-                        cairo_t            *cr,
-                        GtkStateType        state_type,
-                        GtkShadowType       shadow_type,
-                        GtkWidget          *widget,
-                        const gchar        *detail,
-                        gint                x,
-                        gint                y,
-                        gint                width,
-                        gint                height)
+gtk_paint_option (GtkStyle           *style,
+                  cairo_t            *cr,
+                  GtkStateType        state_type,
+                  GtkShadowType       shadow_type,
+                  GtkWidget          *widget,
+                  const gchar        *detail,
+                  gint                x,
+                  gint                y,
+                  gint                width,
+                  gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL);
@@ -4875,7 +4875,7 @@ gtk_cairo_paint_option (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_tab:
+ * gtk_paint_tab:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4891,16 +4891,16 @@ gtk_cairo_paint_option (GtkStyle           *style,
  * in the given rectangle on @cr using the given parameters.
  */ 
 void
-gtk_cairo_paint_tab (GtkStyle           *style,
-                     cairo_t            *cr,
-                     GtkStateType        state_type,
-                     GtkShadowType       shadow_type,
-                     GtkWidget          *widget,
-                     const gchar        *detail,
-                     gint                x,
-                     gint                y,
-                     gint                width,
-                     gint                height)
+gtk_paint_tab (GtkStyle           *style,
+               cairo_t            *cr,
+               GtkStateType        state_type,
+               GtkShadowType       shadow_type,
+               GtkWidget          *widget,
+               const gchar        *detail,
+               gint                x,
+               gint                y,
+               gint                width,
+               gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL);
@@ -4916,7 +4916,7 @@ gtk_cairo_paint_tab (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_shadow_gap:
+ * gtk_paint_shadow_gap:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4936,19 +4936,19 @@ gtk_cairo_paint_tab (GtkStyle           *style,
  * gap in one side.
 */
 void
-gtk_cairo_paint_shadow_gap (GtkStyle           *style,
-                            cairo_t            *cr,
-                            GtkStateType        state_type,
-                            GtkShadowType       shadow_type,
-                            GtkWidget          *widget,
-                            const gchar        *detail,
-                            gint                x,
-                            gint                y,
-                            gint                width,
-                            gint                height,
-                            GtkPositionType     gap_side,
-                            gint                gap_x,
-                            gint                gap_width)
+gtk_paint_shadow_gap (GtkStyle           *style,
+                      cairo_t            *cr,
+                      GtkStateType        state_type,
+                      GtkShadowType       shadow_type,
+                      GtkWidget          *widget,
+                      const gchar        *detail,
+                      gint                x,
+                      gint                y,
+                      gint                width,
+                      gint                height,
+                      GtkPositionType     gap_side,
+                      gint                gap_x,
+                      gint                gap_width)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
@@ -4966,7 +4966,7 @@ gtk_cairo_paint_shadow_gap (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_box_gap:
+ * gtk_paint_box_gap:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -4985,19 +4985,19 @@ gtk_cairo_paint_shadow_gap (GtkStyle           *style,
  * leaving a gap in one side.
  */
 void
-gtk_cairo_paint_box_gap (GtkStyle           *style,
-                         cairo_t            *cr,
-                         GtkStateType        state_type,
-                         GtkShadowType       shadow_type,
-                         GtkWidget          *widget,
-                         const gchar        *detail,
-                         gint                x,
-                         gint                y,
-                         gint                width,
-                         gint                height,
-                         GtkPositionType     gap_side,
-                         gint                gap_x,
-                         gint                gap_width)
+gtk_paint_box_gap (GtkStyle           *style,
+                   cairo_t            *cr,
+                   GtkStateType        state_type,
+                   GtkShadowType       shadow_type,
+                   GtkWidget          *widget,
+                   const gchar        *detail,
+                   gint                x,
+                   gint                y,
+                   gint                width,
+                   gint                height,
+                   GtkPositionType     gap_side,
+                   gint                gap_x,
+                   gint                gap_width)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL);
@@ -5015,7 +5015,7 @@ gtk_cairo_paint_box_gap (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_extension: 
+ * gtk_paint_extension: 
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5031,17 +5031,17 @@ gtk_cairo_paint_box_gap (GtkStyle           *style,
  * Draws an extension, i.e. a notebook tab.
  **/
 void
-gtk_cairo_paint_extension (GtkStyle           *style,
-                           cairo_t            *cr,
-                           GtkStateType        state_type,
-                           GtkShadowType       shadow_type,
-                           GtkWidget          *widget,
-                           const gchar        *detail,
-                           gint                x,
-                           gint                y,
-                           gint                width,
-                           gint                height,
-                           GtkPositionType     gap_side)
+gtk_paint_extension (GtkStyle           *style,
+                     cairo_t            *cr,
+                     GtkStateType        state_type,
+                     GtkShadowType       shadow_type,
+                     GtkWidget          *widget,
+                     const gchar        *detail,
+                     gint                x,
+                     gint                y,
+                     gint                width,
+                     gint                height,
+                     GtkPositionType     gap_side)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL);
@@ -5059,7 +5059,7 @@ gtk_cairo_paint_extension (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_focus:
+ * gtk_paint_focus:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5074,15 +5074,15 @@ gtk_cairo_paint_extension (GtkStyle           *style,
  * given style.
  */
 void
-gtk_cairo_paint_focus (GtkStyle           *style,
-                       cairo_t            *cr,
-                       GtkStateType        state_type,
-                       GtkWidget          *widget,
-                       const gchar        *detail,
-                       gint                x,
-                       gint                y,
-                       gint                width,
-                       gint                height)
+gtk_paint_focus (GtkStyle           *style,
+                 cairo_t            *cr,
+                 GtkStateType        state_type,
+                 GtkWidget          *widget,
+                 const gchar        *detail,
+                 gint                x,
+                 gint                y,
+                 gint                width,
+                 gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL);
@@ -5100,7 +5100,7 @@ gtk_cairo_paint_focus (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_slider:
+ * gtk_paint_slider:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5117,17 +5117,17 @@ gtk_cairo_paint_focus (GtkStyle           *style,
  * given style and orientation.
  **/
 void
-gtk_cairo_paint_slider (GtkStyle           *style,
-                        cairo_t            *cr,
-                        GtkStateType        state_type,
-                        GtkShadowType       shadow_type,
-                        GtkWidget          *widget,
-                        const gchar        *detail,
-                        gint                x,
-                        gint                y,
-                        gint                width,
-                        gint                height,
-                        GtkOrientation      orientation)
+gtk_paint_slider (GtkStyle           *style,
+                  cairo_t            *cr,
+                  GtkStateType        state_type,
+                  GtkShadowType       shadow_type,
+                  GtkWidget          *widget,
+                  const gchar        *detail,
+                  gint                x,
+                  gint                y,
+                  gint                width,
+                  gint                height,
+                  GtkOrientation      orientation)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
@@ -5145,7 +5145,7 @@ gtk_cairo_paint_slider (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_handle:
+ * gtk_paint_handle:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5161,17 +5161,17 @@ gtk_cairo_paint_slider (GtkStyle           *style,
  * Draws a handle as used in #GtkHandleBox and #GtkPaned.
  **/
 void
-gtk_cairo_paint_handle (GtkStyle           *style,
-                        cairo_t            *cr,
-                        GtkStateType        state_type,
-                        GtkShadowType       shadow_type,
-                        GtkWidget          *widget,
-                        const gchar        *detail,
-                        gint                x,
-                        gint                y,
-                        gint                width,
-                        gint                height,
-                        GtkOrientation      orientation)
+gtk_paint_handle (GtkStyle           *style,
+                  cairo_t            *cr,
+                  GtkStateType        state_type,
+                  GtkShadowType       shadow_type,
+                  GtkWidget          *widget,
+                  const gchar        *detail,
+                  gint                x,
+                  gint                y,
+                  gint                width,
+                  gint                height,
+                  GtkOrientation      orientation)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL);
@@ -5189,7 +5189,7 @@ gtk_cairo_paint_handle (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_expander:
+ * gtk_paint_expander:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5212,14 +5212,14 @@ gtk_cairo_paint_handle (GtkStyle           *style,
  * expanded position.
  **/
 void
-gtk_cairo_paint_expander (GtkStyle           *style,
-                          cairo_t            *cr,
-                          GtkStateType        state_type,
-                          GtkWidget          *widget,
-                          const gchar        *detail,
-                          gint                x,
-                          gint                y,
-                          GtkExpanderStyle    expander_style)
+gtk_paint_expander (GtkStyle           *style,
+                    cairo_t            *cr,
+                    GtkStateType        state_type,
+                    GtkWidget          *widget,
+                    const gchar        *detail,
+                    gint                x,
+                    gint                y,
+                    GtkExpanderStyle    expander_style)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_expander != NULL);
@@ -5235,7 +5235,7 @@ gtk_cairo_paint_expander (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_layout:
+ * gtk_paint_layout:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5250,15 +5250,15 @@ gtk_cairo_paint_expander (GtkStyle           *style,
  * Draws a layout on @cr using the given parameters.
  **/
 void
-gtk_cairo_paint_layout (GtkStyle           *style,
-                        cairo_t            *cr,
-                        GtkStateType        state_type,
-                        gboolean            use_text,
-                        GtkWidget          *widget,
-                        const gchar        *detail,
-                        gint                x,
-                        gint                y,
-                        PangoLayout        *layout)
+gtk_paint_layout (GtkStyle           *style,
+                  cairo_t            *cr,
+                  GtkStateType        state_type,
+                  gboolean            use_text,
+                  GtkWidget          *widget,
+                  const gchar        *detail,
+                  gint                x,
+                  gint                y,
+                  PangoLayout        *layout)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
@@ -5274,7 +5274,7 @@ gtk_cairo_paint_layout (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_resize_grip:
+ * gtk_paint_resize_grip:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5290,16 +5290,16 @@ gtk_cairo_paint_layout (GtkStyle           *style,
  * parameters. 
  */
 void
-gtk_cairo_paint_resize_grip (GtkStyle           *style,
-                             cairo_t            *cr,
-                             GtkStateType        state_type,
-                             GtkWidget          *widget,
-                             const gchar        *detail,
-                             GdkWindowEdge       edge,
-                             gint                x,
-                             gint                y,
-                             gint                width,
-                             gint                height)
+gtk_paint_resize_grip (GtkStyle           *style,
+                       cairo_t            *cr,
+                       GtkStateType        state_type,
+                       GtkWidget          *widget,
+                       const gchar        *detail,
+                       GdkWindowEdge       edge,
+                       gint                x,
+                       gint                y,
+                       gint                width,
+                       gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_resize_grip != NULL);
@@ -5314,7 +5314,7 @@ gtk_cairo_paint_resize_grip (GtkStyle           *style,
 }
 
 /**
- * gtk_cairo_paint_spinner:
+ * gtk_paint_spinner:
  * @style: a #GtkStyle
  * @cr: a #cairo_t
  * @state_type: a state
@@ -5329,16 +5329,16 @@ gtk_cairo_paint_resize_grip (GtkStyle           *style,
  * Draws a spinner on @window using the given parameters.
  */
 void
-gtk_cairo_paint_spinner (GtkStyle           *style,
-                         cairo_t            *cr,
-                         GtkStateType        state_type,
-                         GtkWidget          *widget,
-                         const gchar        *detail,
-                         guint               step,
-                         gint                x,
-                         gint                y,
-                         gint                width,
-                         gint                height)
+gtk_paint_spinner (GtkStyle           *style,
+                   cairo_t            *cr,
+                   GtkStateType        state_type,
+                   GtkWidget          *widget,
+                   const gchar        *detail,
+                   guint               step,
+                   gint                x,
+                   gint                y,
+                   gint                width,
+                   gint                height)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (cr != NULL);
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 7afaa6f..bd156c3 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -433,7 +433,7 @@ GdkPixbuf*  gtk_style_render_icon     (GtkStyle            *style,
                                        GtkWidget           *widget,
                                        const gchar         *detail);
 
-void gtk_cairo_paint_hline       (GtkStyle           *style,
+void gtk_paint_hline             (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkWidget          *widget,
@@ -441,7 +441,7 @@ void gtk_cairo_paint_hline       (GtkStyle           *style,
                                   gint                x1,
                                   gint                x2,
                                   gint                y);
-void gtk_cairo_paint_vline       (GtkStyle           *style,
+void gtk_paint_vline             (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkWidget          *widget,
@@ -449,7 +449,7 @@ void gtk_cairo_paint_vline       (GtkStyle           *style,
                                   gint                y1_,
                                   gint                y2_,
                                   gint                x);
-void gtk_cairo_paint_shadow      (GtkStyle           *style,
+void gtk_paint_shadow            (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -459,7 +459,7 @@ void gtk_cairo_paint_shadow      (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_arrow       (GtkStyle           *style,
+void gtk_paint_arrow             (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -471,7 +471,7 @@ void gtk_cairo_paint_arrow       (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_diamond     (GtkStyle           *style,
+void gtk_paint_diamond           (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -481,7 +481,7 @@ void gtk_cairo_paint_diamond     (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_box         (GtkStyle           *style,
+void gtk_paint_box               (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -491,7 +491,7 @@ void gtk_cairo_paint_box         (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_flat_box    (GtkStyle           *style,
+void gtk_paint_flat_box          (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -501,7 +501,7 @@ void gtk_cairo_paint_flat_box    (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_check       (GtkStyle           *style,
+void gtk_paint_check             (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -511,7 +511,7 @@ void gtk_cairo_paint_check       (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_option      (GtkStyle           *style,
+void gtk_paint_option            (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -521,7 +521,7 @@ void gtk_cairo_paint_option      (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_tab         (GtkStyle           *style,
+void gtk_paint_tab               (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -531,7 +531,7 @@ void gtk_cairo_paint_tab         (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_shadow_gap  (GtkStyle           *style,
+void gtk_paint_shadow_gap        (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -544,7 +544,7 @@ void gtk_cairo_paint_shadow_gap  (GtkStyle           *style,
                                   GtkPositionType     gap_side,
                                   gint                gap_x,
                                   gint                gap_width);
-void gtk_cairo_paint_box_gap     (GtkStyle           *style,
+void gtk_paint_box_gap           (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -557,7 +557,7 @@ void gtk_cairo_paint_box_gap     (GtkStyle           *style,
                                   GtkPositionType     gap_side,
                                   gint                gap_x,
                                   gint                gap_width);
-void gtk_cairo_paint_extension   (GtkStyle           *style,
+void gtk_paint_extension         (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -568,7 +568,7 @@ void gtk_cairo_paint_extension   (GtkStyle           *style,
                                   gint                width,
                                   gint                height,
                                   GtkPositionType     gap_side);
-void gtk_cairo_paint_focus       (GtkStyle           *style,
+void gtk_paint_focus             (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkWidget          *widget,
@@ -577,7 +577,7 @@ void gtk_cairo_paint_focus       (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_slider      (GtkStyle           *style,
+void gtk_paint_slider            (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -588,7 +588,7 @@ void gtk_cairo_paint_slider      (GtkStyle           *style,
                                   gint                width,
                                   gint                height,
                                   GtkOrientation      orientation);
-void gtk_cairo_paint_handle      (GtkStyle           *style,
+void gtk_paint_handle            (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkShadowType       shadow_type,
@@ -599,7 +599,7 @@ void gtk_cairo_paint_handle      (GtkStyle           *style,
                                   gint                width,
                                   gint                height,
                                   GtkOrientation      orientation);
-void gtk_cairo_paint_expander    (GtkStyle           *style,
+void gtk_paint_expander          (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkWidget          *widget,
@@ -607,7 +607,7 @@ void gtk_cairo_paint_expander    (GtkStyle           *style,
                                   gint                x,
                                   gint                y,
                                   GtkExpanderStyle    expander_style);
-void gtk_cairo_paint_layout      (GtkStyle           *style,
+void gtk_paint_layout            (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   gboolean            use_text,
@@ -616,7 +616,7 @@ void gtk_cairo_paint_layout      (GtkStyle           *style,
                                   gint                x,
                                   gint                y,
                                   PangoLayout        *layout);
-void gtk_cairo_paint_resize_grip (GtkStyle           *style,
+void gtk_paint_resize_grip       (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkWidget          *widget,
@@ -626,7 +626,7 @@ void gtk_cairo_paint_resize_grip (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_cairo_paint_spinner     (GtkStyle           *style,
+void gtk_paint_spinner           (GtkStyle           *style,
                                   cairo_t            *cr,
                                   GtkStateType        state_type,
                                   GtkWidget          *widget,
diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index ce1ab37..8ff3f80 100644
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -147,7 +147,7 @@ gtk_tearoff_menu_item_draw (GtkWidget *widget,
       gtk_widget_style_get (widget,
                             "selected-shadow-type", &selected_shadow_type,
                             NULL);
-      gtk_cairo_paint_box (style,
+      gtk_paint_box (style,
                      cr,
                      GTK_STATE_PRELIGHT,
                      selected_shadow_type,
@@ -191,7 +191,7 @@ gtk_tearoff_menu_item_draw (GtkWidget *widget,
         }
 
 
-      gtk_cairo_paint_arrow (style, cr,
+      gtk_paint_arrow (style, cr,
                        state, shadow_type,
                        widget, "tearoffmenuitem",
                        arrow_type, FALSE,
@@ -212,7 +212,7 @@ gtk_tearoff_menu_item_draw (GtkWidget *widget,
         x2 = MAX (right_max - x - TEAR_LENGTH, 0);
       }
 
-      gtk_cairo_paint_hline (style, cr, GTK_STATE_NORMAL,
+      gtk_paint_hline (style, cr, GTK_STATE_NORMAL,
                        widget, "tearoffmenuitem",
                        x1, x2, y + (height - style->ythickness) / 2);
       x += 2 * TEAR_LENGTH;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 8dc802d..d76edbf 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4904,7 +4904,7 @@ gtk_text_view_draw_focus (GtkWidget *widget,
   
   if (gtk_widget_has_focus (widget) && !interior_focus)
     {          
-      gtk_cairo_paint_focus (gtk_widget_get_style (widget), cr,
+      gtk_paint_focus (gtk_widget_get_style (widget), cr,
                        gtk_widget_get_state (widget),
                        widget, "textview",
                        0, 0,
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index e4196fb..75eaa02 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -822,7 +822,7 @@ gtk_toolbar_draw (GtkWidget *widget,
 
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-  gtk_cairo_paint_box (gtk_widget_get_style (widget),
+  gtk_paint_box (gtk_widget_get_style (widget),
                  cr,
                  gtk_widget_get_state (widget),
                  get_shadow_type (toolbar),
@@ -3647,7 +3647,7 @@ _gtk_toolbar_paint_space_line (GtkWidget           *widget,
                             NULL);
 
       if (wide_separators)
-        gtk_cairo_paint_box (style, cr,
+        gtk_paint_box (style, cr,
                        state, GTK_SHADOW_ETCHED_OUT,
                        widget, "vseparator",
                        (width - separator_width) / 2,
@@ -3655,7 +3655,7 @@ _gtk_toolbar_paint_space_line (GtkWidget           *widget,
                        separator_width,
                        height * (end_fraction - start_fraction));
       else
-        gtk_cairo_paint_vline (style, cr,
+        gtk_paint_vline (style, cr,
                          state, widget,
                          "toolbar",
                          height * start_fraction,
@@ -3673,7 +3673,7 @@ _gtk_toolbar_paint_space_line (GtkWidget           *widget,
                             NULL);
 
       if (wide_separators)
-        gtk_cairo_paint_box (style, cr,
+        gtk_paint_box (style, cr,
                        state, GTK_SHADOW_ETCHED_OUT,
                        widget, "hseparator",
                        width * start_fraction,
@@ -3681,7 +3681,7 @@ _gtk_toolbar_paint_space_line (GtkWidget           *widget,
                        width * (end_fraction - start_fraction),
                        separator_height);
       else
-        gtk_cairo_paint_hline (style, cr,
+        gtk_paint_hline (style, cr,
                          state, widget,
                          "toolbar",
                          width * start_fraction,
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 5f594dd..d81d6ca 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -297,7 +297,7 @@ gtk_tool_item_group_header_draw_cb (GtkWidget *widget,
       expander_style = GTK_EXPANDER_EXPANDED - expander_style;
     }
 
-  gtk_cairo_paint_expander (gtk_widget_get_style (widget),
+  gtk_paint_expander (gtk_widget_get_style (widget),
                       cr,
                       gtk_widget_get_state (priv->header),
                       GTK_WIDGET (group),
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 1e0edb1..d8d4bcf 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -519,7 +519,7 @@ static gboolean
 gtk_tooltip_paint_window (GtkTooltip *tooltip,
                           cairo_t    *cr)
 {
-  gtk_cairo_paint_flat_box (gtk_widget_get_style (tooltip->window),
+  gtk_paint_flat_box (gtk_widget_get_style (tooltip->window),
 		      cr,
 		      GTK_STATE_NORMAL,
 		      GTK_SHADOW_OUT,
diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index c0f4368..b7a08b8 100644
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -360,7 +360,7 @@ gtk_tray_icon_draw (GtkWidget *widget,
     {
       border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-      gtk_cairo_paint_focus (gtk_widget_get_style (widget),
+      gtk_paint_focus (gtk_widget_get_style (widget),
                        cr,
                        gtk_widget_get_state (widget),
                        widget, "tray_icon",
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 509176e..0fe5e54 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4225,7 +4225,7 @@ draw_empty_focus (GtkTreeView *tree_view, cairo_t *cr)
   h -= 2;
 
   if (w > 0 && h > 0)
-    gtk_cairo_paint_focus (gtk_widget_get_style (widget),
+    gtk_paint_focus (gtk_widget_get_style (widget),
                      cr,
 		     gtk_widget_get_state (widget),
 		     widget,
@@ -4401,7 +4401,7 @@ gtk_tree_view_bin_draw (GtkWidget      *widget,
 
   if (tree_view->priv->height < bin_window_height)
     {
-      gtk_cairo_paint_flat_box (style,
+      gtk_paint_flat_box (style,
                           cr,
                           gtk_widget_get_state (widget),
                           GTK_SHADOW_NONE,
@@ -4663,7 +4663,7 @@ gtk_tree_view_bin_draw (GtkWidget      *widget,
 	  else
 	    g_snprintf (new_detail, 127, "%s_middle", detail);
 
-	  gtk_cairo_paint_flat_box (style,
+	  gtk_paint_flat_box (style,
 			      cr,
 			      state,
 			      GTK_SHADOW_NONE,
@@ -4695,7 +4695,7 @@ gtk_tree_view_bin_draw (GtkWidget      *widget,
 	      expander_cell_width = cell_area.width;
 
 	      if (is_separator)
-		gtk_cairo_paint_hline (style,
+		gtk_paint_hline (style,
 				 cr,
 				 state,
 				 widget,
@@ -4729,7 +4729,7 @@ gtk_tree_view_bin_draw (GtkWidget      *widget,
 	  else
 	    {
 	      if (is_separator)
-		gtk_cairo_paint_hline (style,
+		gtk_paint_hline (style,
 				 cr,
 				 state,
 				 widget,
@@ -4880,7 +4880,7 @@ gtk_tree_view_bin_draw (GtkWidget      *widget,
 	      gdk_drawable_get_size (tree_view->priv->bin_window,
 				     &width, NULL);
 
-	      gtk_cairo_paint_focus (style,
+	      gtk_paint_focus (style,
 			       cr,
 			       gtk_widget_get_state (widget),
 			       widget,
@@ -4934,7 +4934,7 @@ gtk_tree_view_bin_draw (GtkWidget      *widget,
 	      tmp_height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
 	    }
 
-	  gtk_cairo_paint_focus (style,
+	  gtk_paint_focus (style,
 			   cr,
 			   focus_rect_state,
 			   widget,
@@ -9546,7 +9546,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
   else
     expander_style = GTK_EXPANDER_COLLAPSED;
 
-  gtk_cairo_paint_expander (gtk_widget_get_style (widget),
+  gtk_paint_expander (gtk_widget_get_style (widget),
                       cr,
                       state,
                       widget,
@@ -13824,7 +13824,7 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
       if (gtk_tree_view_column_cell_is_visible (column))
 	{
 	  if (is_separator)
-	    gtk_cairo_paint_hline (style,
+	    gtk_paint_hline (style,
                                    cr,
                                    GTK_STATE_NORMAL,
                                    widget,
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 445f09d..341f5ad 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -3502,7 +3502,7 @@ _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn  *tree_column,
       cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
 	      (flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
 	      (flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
-      gtk_cairo_paint_focus (gtk_widget_get_style (tree_column->tree_view),
+      gtk_paint_focus (gtk_widget_get_style (tree_column->tree_view),
                              cr,
                              cell_state,
                              tree_column->tree_view,
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 035d0dc..ed03665 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -775,7 +775,7 @@ gtk_viewport_draw (GtkWidget *widget,
     {
       gdk_drawable_get_size (gtk_widget_get_window (widget),
                              &w, &h);
-      gtk_cairo_paint_shadow (gtk_widget_get_style (widget),
+      gtk_paint_shadow (gtk_widget_get_style (widget),
                         cr,
                         GTK_STATE_NORMAL, priv->shadow_type,
                         widget, "viewport",
@@ -786,7 +786,7 @@ gtk_viewport_draw (GtkWidget *widget,
     {
       gdk_window_get_position (priv->bin_window, &x, &y);
       gdk_drawable_get_size (priv->bin_window, &w, &h);
-      gtk_cairo_paint_flat_box (gtk_widget_get_style (widget), cr,
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "viewportbin",
                           x, y, w, h);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a422d27..10403de 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6667,7 +6667,7 @@ gtk_window_draw (GtkWidget *widget,
 		 cairo_t   *cr)
 {
   if (!gtk_widget_get_app_paintable (widget))
-    gtk_cairo_paint_flat_box (gtk_widget_get_style (widget),
+    gtk_paint_flat_box (gtk_widget_get_style (widget),
                         cr,
                         GTK_STATE_NORMAL,
                         GTK_SHADOW_NONE, widget, "base",
diff --git a/tests/gtkoffscreenbox.c b/tests/gtkoffscreenbox.c
index 7573dd3..d8af076 100644
--- a/tests/gtkoffscreenbox.c
+++ b/tests/gtkoffscreenbox.c
@@ -627,7 +627,7 @@ gtk_offscreen_box_draw (GtkWidget *widget,
       gint w, h;
 
       gdk_drawable_get_size (offscreen_box->offscreen_window1, &w, &h);
-      gtk_cairo_paint_flat_box (gtk_widget_get_style (widget), cr,
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "blah",
                           0, 0, w, h);
@@ -642,7 +642,7 @@ gtk_offscreen_box_draw (GtkWidget *widget,
       gint w, h;
 
       gdk_drawable_get_size (offscreen_box->offscreen_window2, &w, &h);
-      gtk_cairo_paint_flat_box (gtk_widget_get_style (widget), cr,
+      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "blah",
                           0, 0, w, h);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 6b73a3e..61b037d 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2564,7 +2564,7 @@ grippy_button_press (GtkWidget *area, GdkEventButton *event, GdkWindowEdge edge)
 static gboolean
 grippy_draw (GtkWidget *area, cairo_t *cr, GdkWindowEdge edge)
 {
-  gtk_cairo_paint_resize_grip (gtk_widget_get_style (area),
+  gtk_paint_resize_grip (gtk_widget_get_style (area),
                          cr,
 			 gtk_widget_get_state (area),
 			 area,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]