]> Pileus Git - ~andy/gtk/blobdiff - modules/engines/pixbuf/pixbuf-draw.c
style: Convert draw_option vfunc to Cairo version
[~andy/gtk] / modules / engines / pixbuf / pixbuf-draw.c
index a540700cbe68764b26707e087f686fdcc307aef7..8e6bc84b68383bef16c0eb51830538d79c2a27b1 100644 (file)
@@ -1,5 +1,5 @@
 /* GTK+ Pixbuf Engine
- * Copyright (C) 1998-2000 Red Hat Software
+ * Copyright (C) 1998-2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * Carsten Haitzler <raster@rasterman.com>
  */
 
-#include "pixmap_theme.h"
 #include <math.h>
-#include "pixmap_theme.h"
+#include <string.h>
+
+#include "pixbuf.h"
+#include "pixbuf-rc-style.h"
+#include "pixbuf-style.h"
+
+static void pixbuf_style_init       (PixbufStyle      *style);
+static void pixbuf_style_class_init (PixbufStyleClass *klass);
+
+static GtkStyleClass *parent_class = NULL;
 
 static ThemeImage *
-match_theme_image(GtkStyle       *style,
-                 ThemeMatchData *match_data)
+match_theme_image (GtkStyle       *style,
+                  ThemeMatchData *match_data)
 {
   GList *tmp_list;
 
-  tmp_list = ((ThemeData *)style->engine_data)->img_list;
+  tmp_list = PIXBUF_RC_STYLE (style->rc_style)->img_list;
   
   while (tmp_list)
     {
@@ -66,8 +74,16 @@ match_theme_image(GtkStyle       *style,
          match_data->gap_side != image->match_data.gap_side)
        continue;
 
+      if ((flags & THEME_MATCH_EXPANDER_STYLE) &&
+         match_data->expander_style != image->match_data.expander_style)
+       continue;
+
+      if ((flags & THEME_MATCH_WINDOW_EDGE) &&
+         match_data->window_edge != image->match_data.window_edge)
+       continue;
+
       if (image->match_data.detail &&
-         (!image->match_data.detail ||
+         (!match_data->detail ||
           strcmp (match_data->detail, image->match_data.detail) != 0))
       continue;
 
@@ -77,33 +93,21 @@ match_theme_image(GtkStyle       *style,
   return NULL;
 }
 
-static void
-draw_simple_image(GtkStyle      *style,
-                 GdkWindow     *window,
-                 GdkRectangle  *area,
-                 GtkWidget     *widget,
+static gboolean
+draw_simple_image(GtkStyle       *style,
+                 cairo_t        *cr,
+                 GtkWidget      *widget,
                  ThemeMatchData *match_data,
                  gboolean        draw_center,
                  gboolean        allow_setbg,
-                 gint x,
-                 gint y,
-                 gint width,
-                 gint height)
+                 gint            x,
+                 gint            y,
+                 gint            width,
+                 gint            height)
 {
+
   ThemeImage *image;
-  gboolean setbg = FALSE;
   
-  if ((width == -1) && (height == -1))
-    {
-      gdk_window_get_size(window, &width, &height);
-      if (allow_setbg)
-       setbg = TRUE;
-    }
-  else if (width == -1)
-    gdk_window_get_size(window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size(window, NULL, &height);
-
   if (!(match_data->flags & THEME_MATCH_ORIENTATION))
     {
       match_data->flags |= THEME_MATCH_ORIENTATION;
@@ -114,46 +118,70 @@ draw_simple_image(GtkStyle      *style,
        match_data->orientation = GTK_ORIENTATION_HORIZONTAL;
     }
     
-  image = match_theme_image(style, match_data);
+  image = match_theme_image (style, match_data);
   if (image)
     {
       if (image->background)
        {
-         GdkBitmap *mask = NULL;
-
-         if (image->background->stretch && setbg &&
-             gdk_window_get_type (window) != GDK_WINDOW_PIXMAP)
-           {
-             GdkPixbuf *pixbuf = theme_pixbuf_get_pixbuf (image->background);
-             if (pixbuf && pixbuf->art_pixbuf->has_alpha)
-               mask = gdk_pixmap_new (window, width, height, 1);
-           }
-         
-         theme_pixbuf_render (image->background,
-                              window, mask, area,
+         theme_pixbuf_render (image->background, cr,
                               draw_center ? COMPONENT_ALL : COMPONENT_ALL | COMPONENT_CENTER,
                               FALSE,
                               x, y, width, height);
-         
-         if (mask)
-           {
-             gdk_window_shape_combine_mask (window, mask, 0, 0);
-             gdk_pixmap_unref (mask);
-           }
        }
       
       if (image->overlay && draw_center)
-       theme_pixbuf_render (image->overlay,
-                            window, NULL, area, COMPONENT_ALL,
+       theme_pixbuf_render (image->overlay, cr, COMPONENT_ALL,
                             TRUE, 
                             x, y, width, height);
+
+      return TRUE;
     }
+  else
+    return FALSE;
 }
 
-static void
+static gboolean
+draw_simple_image_no_cairo(GtkStyle       *style,
+                 GdkWindow      *window,
+                 GdkRectangle   *area,
+                 GtkWidget      *widget,
+                 ThemeMatchData *match_data,
+                 gboolean        draw_center,
+                 gboolean        allow_setbg,
+                 gint            x,
+                 gint            y,
+                 gint            width,
+                 gint            height)
+{
+  gboolean result;
+  cairo_t *cr;
+
+  if ((width == -1) && (height == -1))
+    gdk_drawable_get_size(window, &width, &height);
+  else if (width == -1)
+    gdk_drawable_get_size(window, &width, NULL);
+  else if (height == -1)
+    gdk_drawable_get_size(window, NULL, &height);
+
+  cr = gdk_cairo_create (window);
+  if (area)
+    {
+      gdk_cairo_rectangle (cr, area);
+      cairo_clip (cr);
+    }
+
+  result = draw_simple_image (style, cr, widget, match_data,
+                              draw_center, allow_setbg,
+                              x, y, width, height);
+
+  cairo_destroy (cr);
+
+  return result;
+}
+
+static gboolean
 draw_gap_image(GtkStyle       *style,
-              GdkWindow      *window,
-              GdkRectangle   *area,
+               cairo_t        *cr,
               GtkWidget      *widget,
               ThemeMatchData *match_data,
               gboolean        draw_center,
@@ -166,18 +194,7 @@ draw_gap_image(GtkStyle       *style,
               gint            gap_width)
 {
   ThemeImage *image;
-  gboolean setbg = FALSE;
   
-  if ((width == -1) && (height == -1))
-    {
-      gdk_window_get_size(window, &width, &height);
-      setbg = TRUE;
-    }
-  else if (width == -1)
-    gdk_window_get_size(window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size(window, NULL, &height);
-
   if (!(match_data->flags & THEME_MATCH_ORIENTATION))
     {
       match_data->flags |= THEME_MATCH_ORIENTATION;
@@ -191,7 +208,7 @@ draw_gap_image(GtkStyle       *style,
   match_data->flags |= THEME_MATCH_GAP_SIDE;
   match_data->gap_side = gap_side;
     
-  image = match_theme_image(style, match_data);
+  image = match_theme_image (style, match_data);
   if (image)
     {
       gint thickness;
@@ -209,9 +226,9 @@ draw_gap_image(GtkStyle       *style,
        {
        case GTK_POS_TOP:
          if (pixbuf)
-           thickness = pixbuf->art_pixbuf->height;
+           thickness = gdk_pixbuf_get_height (pixbuf);
          else
-           thickness = style->klass->ythickness;
+           thickness = style->ythickness;
          
          if (!draw_center)
            components |= COMPONENT_NORTH_WEST | COMPONENT_NORTH | COMPONENT_NORTH_EAST;
@@ -232,9 +249,9 @@ draw_gap_image(GtkStyle       *style,
          
        case GTK_POS_BOTTOM:
          if (pixbuf)
-           thickness = pixbuf->art_pixbuf->height;
+           thickness = gdk_pixbuf_get_height (pixbuf);
          else
-           thickness = style->klass->ythickness;
+           thickness = style->ythickness;
 
          if (!draw_center)
            components |= COMPONENT_SOUTH_WEST | COMPONENT_SOUTH | COMPONENT_SOUTH_EAST;
@@ -255,9 +272,9 @@ draw_gap_image(GtkStyle       *style,
          
        case GTK_POS_LEFT:
          if (pixbuf)
-           thickness = pixbuf->art_pixbuf->width;
+           thickness = gdk_pixbuf_get_width (pixbuf);
          else
-           thickness = style->klass->xthickness;
+           thickness = style->xthickness;
 
          if (!draw_center)
            components |= COMPONENT_NORTH_WEST | COMPONENT_WEST | COMPONENT_SOUTH_WEST;
@@ -278,9 +295,9 @@ draw_gap_image(GtkStyle       *style,
          
        case GTK_POS_RIGHT:
          if (pixbuf)
-           thickness = pixbuf->art_pixbuf->width;
+           thickness = gdk_pixbuf_get_width (pixbuf);
          else
-           thickness = style->klass->xthickness;
+           thickness = style->xthickness;
 
          if (!draw_center)
            components |= COMPONENT_NORTH_EAST | COMPONENT_EAST | COMPONENT_SOUTH_EAST;
@@ -298,223 +315,279 @@ draw_gap_image(GtkStyle       *style,
          r3.width  = thickness;
          r3.height = height - (gap_x + gap_width);
          break;
+
+       default:
+         g_assert_not_reached ();
        }
 
       if (image->background)
        theme_pixbuf_render (image->background,
-                            window, NULL, area, components, FALSE,
+                            cr, components, FALSE,
                             x, y, width, height);
       if (image->gap_start)
        theme_pixbuf_render (image->gap_start,
-                            window, NULL, area, COMPONENT_ALL, FALSE,
+                            cr, COMPONENT_ALL, FALSE,
                             r1.x, r1.y, r1.width, r1.height);
       if (image->gap)
        theme_pixbuf_render (image->gap,
-                            window, NULL, area, COMPONENT_ALL, FALSE,
+                            cr, COMPONENT_ALL, FALSE,
                             r2.x, r2.y, r2.width, r2.height);
       if (image->gap_end)
        theme_pixbuf_render (image->gap_end,
-                            window, NULL, area, COMPONENT_ALL, FALSE,
+                            cr, COMPONENT_ALL, FALSE,
                             r3.x, r3.y, r3.width, r3.height);
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+draw_gap_image_no_cairo(GtkStyle       *style,
+               GdkWindow      *window,
+               GdkRectangle   *area,
+              GtkWidget      *widget,
+              ThemeMatchData *match_data,
+              gboolean        draw_center,
+              gint            x,
+              gint            y,
+              gint            width,
+              gint            height,
+              GtkPositionType gap_side,
+              gint            gap_x,
+              gint            gap_width)
+{
+  gboolean result;
+  cairo_t *cr;
+
+  if ((width == -1) && (height == -1))
+    gdk_drawable_get_size(window, &width, &height);
+  else if (width == -1)
+    gdk_drawable_get_size(window, &width, NULL);
+  else if (height == -1)
+    gdk_drawable_get_size(window, NULL, &height);
+
+  cr = gdk_cairo_create (window);
+  if (area)
+    {
+      gdk_cairo_rectangle (cr, area);
+      cairo_clip (cr);
     }
+
+  result = draw_gap_image (style, cr, widget, match_data,
+                           draw_center, x, y, width, height,
+                           gap_side, gap_x, gap_width);
+
+  cairo_destroy (cr);
+
+  return result;
 }
 
 static void
-draw_hline(GtkStyle * style,
-          GdkWindow * window,
-          GtkStateType state,
-          GdkRectangle * area,
-          GtkWidget * widget,
-          gchar * detail,
-          gint x1,
-          gint x2,
-          gint y)
+draw_hline (GtkStyle     *style,
+           cairo_t      *cr,
+           GtkStateType  state,
+           GtkWidget    *widget,
+           const gchar  *detail,
+           gint          x1,
+           gint          x2,
+           gint          y)
 {
   ThemeImage *image;
   ThemeMatchData   match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
   match_data.function = TOKEN_D_HLINE;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_ORIENTATION | THEME_MATCH_STATE;
   match_data.state = state;
   match_data.orientation = GTK_ORIENTATION_HORIZONTAL;
   
-  image = match_theme_image(style, &match_data);
+  image = match_theme_image (style, &match_data);
   if (image)
     {
       if (image->background)
        theme_pixbuf_render (image->background,
-                            window, NULL, area, COMPONENT_ALL, FALSE,
+                            cr, COMPONENT_ALL, FALSE,
                             x1, y, (x2 - x1) + 1, 2);
     }
+  else
+    parent_class->draw_hline (style, cr, state, widget, detail,
+                             x1, x2, y);
 }
 
 static void
-draw_vline(GtkStyle * style,
-          GdkWindow * window,
-          GtkStateType state,
-          GdkRectangle * area,
-          GtkWidget * widget,
-          gchar * detail,
-          gint y1,
-          gint y2,
-          gint x)
+draw_vline (GtkStyle     *style,
+           cairo_t      *cr,
+           GtkStateType  state,
+           GtkWidget    *widget,
+           const gchar  *detail,
+           gint          y1,
+           gint          y2,
+           gint          x)
 {
   ThemeImage    *image;
   ThemeMatchData match_data;
   
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
-
   match_data.function = TOKEN_D_VLINE;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_ORIENTATION | THEME_MATCH_STATE;
   match_data.state = state;
   match_data.orientation = GTK_ORIENTATION_VERTICAL;
   
-  image = match_theme_image(style, &match_data);
+  image = match_theme_image (style, &match_data);
   if (image)
     {
       if (image->background)
        theme_pixbuf_render (image->background,
-                            window, NULL, area, COMPONENT_ALL, FALSE,
+                            cr, COMPONENT_ALL, FALSE,
                             x, y1, 2, (y2 - y1) + 1);
     }
+  else
+    parent_class->draw_vline (style, cr, state, widget, detail,
+                             y1, y2, x);
 }
 
 static void
-draw_shadow(GtkStyle style,
-           GdkWindow * window,
-           GtkStateType state,
+draw_shadow(GtkStyle     *style,
+           cairo_t      *cr,
+           GtkStateType  state,
            GtkShadowType shadow,
-           GdkRectangle * area,
-           GtkWidget * widget,
-           gchar * detail,
-           gint x,
-           gint y,
-           gint width,
-           gint height)
+           GtkWidget    *widget,
+           const gchar  *detail,
+           gint          x,
+           gint          y,
+           gint          width,
+           gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
   match_data.function = TOKEN_D_SHADOW;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
 
-  draw_simple_image (style, window, area, widget, &match_data, FALSE, FALSE,
-                    x, y, width, height);
+  if (!draw_simple_image (style, cr, widget, &match_data, FALSE, FALSE,
+                         x, y, width, height))
+    parent_class->draw_shadow (style, cr, state, shadow, widget, detail,
+                              x, y, width, height);
 }
 
+/* This function makes up for some brokeness in gtkrange.c
+ * where we never get the full arrow of the stepper button
+ * and the type of button in a single drawing function.
+ *
+ * It doesn't work correctly when the scrollbar is squished
+ * to the point we don't have room for full-sized steppers.
+ */
 static void
-draw_polygon(GtkStyle * style,
-            GdkWindow * window,
-            GtkStateType state,
-            GtkShadowType shadow,
-            GdkRectangle * area,
-            GtkWidget * widget,
-            gchar * detail,
-            GdkPoint * points,
-            gint npoints,
-            gint fill)
+reverse_engineer_stepper_box (GtkWidget    *range,
+                             GtkArrowType  arrow_type,
+                             gint         *x,
+                             gint         *y,
+                             gint         *width,
+                             gint         *height)
 {
-#ifndef M_PI
-#define M_PI    3.14159265358979323846
-#endif /* M_PI */
-#ifndef M_PI_4
-#define M_PI_4  0.78539816339744830962
-#endif /* M_PI_4 */
-
-  static const gdouble pi_over_4 = M_PI_4;
-  static const gdouble pi_3_over_4 = M_PI_4 * 3;
-
-  GdkGC              *gc3;
-  GdkGC              *gc4;
-  gdouble             angle;
-  gint                i;
-
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-  g_return_if_fail(points != NULL);
-
-  switch (shadow)
-    {
-    case GTK_SHADOW_IN:
-      gc3 = style->light_gc[state];
-      gc4 = style->black_gc;
-      break;
-    case GTK_SHADOW_OUT:
-      gc3 = style->black_gc;
-      gc4 = style->light_gc[state];
-      break;
-    default:
-      return;
-    }
-
-  if (area)
+  gint slider_width = 14, stepper_size = 14;
+  gint box_width;
+  gint box_height;
+  
+  if (range && GTK_IS_RANGE (range))
     {
-      gdk_gc_set_clip_rectangle(gc3, area);
-      gdk_gc_set_clip_rectangle(gc4, area);
+      gtk_widget_style_get (range,
+                           "slider_width", &slider_width,
+                           "stepper_size", &stepper_size,
+                           NULL);
     }
-  if (fill)
-    gdk_draw_polygon(window, style->bg_gc[state], TRUE, points, npoints);
-
-  npoints--;
-
-  for (i = 0; i < npoints; i++)
+       
+  if (arrow_type == GTK_ARROW_UP || arrow_type == GTK_ARROW_DOWN)
     {
-      if ((points[i].x == points[i + 1].x) &&
-         (points[i].y == points[i + 1].y))
-       angle = 0;
-      else
-       angle = atan2(points[i + 1].y - points[i].y,
-                     points[i + 1].x - points[i].x);
-
-      if ((angle > -pi_3_over_4) && (angle < pi_over_4))
-       gdk_draw_line(window, gc3,
-                     points[i].x, points[i].y,
-                     points[i + 1].x, points[i + 1].y);
-      else
-       gdk_draw_line(window, gc4,
-                     points[i].x, points[i].y,
-                     points[i + 1].x, points[i + 1].y);
+      box_width = slider_width;
+      box_height = stepper_size;
     }
-  if (area)
+  else
     {
-      gdk_gc_set_clip_rectangle(gc3, NULL);
-      gdk_gc_set_clip_rectangle(gc4, NULL);
+      box_width = stepper_size;
+      box_height = slider_width;
     }
+
+  *x = *x - (box_width - *width) / 2;
+  *y = *y - (box_height - *height) / 2;
+  *width = box_width;
+  *height = box_height;
 }
 
 static void
-draw_arrow(GtkStyle * style,
-          GdkWindow * window,
-          GtkStateType state,
-          GtkShadowType shadow,
-          GdkRectangle * area,
-          GtkWidget * widget,
-          gchar * detail,
-          GtkArrowType arrow_direction,
-          gint fill,
-          gint x,
-          gint y,
-          gint width,
-          gint height)
+draw_arrow (GtkStyle     *style,
+           cairo_t      *cr,
+           GtkStateType  state,
+           GtkShadowType shadow,
+           GtkWidget    *widget,
+           const gchar  *detail,
+           GtkArrowType  arrow_direction,
+           gint          fill,
+           gint          x,
+           gint          y,
+           gint          width,
+           gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
+  if (detail &&
+      (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0))
+    {
+      /* This is a hack to work around the fact that scrollbar steppers are drawn
+       * as a box + arrow, so we never have
+       *
+       *   The full bounding box of the scrollbar 
+       *   The arrow direction
+       *
+       * At the same time. We simulate an extra paint function, "STEPPER", by doing
+       * nothing for the box, and then here, reverse engineering the box that
+       * was passed to draw box and using that
+       */
+      gint box_x = x;
+      gint box_y = y;
+      gint box_width = width;
+      gint box_height = height;
+
+      reverse_engineer_stepper_box (widget, arrow_direction,
+                                   &box_x, &box_y, &box_width, &box_height);
+
+      match_data.function = TOKEN_D_STEPPER;
+      match_data.detail = (gchar *)detail;
+      match_data.flags = (THEME_MATCH_SHADOW | 
+                         THEME_MATCH_STATE | 
+                         THEME_MATCH_ARROW_DIRECTION);
+      match_data.shadow = shadow;
+      match_data.state = state;
+      match_data.arrow_direction = arrow_direction;
+      
+      if (draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                            box_x, box_y, box_width, box_height))
+       {
+         /* The theme included stepper images, we're done */
+         return;
+       }
+
+      /* Otherwise, draw the full box, and fall through to draw the arrow
+       */
+      match_data.function = TOKEN_D_BOX;
+      match_data.detail = (gchar *)detail;
+      match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
+      match_data.shadow = shadow;
+      match_data.state = state;
+      
+      if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                             box_x, box_y, box_width, box_height))
+       parent_class->draw_box (style, cr, state, shadow, widget, detail,
+                               box_x, box_y, box_width, box_height);
+    }
+
 
   match_data.function = TOKEN_D_ARROW;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = (THEME_MATCH_SHADOW | 
                      THEME_MATCH_STATE | 
                      THEME_MATCH_ARROW_DIRECTION);
@@ -522,285 +595,162 @@ draw_arrow(GtkStyle * style,
   match_data.state = state;
   match_data.arrow_direction = arrow_direction;
   
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_arrow (style, cr, state, shadow, widget, detail,
+                             arrow_direction, fill, x, y, width, height);
 }
 
 static void
-draw_diamond(GtkStyle * style,
-            GdkWindow * window,
-            GtkStateType state,
-            GtkShadowType shadow,
-            GdkRectangle * area,
-            GtkWidget * widget,
-            gchar * detail,
-            gint x,
-            gint y,
-            gint width,
-            gint height)
+draw_diamond (GtkStyle     *style,
+             cairo_t      *cr,
+             GtkStateType  state,
+             GtkShadowType shadow,
+             GtkWidget    *widget,
+             const gchar  *detail,
+             gint          x,
+             gint          y,
+             gint          width,
+             gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
   match_data.function = TOKEN_D_DIAMOND;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
   
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_diamond (style, cr, state, shadow, widget, detail,
+                               x, y, width, height);
 }
 
 static void
-draw_oval(GtkStyle * style,
-         GdkWindow * window,
-         GtkStateType state,
-         GtkShadowType shadow,
-         GdkRectangle * area,
-         GtkWidget * widget,
-         gchar * detail,
-         gint x,
-         gint y,
-         gint width,
-         gint height)
+draw_box (GtkStyle     *style,
+         cairo_t      *cr,
+         GtkStateType  state,
+         GtkShadowType shadow,
+         GtkWidget    *widget,
+         const gchar  *detail,
+         gint          x,
+         gint          y,
+         gint          width,
+         gint          height)
 {
   ThemeMatchData match_data;
-  
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
 
-  match_data.function = TOKEN_D_OVAL;
-  match_data.detail = detail;
-  match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
-  match_data.shadow = shadow;
-  match_data.state = state;
-
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
-}
-
-static void
-draw_string(GtkStyle * style,
-           GdkWindow * window,
-           GtkStateType state,
-           GdkRectangle * area,
-           GtkWidget * widget,
-           gchar * detail,
-           gint x,
-           gint y,
-           const gchar * string)
-{
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
-  if (state == GTK_STATE_INSENSITIVE)
-    {
-      if (area)
-       {
-         gdk_gc_set_clip_rectangle(style->white_gc, area);
-         gdk_gc_set_clip_rectangle(style->fg_gc[state], area);
-       }
-
-      gdk_draw_string(window, style->font, style->fg_gc[state], x, y, string);
-      
-      if (area)
-       {
-         gdk_gc_set_clip_rectangle(style->white_gc, NULL);
-         gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL);
-       }
-    }
-  else
+  if (detail &&
+      (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0))
     {
-      gdk_gc_set_clip_rectangle(style->fg_gc[state], area);
-      gdk_draw_string(window, style->font, style->fg_gc[state], x, y, string);
-      gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL);
+      /* We handle this in draw_arrow */
+      return;
     }
-}
-
-static void
-draw_box(GtkStyle * style,
-        GdkWindow * window,
-        GtkStateType state,
-        GtkShadowType shadow,
-        GdkRectangle * area,
-        GtkWidget * widget,
-        gchar * detail,
-        gint x,
-        gint y,
-        gint width,
-        gint height)
-{
-  ThemeMatchData match_data;
-
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
 
   match_data.function = TOKEN_D_BOX;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
-  
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+
+  if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height)) {
+    parent_class->draw_box (style, cr, state, shadow, widget, detail,
+                           x, y, width, height);
+  }
 }
 
 static void
-draw_flat_box(GtkStyle * style,
-             GdkWindow * window,
-             GtkStateType state,
-             GtkShadowType shadow,
-             GdkRectangle * area,
-             GtkWidget * widget,
-             gchar * detail,
-             gint x,
-             gint y,
-             gint width,
-             gint height)
+draw_flat_box (GtkStyle     *style,
+              cairo_t      *cr,
+              GtkStateType  state,
+              GtkShadowType shadow,
+              GtkWidget    *widget,
+              const gchar  *detail,
+              gint          x,
+              gint          y,
+              gint          width,
+              gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
   match_data.function = TOKEN_D_FLAT_BOX;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
-  
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
-}
-
-static void
-draw_check(GtkStyle * style,
-          GdkWindow * window,
-          GtkStateType state,
-          GtkShadowType shadow,
-          GdkRectangle * area,
-          GtkWidget * widget,
-          gchar * detail,
-          gint x,
-          gint y,
-          gint width,
-          gint height)
-{
-  ThemeMatchData match_data;
-  
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
 
-  match_data.function = TOKEN_D_CHECK;
-  match_data.detail = detail;
-  match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
-  match_data.shadow = shadow;
-  match_data.state = state;
-  
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_flat_box (style, cr, state, shadow, widget, detail,
+                                x, y, width, height);
 }
 
 static void
-draw_option(GtkStyle * style,
-           GdkWindow * window,
-           GtkStateType state,
+draw_check (GtkStyle     *style,
+           cairo_t      *cr,
+           GtkStateType  state,
            GtkShadowType shadow,
-           GdkRectangle * area,
-           GtkWidget * widget,
-           gchar * detail,
-           gint x,
-           gint y,
-           gint width,
-           gint height)
+           GtkWidget    *widget,
+           const gchar  *detail,
+           gint          x,
+           gint          y,
+           gint          width,
+           gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
-  match_data.function = TOKEN_D_OPTION;
-  match_data.detail = detail;
+  match_data.function = TOKEN_D_CHECK;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
   
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_check (style, cr, state, shadow, widget, detail,
+                             x, y, width, height);
 }
 
 static void
-draw_cross(GtkStyle * style,
-          GdkWindow * window,
-          GtkStateType state,
-          GtkShadowType shadow,
-          GdkRectangle * area,
-          GtkWidget * widget,
-          gchar * detail,
-          gint x,
-          gint y,
-          gint width,
-          gint height)
+draw_option (GtkStyle     *style,
+            cairo_t      *cr,
+            GtkStateType  state,
+            GtkShadowType shadow,
+            GtkWidget    *widget,
+            const gchar  *detail,
+            gint          x,
+            gint          y,
+            gint          width,
+            gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
-  match_data.function = TOKEN_D_CROSS;
-  match_data.detail = detail;
+  match_data.function = TOKEN_D_OPTION;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
   
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image (style, cr, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_option (style, cr, state, shadow, widget, detail,
+                              x, y, width, height);
 }
 
 static void
-draw_ramp(GtkStyle * style,
-         GdkWindow window,
-         GtkStateType state,
+draw_tab (GtkStyle     *style,
+         GdkWindow    *window,
+         GtkStateType  state,
          GtkShadowType shadow,
-         GdkRectangle * area,
-         GtkWidget * widget,
-         gchar * detail,
-         GtkArrowType arrow_direction,
-         gint x,
-         gint y,
-         gint width,
-         gint height)
-{
-  ThemeMatchData match_data;
-  
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
-  match_data.function = TOKEN_D_RAMP;
-  match_data.detail = detail;
-  match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
-  match_data.shadow = shadow;
-  match_data.state = state;
-  
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
-}
-
-static void
-draw_tab(GtkStyle * style,
-        GdkWindow * window,
-        GtkStateType state,
-        GtkShadowType shadow,
-        GdkRectangle * area,
-        GtkWidget * widget,
-        gchar * detail,
-        gint x,
-        gint y,
-        gint width,
-        gint height)
+         GdkRectangle *area,
+         GtkWidget    *widget,
+         const gchar  *detail,
+         gint          x,
+         gint          y,
+         gint          width,
+         gint          height)
 {
   ThemeMatchData match_data;
   
@@ -808,35 +758,37 @@ draw_tab(GtkStyle * style,
   g_return_if_fail(window != NULL);
 
   match_data.function = TOKEN_D_TAB;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.shadow = shadow;
   match_data.state = state;
   
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_tab (style, window, state, shadow, area, widget, detail,
+                           x, y, width, height);
 }
 
 static void
-draw_shadow_gap(GtkStyle * style,
-               GdkWindow * window,
-               GtkStateType state,
-               GtkShadowType shadow,
-               GdkRectangle * area,
-               GtkWidget * widget,
-               gchar * detail,
-               gint x,
-               gint y,
-               gint width,
-               gint height,
-               GtkPositionType gap_side,
-               gint gap_x,
-               gint gap_width)
+draw_shadow_gap (GtkStyle       *style,
+                GdkWindow      *window,
+                GtkStateType    state,
+                GtkShadowType   shadow,
+                GdkRectangle   *area,
+                GtkWidget      *widget,
+                const gchar    *detail,
+                gint            x,
+                gint            y,
+                gint            width,
+                gint            height,
+                GtkPositionType gap_side,
+                gint            gap_x,
+                gint            gap_width)
 {
   ThemeMatchData match_data;
   
   match_data.function = TOKEN_D_SHADOW_GAP;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.flags = (THEME_MATCH_SHADOW | 
                      THEME_MATCH_STATE | 
@@ -844,30 +796,32 @@ draw_shadow_gap(GtkStyle * style,
   match_data.shadow = shadow;
   match_data.state = state;
   
-  draw_gap_image (style, window, area, widget, &match_data, FALSE,
-                 x, y, width, height, gap_side, gap_x, gap_width);
+  if (!draw_gap_image_no_cairo (style, window, area, widget, &match_data, FALSE,
+                      x, y, width, height, gap_side, gap_x, gap_width))
+    parent_class->draw_shadow_gap (style, window, state, shadow, area, widget, detail,
+                                  x, y, width, height, gap_side, gap_x, gap_width);
 }
 
 static void
-draw_box_gap(GtkStyle * style,
-            GdkWindow * window,
-            GtkStateType state,
-            GtkShadowType shadow,
-            GdkRectangle * area,
-            GtkWidget * widget,
-            gchar * detail,
-            gint x,
-            gint y,
-            gint width,
-            gint height,
-            GtkPositionType gap_side,
-            gint gap_x,
-            gint gap_width)
+draw_box_gap (GtkStyle       *style,
+             GdkWindow      *window,
+             GtkStateType    state,
+             GtkShadowType   shadow,
+             GdkRectangle   *area,
+             GtkWidget      *widget,
+             const gchar    *detail,
+             gint            x,
+             gint            y,
+             gint            width,
+             gint            height,
+             GtkPositionType gap_side,
+             gint            gap_x,
+             gint            gap_width)
 {
   ThemeMatchData match_data;
   
   match_data.function = TOKEN_D_BOX_GAP;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
   match_data.flags = (THEME_MATCH_SHADOW | 
                      THEME_MATCH_STATE | 
@@ -875,89 +829,84 @@ draw_box_gap(GtkStyle * style,
   match_data.shadow = shadow;
   match_data.state = state;
   
-  draw_gap_image (style, window, area, widget, &match_data, TRUE,
-                 x, y, width, height, gap_side, gap_x, gap_width);
+  if (!draw_gap_image_no_cairo (style, window, area, widget, &match_data, TRUE,
+                      x, y, width, height, gap_side, gap_x, gap_width))
+    parent_class->draw_box_gap (style, window, state, shadow, area, widget, detail,
+                               x, y, width, height, gap_side, gap_x, gap_width);
 }
 
 static void
-draw_extension(GtkStyle * style,
-              GdkWindow * window,
-              GtkStateType state,
-              GtkShadowType shadow,
-              GdkRectangle * area,
-              GtkWidget * widget,
-              gchar * detail,
-              gint x,
-              gint y,
-              gint width,
-              gint height,
-              GtkPositionType gap_side)
+draw_extension (GtkStyle       *style,
+               GdkWindow      *window,
+               GtkStateType    state,
+               GtkShadowType   shadow,
+               GdkRectangle   *area,
+               GtkWidget      *widget,
+               const gchar    *detail,
+               gint            x,
+               gint            y,
+               gint            width,
+               gint            height,
+               GtkPositionType gap_side)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
+  g_return_if_fail (style != NULL);
+  g_return_if_fail (window != NULL);
 
-  /* Why? */
-  if (width >=0)
-    width++;
-  if (height >=0)
-    height++;
-  
   match_data.function = TOKEN_D_EXTENSION;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE | THEME_MATCH_GAP_SIDE;
   match_data.shadow = shadow;
   match_data.state = state;
   match_data.gap_side = gap_side;
-  
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_extension (style, window, state, shadow, area, widget, detail,
+                                 x, y, width, height, gap_side);
 }
 
 static void
-draw_focus(GtkStyle * style,
-          GdkWindow * window,
-          GdkRectangle * area,
-          GtkWidget * widget,
-          gchar * detail,
-          gint x,
-          gint y,
-          gint width,
-          gint height)
+draw_focus (GtkStyle     *style,
+           GdkWindow    *window,
+           GtkStateType  state_type,
+           GdkRectangle *area,
+           GtkWidget    *widget,
+           const gchar  *detail,
+           gint          x,
+           gint          y,
+           gint          width,
+           gint          height)
 {
   ThemeMatchData match_data;
   
-  g_return_if_fail(style != NULL);
-  g_return_if_fail(window != NULL);
-
-  /* Why? */
-  if (width >=0)
-    width++;
-  if (height >=0)
-    height++;
+  g_return_if_fail (style != NULL);
+  g_return_if_fail (window != NULL);
 
   match_data.function = TOKEN_D_FOCUS;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = 0;
   
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, FALSE,
-                    x, y, width, height);
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, FALSE,
+                         x, y, width, height))
+    parent_class->draw_focus (style, window, state_type, area, widget, detail,
+                             x, y, width, height);
 }
 
 static void
-draw_slider(GtkStyle * style,
-           GdkWindow * window,
-           GtkStateType state,
-           GtkShadowType shadow,
-           GdkRectangle * area,
-           GtkWidget * widget,
-           gchar * detail,
-           gint x,
-           gint y,
-           gint width,
-           gint height,
-           GtkOrientation orientation)
+draw_slider (GtkStyle      *style,
+            GdkWindow     *window,
+            GtkStateType   state,
+            GtkShadowType  shadow,
+            GdkRectangle  *area,
+            GtkWidget     *widget,
+            const gchar   *detail,
+            gint           x,
+            gint           y,
+            gint           width,
+            gint           height,
+            GtkOrientation orientation)
 {
   ThemeMatchData           match_data;
   
@@ -965,7 +914,7 @@ draw_slider(GtkStyle * style,
   g_return_if_fail(window != NULL);
 
   match_data.function = TOKEN_D_SLIDER;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = (THEME_MATCH_SHADOW | 
                      THEME_MATCH_STATE | 
                      THEME_MATCH_ORIENTATION);
@@ -973,23 +922,26 @@ draw_slider(GtkStyle * style,
   match_data.state = state;
   match_data.orientation = orientation;
 
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);}
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_slider (style, window, state, shadow, area, widget, detail,
+                              x, y, width, height, orientation);
+}
 
 
 static void
-draw_handle(GtkStyle * style,
-           GdkWindow * window,
-           GtkStateType state,
-           GtkShadowType shadow,
-           GdkRectangle * area,
-           GtkWidget * widget,
-           gchar * detail,
-           gint x,
-           gint y,
-           gint width,
-           gint height,
-           GtkOrientation orientation)
+draw_handle (GtkStyle      *style,
+            GdkWindow     *window,
+            GtkStateType   state,
+            GtkShadowType  shadow,
+            GdkRectangle  *area,
+            GtkWidget     *widget,
+            const gchar   *detail,
+            gint           x,
+            gint           y,
+            gint           width,
+            gint           height,
+            GtkOrientation orientation)
 {
   ThemeMatchData match_data;
   
@@ -997,7 +949,7 @@ draw_handle(GtkStyle * style,
   g_return_if_fail (window != NULL);
 
   match_data.function = TOKEN_D_HANDLE;
-  match_data.detail = detail;
+  match_data.detail = (gchar *)detail;
   match_data.flags = (THEME_MATCH_SHADOW | 
                      THEME_MATCH_STATE | 
                      THEME_MATCH_ORIENTATION);
@@ -1005,34 +957,141 @@ draw_handle(GtkStyle * style,
   match_data.state = state;
   match_data.orientation = orientation;
 
-  draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
-                    x, y, width, height);
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_handle (style, window, state, shadow, area, widget, detail,
+                              x, y, width, height, orientation);
 }
 
-GtkStyleClass pixmap_default_class =
+static void
+draw_expander (GtkStyle      *style,
+              GdkWindow     *window,
+              GtkStateType   state,
+              GdkRectangle  *area,
+              GtkWidget     *widget,
+              const gchar   *detail,
+              gint           x,
+              gint           y,
+              GtkExpanderStyle expander_style)
 {
-  2,
-  2,
-  draw_hline,
-  draw_vline,
-  draw_shadow,
-  draw_polygon,
-  draw_arrow,
-  draw_diamond,
-  draw_oval,
-  draw_string,
-  draw_box,
-  draw_flat_box,
-  draw_check,
-  draw_option,
-  draw_cross,
-  draw_ramp,
-  draw_tab,
-  draw_shadow_gap,
-  draw_box_gap,
-  draw_extension,
-  draw_focus,
-  draw_slider,
-  draw_handle
-};
+#define DEFAULT_EXPANDER_SIZE 12
+
+  ThemeMatchData match_data;
+  gint expander_size;
+  gint radius;
+  
+  g_return_if_fail (style != NULL);
+  g_return_if_fail (window != NULL);
 
+  if (widget &&
+      gtk_widget_class_find_style_property (GTK_WIDGET_GET_CLASS (widget),
+                                            "expander-size"))
+    {
+      gtk_widget_style_get (widget,
+                           "expander-size", &expander_size,
+                           NULL);
+    }
+  else
+    expander_size = DEFAULT_EXPANDER_SIZE;
+
+  radius = expander_size/2;
+
+  match_data.function = TOKEN_D_EXPANDER;
+  match_data.detail = (gchar *)detail;
+  match_data.flags = (THEME_MATCH_STATE | 
+                     THEME_MATCH_EXPANDER_STYLE);
+  match_data.state = state;
+  match_data.expander_style = expander_style;
+
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, TRUE,
+                         x - radius, y - radius, expander_size, expander_size))
+    parent_class->draw_expander (style, window, state, area, widget, detail,
+                                x, y, expander_style);
+}
+
+static void
+draw_resize_grip (GtkStyle      *style,
+                    GdkWindow     *window,
+                    GtkStateType   state,
+                    GdkRectangle  *area,
+                    GtkWidget     *widget,
+                    const gchar   *detail,
+                    GdkWindowEdge  edge,
+                    gint           x,
+                    gint           y,
+                    gint           width,
+                    gint           height)
+{
+  ThemeMatchData match_data;
+  
+  g_return_if_fail (style != NULL);
+  g_return_if_fail (window != NULL);
+
+  match_data.function = TOKEN_D_RESIZE_GRIP;
+  match_data.detail = (gchar *)detail;
+  match_data.flags = (THEME_MATCH_STATE | 
+                     THEME_MATCH_WINDOW_EDGE);
+  match_data.state = state;
+  match_data.window_edge = edge;
+
+  if (!draw_simple_image_no_cairo (style, window, area, widget, &match_data, TRUE, TRUE,
+                         x, y, width, height))
+    parent_class->draw_resize_grip (style, window, state, area, widget, detail,
+                                   edge, x, y, width, height);
+}
+
+GType pixbuf_type_style = 0;
+
+void 
+pixbuf_style_register_type (GTypeModule *module) 
+{
+  const GTypeInfo object_info =
+    {
+    sizeof (PixbufStyleClass),
+    (GBaseInitFunc) NULL,
+    (GBaseFinalizeFunc) NULL,
+    (GClassInitFunc) pixbuf_style_class_init,
+    NULL,           /* class_finalize */
+    NULL,           /* class_data */
+    sizeof (PixbufStyle),
+    0,              /* n_preallocs */
+    (GInstanceInitFunc) pixbuf_style_init,
+  };
+  
+  pixbuf_type_style = g_type_module_register_type (module,
+                                                  GTK_TYPE_STYLE,
+                                                  "PixbufStyle",
+                                                  &object_info, 0);
+}
+
+static void
+pixbuf_style_init (PixbufStyle *style)
+{
+}
+
+static void
+pixbuf_style_class_init (PixbufStyleClass *klass)
+{
+  GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  style_class->draw_hline = draw_hline;
+  style_class->draw_vline = draw_vline;
+  style_class->draw_shadow = draw_shadow;
+  style_class->draw_arrow = draw_arrow;
+  style_class->draw_diamond = draw_diamond;
+  style_class->draw_box = draw_box;
+  style_class->draw_flat_box = draw_flat_box;
+  style_class->draw_check = draw_check;
+  style_class->draw_option = draw_option;
+  style_class->draw_tab = draw_tab;
+  style_class->draw_shadow_gap = draw_shadow_gap;
+  style_class->draw_box_gap = draw_box_gap;
+  style_class->draw_extension = draw_extension;
+  style_class->draw_focus = draw_focus;
+  style_class->draw_slider = draw_slider;
+  style_class->draw_handle = draw_handle;
+  style_class->draw_expander = draw_expander;
+  style_class->draw_resize_grip = draw_resize_grip;
+}