]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkstyle.c
Centralize lookup and caching of cursor GC's here.
[~andy/gtk] / gtk / gtkstyle.c
index 84cc6043102c6a7d1aab77e24fb6640d2888b36e..5ac1002d092785b9eb9ed1bc12042ed3dc1cc25b 100644 (file)
@@ -2,53 +2,74 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
 #include <math.h>
+#include <stdlib.h>
 #include <string.h>
 #include "gtkgc.h"
 #include "gtkrc.h"
+#include "gtkspinbutton.h"
 #include "gtkstyle.h"
 #include "gtkwidget.h"
 #include "gtkthemes.h"
-
+#include "gtkiconfactory.h"
+#include "gtksettings.h"       /* _gtk_settings_parse_convert() */
 
 #define LIGHTNESS_MULT  1.3
 #define DARKNESS_MULT   0.7
 
-/* actually glib should do that for us */
-#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 void         gtk_style_init         (GtkStyle    *style,
-                                            GdkColormap *colormap,
-                                            gint         depth);
-static void         gtk_style_destroy      (GtkStyle    *style);
-
+/* --- typedefs & structures --- */
+typedef struct {
+  GType       widget_type;
+  GParamSpec *pspec;
+  GValue      value;
+} PropertyValue;
+
+
+/* --- prototypes --- */
+static void     gtk_style_init                 (GtkStyle       *style);
+static void     gtk_style_class_init           (GtkStyleClass  *klass);
+static void     gtk_style_finalize             (GObject        *object);
+static void     gtk_style_realize              (GtkStyle       *style,
+                                                GdkColormap    *colormap);
+static void      gtk_style_real_realize        (GtkStyle       *style);
+static void      gtk_style_real_unrealize      (GtkStyle       *style);
+static void      gtk_style_real_copy           (GtkStyle       *style,
+                                               GtkStyle        *src);
+static void      gtk_style_real_set_background (GtkStyle       *style,
+                                               GdkWindow       *window,
+                                               GtkStateType     state_type);
+static GtkStyle *gtk_style_real_clone          (GtkStyle       *style);
+static void      gtk_style_real_init_from_rc   (GtkStyle       *style,
+                                                GtkRcStyle     *rc_style);
+static GdkPixbuf *gtk_default_render_icon      (GtkStyle            *style,
+                                                const GtkIconSource *source,
+                                                GtkTextDirection     direction,
+                                                GtkStateType         state,
+                                                GtkIconSize          size,
+                                                GtkWidget           *widget,
+                                                const gchar         *detail);
 static void gtk_default_draw_hline      (GtkStyle        *style,
                                         GdkWindow       *window,
                                         GtkStateType     state_type,
@@ -78,17 +99,6 @@ static void gtk_default_draw_shadow     (GtkStyle        *style,
                                         gint             y,
                                         gint             width,
                                         gint             height);
-static void gtk_default_draw_shadow     (GtkStyle        *style,
-                                        GdkWindow       *window,
-                                        GtkStateType     state_type,
-                                        GtkShadowType    shadow_type,
-                                        GdkRectangle    *area,
-                                        GtkWidget       *widget,
-                                        const gchar     *detail,
-                                        gint             x,
-                                        gint             y,
-                                        gint             width,
-                                        gint             height);
 static void gtk_default_draw_polygon    (GtkStyle        *style,
                                         GdkWindow       *window,
                                         GtkStateType     state_type,
@@ -123,17 +133,6 @@ static void gtk_default_draw_diamond    (GtkStyle        *style,
                                         gint             y,
                                         gint             width,
                                         gint             height);
-static void gtk_default_draw_oval       (GtkStyle        *style,
-                                        GdkWindow       *window,
-                                        GtkStateType     state_type,
-                                        GtkShadowType    shadow_type,
-                                        GdkRectangle    *area,
-                                        GtkWidget       *widget,
-                                        const gchar     *detail,
-                                        gint             x,
-                                        gint             y,
-                                        gint             width,
-                                        gint             height);
 static void gtk_default_draw_string     (GtkStyle        *style,
                                         GdkWindow       *window,
                                         GtkStateType     state_type,
@@ -187,29 +186,6 @@ static void gtk_default_draw_option     (GtkStyle        *style,
                                         gint             y,
                                         gint             width,
                                         gint             height);
-static void gtk_default_draw_cross      (GtkStyle        *style,
-                                        GdkWindow       *window,
-                                        GtkStateType     state_type,
-                                        GtkShadowType    shadow_type,
-                                        GdkRectangle    *area,
-                                        GtkWidget       *widget,
-                                        const gchar     *detail,
-                                        gint             x,
-                                        gint             y,
-                                        gint             width,
-                                        gint             height);
-static void gtk_default_draw_ramp       (GtkStyle        *style,
-                                        GdkWindow       *window,
-                                        GtkStateType     state_type,
-                                        GtkShadowType    shadow_type,
-                                        GdkRectangle    *area,
-                                        GtkWidget       *widget,
-                                        const gchar     *detail,
-                                        GtkArrowType     arrow_type,
-                                        gint             x,
-                                        gint             y,
-                                        gint             width,
-                                        gint             height);
 static void gtk_default_draw_tab        (GtkStyle        *style,
                                         GdkWindow       *window,
                                         GtkStateType     state_type,
@@ -263,6 +239,7 @@ static void gtk_default_draw_extension  (GtkStyle        *style,
                                         GtkPositionType  gap_side);
 static void gtk_default_draw_focus      (GtkStyle        *style,
                                         GdkWindow       *window,
+                                        GtkStateType     state_type,
                                         GdkRectangle    *area,
                                         GtkWidget       *widget,
                                         const gchar     *detail,
@@ -294,40 +271,171 @@ static void gtk_default_draw_handle     (GtkStyle        *style,
                                         gint             width,
                                         gint             height,
                                         GtkOrientation   orientation);
+static void gtk_default_draw_expander   (GtkStyle        *style,
+                                         GdkWindow       *window,
+                                         GtkStateType     state_type,
+                                         GdkRectangle    *area,
+                                         GtkWidget       *widget,
+                                         const gchar     *detail,
+                                         gint             x,
+                                         gint             y,
+                                        GtkExpanderStyle expander_style);
+static void gtk_default_draw_layout     (GtkStyle        *style,
+                                         GdkWindow       *window,
+                                         GtkStateType     state_type,
+                                        gboolean         use_text,
+                                         GdkRectangle    *area,
+                                         GtkWidget       *widget,
+                                         const gchar     *detail,
+                                         gint             x,
+                                         gint             y,
+                                         PangoLayout     *layout);
+static void gtk_default_draw_resize_grip (GtkStyle       *style,
+                                          GdkWindow      *window,
+                                          GtkStateType    state_type,
+                                          GdkRectangle   *area,
+                                          GtkWidget      *widget,
+                                          const gchar    *detail,
+                                          GdkWindowEdge   edge,
+                                          gint            x,
+                                          gint            y,
+                                          gint            width,
+                                          gint            height);
+
+static void gtk_style_shade            (GdkColor        *a,
+                                        GdkColor        *b,
+                                        gdouble          k);
+static void rgb_to_hls                 (gdouble         *r,
+                                        gdouble         *g,
+                                        gdouble         *b);
+static void hls_to_rgb                 (gdouble         *h,
+                                        gdouble         *l,
+                                        gdouble         *s);
+
+static void style_unrealize_cursor_gcs (GtkStyle *style);
+
+/*
+ * Data for default check and radio buttons
+ */
+
+static GtkRequisition default_option_indicator_size = { 7, 13 };
+static GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
+
+#define INDICATOR_PART_SIZE 13
+
+typedef enum {
+  CHECK_AA,
+  CHECK_BASE,
+  CHECK_BLACK,
+  CHECK_DARK,
+  CHECK_LIGHT,
+  CHECK_MID,
+  CHECK_TEXT,
+  CHECK_INCONSISTENT_AA,
+  CHECK_INCONSISTENT_TEXT,
+  RADIO_BASE,
+  RADIO_BLACK,
+  RADIO_DARK,
+  RADIO_LIGHT,
+  RADIO_MID,
+  RADIO_TEXT,
+  RADIO_INCONSISTENT_AA,
+  RADIO_INCONSISTENT_TEXT
+} IndicatorPart;
+
+/*
+ * Extracted from check-13.png, width=13, height=13
+ */
+static char check_black_bits[] = {
+  0x00,0x00,0xfe,0x0f,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
+  0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00};
+static char check_dark_bits[] = {
+  0xff,0x1f,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
+  0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00};
+static char check_mid_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
+  0x08,0x00,0x08,0x00,0x08,0x00,0x08,0xfc,0x0f,0x00,0x00,0x00,0x00};
+static char check_light_bits[] = {
+  0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
+  0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0xfe,0x1f,0x00,0x00};
+static char check_text_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x03,0x80,0x01,0x80,0x00,0x58,
+  0x00,0x60,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char check_aa_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x58,0x00,0xa0,
+  0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char check_base_bits[] = {
+  0x00,0x00,0x00,0x00,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
+  0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/*
+ * Extracted from check-13-inconsistent-ssp.png, width=13, height=13
+ */
+static char check_inconsistent_text_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0xf8,
+  0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char check_inconsistent_aa_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-static void gtk_style_shade (GdkColor *a, GdkColor *b, gdouble k);
-static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b);
-static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s);
-
-
-static const GtkStyleClass default_class =
-{
-  2,
-  2,
-  gtk_default_draw_hline,
-  gtk_default_draw_vline,
-  gtk_default_draw_shadow,
-  gtk_default_draw_polygon,
-  gtk_default_draw_arrow,
-  gtk_default_draw_diamond,
-  gtk_default_draw_oval,
-  gtk_default_draw_string,
-  gtk_default_draw_box,
-  gtk_default_draw_flat_box,
-  gtk_default_draw_check,
-  gtk_default_draw_option,
-  gtk_default_draw_cross,
-  gtk_default_draw_ramp,
-  gtk_default_draw_tab,
-  gtk_default_draw_shadow_gap,
-  gtk_default_draw_box_gap,
-  gtk_default_draw_extension,
-  gtk_default_draw_focus,
-  gtk_default_draw_slider,
-  gtk_default_draw_handle
+/*
+ * Extracted from radio-13-ssp.png, width=13, height=13
+ */
+static char radio_black_bits[] = {
+  0x00,0x00,0xf0,0x01,0x0c,0x02,0x04,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
+  0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char radio_dark_bits[] = {
+  0xf0,0x00,0x0c,0x02,0x02,0x04,0x02,0x04,0x01,0x08,0x01,0x08,0x01,0x08,0x01,
+  0x08,0x00,0x04,0x02,0x04,0x0c,0x03,0xf0,0x00,0x00,0x00,0x00,0x00};
+static char radio_mid_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char radio_light_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
+  0x10,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x03,0xf0,0x00,0x00,0x00};
+static char radio_text_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0xf0,0x01,0xf0,0x01,0xf0,
+  0x01,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char radio_aa_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char radio_base_bits[] = {
+  0x00,0x00,0x00,0x00,0xf0,0x01,0xf8,0x03,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
+  0x07,0xfc,0x03,0xf8,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+/*
+ * Extracted from radio-13-inconsistent-ssp.png, width=13, height=13
+ */
+static char radio_inconsistent_text_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static char radio_inconsistent_aa_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0xf8,
+  0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+static struct {
+  char      *bits;
+  GdkBitmap *bmap;
+} indicator_parts[] = {
+  { check_aa_bits, NULL },
+  { check_base_bits, NULL },
+  { check_black_bits, NULL },
+  { check_dark_bits, NULL },
+  { check_light_bits, NULL },
+  { check_mid_bits, NULL },
+  { check_text_bits, NULL },
+  { check_inconsistent_aa_bits, NULL },
+  { check_inconsistent_text_bits, NULL },
+  { radio_base_bits, NULL },
+  { radio_black_bits, NULL },
+  { radio_dark_bits, NULL },
+  { radio_light_bits, NULL },
+  { radio_mid_bits, NULL },
+  { radio_text_bits, NULL },
+  { radio_inconsistent_aa_bits, NULL },
+  { radio_inconsistent_text_bits, NULL },
 };
-GdkFont *default_font = NULL;
 
+/* --- variables --- */
 static GdkColor gtk_default_normal_fg =      { 0,      0,      0,      0 };
 static GdkColor gtk_default_active_fg =      { 0,      0,      0,      0 };
 static GdkColor gtk_default_prelight_fg =    { 0,      0,      0,      0 };
@@ -339,90 +447,63 @@ static GdkColor gtk_default_active_bg =      { 0, 0xc350, 0xc350, 0xc350 };
 static GdkColor gtk_default_prelight_bg =    { 0, 0xea60, 0xea60, 0xea60 };
 static GdkColor gtk_default_selected_bg =    { 0,      0,      0, 0x9c40 };
 static GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
+static GdkColor gtk_default_selected_base =  { 0, 0xa4a4, 0xdfdf, 0xffff };
+static GdkColor gtk_default_active_base =    { 0, 0xbcbc, 0xd2d2, 0xeeee };
 
-GtkStyle*
-gtk_style_copy (GtkStyle *style)
+static gpointer parent_class = NULL;
+
+
+/* --- functions --- */
+GType
+gtk_style_get_type (void)
 {
-  GtkStyle *new_style;
-  guint i;
-  
-  g_return_val_if_fail (style != NULL, NULL);
-  
-  new_style = gtk_style_new ();
+  static GType style_type = 0;
   
-  for (i = 0; i < 5; i++)
+  if (!style_type)
     {
-      new_style->fg[i] = style->fg[i];
-      new_style->bg[i] = style->bg[i];
-      new_style->text[i] = style->text[i];
-      new_style->base[i] = style->base[i];
+      static const GTypeInfo style_info =
+      {
+        sizeof (GtkStyleClass),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gtk_style_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GtkStyle),
+        0,              /* n_preallocs */
+        (GInstanceInitFunc) gtk_style_init,
+      };
       
-      new_style->bg_pixmap[i] = style->bg_pixmap[i];
-    }
-  
-  gdk_font_unref (new_style->font);
-  new_style->font = style->font;
-  gdk_font_ref (new_style->font);
-
-  if (style->rc_style)
-    {
-      new_style->rc_style = style->rc_style;
-      gtk_rc_style_ref (style->rc_style);
-    }
-  
-  if (style->engine)
-    {
-      new_style->engine = style->engine;
-      gtk_theme_engine_ref (new_style->engine);
-      new_style->engine->duplicate_style (new_style, style);
+      style_type = g_type_register_static (G_TYPE_OBJECT,
+                                          "GtkStyle",
+                                          &style_info, 0);
     }
-
-  return new_style;
-}
-
-static GtkStyle*
-gtk_style_duplicate (GtkStyle *style)
-{
-  GtkStyle *new_style;
-  
-  g_return_val_if_fail (style != NULL, NULL);
-  
-  new_style = gtk_style_copy (style);
   
-  style->styles = g_slist_append (style->styles, new_style);
-  new_style->styles = style->styles;  
-  
-  return new_style;
+  return style_type;
 }
 
-GtkStyle*
-gtk_style_new (void)
+static void
+gtk_style_init (GtkStyle *style)
 {
-  GtkStyle *style;
   gint i;
-  
-  style = g_new0 (GtkStyle, 1);
-  
-  style->font_desc = pango_font_description_from_string ("Sans 10");
-    
-  if (!default_font)
-    {
-      default_font = gdk_font_from_description (style->font_desc);
+  const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
 
-      if (!default_font)
-       default_font = gdk_font_load ("fixed");
-      if (!default_font)
-       g_error ("Unable to load default font.");
+  style->font_desc = pango_font_description_from_string (font_name);
+
+  if (!pango_font_description_get_family (style->font_desc))
+    {
+      g_warning ("Default font does not have a family set");
+      pango_font_description_set_family (style->font_desc, "Sans");
+    }
+  if (pango_font_description_get_size (style->font_desc) <= 0)
+    {
+      g_warning ("Default font does not have a positive size");
+      pango_font_description_set_size (style->font_desc, 10 * PANGO_SCALE);
     }
   
-  style->font = default_font;
-  gdk_font_ref (style->font);
-  
-  style->ref_count = 1;
   style->attach_count = 0;
   style->colormap = NULL;
   style->depth = -1;
-  style->klass = (GtkStyleClass *)&default_class;
   
   style->black.red = 0;
   style->black.green = 0;
@@ -452,16 +533,17 @@ gtk_style_new (void)
       style->text[i] = style->fg[i];
       style->base[i] = style->white;
     }
-  
+
+  style->base[GTK_STATE_SELECTED] = gtk_default_selected_base;
+  style->text[GTK_STATE_SELECTED] = style->black;
+  style->base[GTK_STATE_ACTIVE] = gtk_default_active_base;
+  style->text[GTK_STATE_ACTIVE] = style->black;
   style->base[GTK_STATE_INSENSITIVE] = gtk_default_prelight_bg;
   style->text[GTK_STATE_INSENSITIVE] = gtk_default_insensitive_fg;
   
   for (i = 0; i < 5; i++)
     style->bg_pixmap[i] = NULL;
   
-  style->engine = NULL;
-  style->engine_data = NULL;
-  
   style->rc_style = NULL;
   
   for (i = 0; i < 5; i++)
@@ -473,28 +555,175 @@ gtk_style_new (void)
       style->mid_gc[i] = NULL;
       style->text_gc[i] = NULL;
       style->base_gc[i] = NULL;
+      style->text_aa_gc[i] = NULL;
+    }
+
+  style->xthickness = 2;
+  style->ythickness = 2;
+
+  style->property_cache = NULL;
+}
+
+static void
+gtk_style_class_init (GtkStyleClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize = gtk_style_finalize;
+
+  klass->clone = gtk_style_real_clone;
+  klass->copy = gtk_style_real_copy;
+  klass->init_from_rc = gtk_style_real_init_from_rc;
+  klass->realize = gtk_style_real_realize;
+  klass->unrealize = gtk_style_real_unrealize;
+  klass->set_background = gtk_style_real_set_background;
+  klass->render_icon = gtk_default_render_icon;
+
+  klass->draw_hline = gtk_default_draw_hline;
+  klass->draw_vline = gtk_default_draw_vline;
+  klass->draw_shadow = gtk_default_draw_shadow;
+  klass->draw_polygon = gtk_default_draw_polygon;
+  klass->draw_arrow = gtk_default_draw_arrow;
+  klass->draw_diamond = gtk_default_draw_diamond;
+  klass->draw_string = gtk_default_draw_string;
+  klass->draw_box = gtk_default_draw_box;
+  klass->draw_flat_box = gtk_default_draw_flat_box;
+  klass->draw_check = gtk_default_draw_check;
+  klass->draw_option = gtk_default_draw_option;
+  klass->draw_tab = gtk_default_draw_tab;
+  klass->draw_shadow_gap = gtk_default_draw_shadow_gap;
+  klass->draw_box_gap = gtk_default_draw_box_gap;
+  klass->draw_extension = gtk_default_draw_extension;
+  klass->draw_focus = gtk_default_draw_focus;
+  klass->draw_slider = gtk_default_draw_slider;
+  klass->draw_handle = gtk_default_draw_handle;
+  klass->draw_expander = gtk_default_draw_expander;
+  klass->draw_layout = gtk_default_draw_layout;
+  klass->draw_resize_grip = gtk_default_draw_resize_grip;
+}
+
+static void
+clear_property_cache (GtkStyle *style)
+{
+  if (style->property_cache)
+    {
+      guint i;
+
+      for (i = 0; i < style->property_cache->len; i++)
+       {
+         PropertyValue *node = &g_array_index (style->property_cache, PropertyValue, i);
+
+         g_param_spec_unref (node->pspec);
+         g_value_unset (&node->value);
+       }
+      g_array_free (style->property_cache, TRUE);
+      style->property_cache = NULL;
+    }
+}
+
+static void
+gtk_style_finalize (GObject *object)
+{
+  GtkStyle *style = GTK_STYLE (object);
+
+  g_return_if_fail (style->attach_count == 0);
+
+  clear_property_cache (style);
+  
+  if (style->styles)
+    {
+      if (style->styles->data != style)
+        g_slist_remove (style->styles, style);
+      else
+        {
+          GSList *tmp_list = style->styles->next;
+         
+          while (tmp_list)
+            {
+              GTK_STYLE (tmp_list->data)->styles = style->styles->next;
+              tmp_list = tmp_list->next;
+            }
+          g_slist_free_1 (style->styles);
+        }
     }
+
+  pango_font_description_free (style->font_desc);
+  
+  if (style->private_font)
+    gdk_font_unref (style->private_font);
+
+  if (style->private_font_desc)
+    pango_font_description_free (style->private_font_desc);
+  
+  if (style->rc_style)
+    gtk_rc_style_unref (style->rc_style);
+  
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+GtkStyle*
+gtk_style_copy (GtkStyle *style)
+{
+  GtkStyle *new_style;
+  
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+  
+  new_style = GTK_STYLE_GET_CLASS (style)->clone (style);
+  GTK_STYLE_GET_CLASS (style)->copy (new_style, style);
+
+  return new_style;
+}
+
+static GtkStyle*
+gtk_style_duplicate (GtkStyle *style)
+{
+  GtkStyle *new_style;
+  
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+  
+  new_style = gtk_style_copy (style);
+  
+  style->styles = g_slist_append (style->styles, new_style);
+  new_style->styles = style->styles;  
+  
+  return new_style;
+}
+
+/**
+ * gtk_style_new:
+ * @returns: a new #GtkStyle.
+ *
+ * Creates a new #GtkStyle.
+ **/
+GtkStyle*
+gtk_style_new (void)
+{
+  GtkStyle *style;
+  
+  style = g_object_new (GTK_TYPE_STYLE, NULL);
   
   return style;
 }
 
-/*************************************************************
+/**
  * gtk_style_attach:
- *     Attach a style to a window; this process allocates the
- *     colors and creates the GC's for the style - it specializes
- *     it to a particular visual and colormap. The process
- *     may involve the creation of a new style if the style
- *     has already been attached to a window with a different
- *     style and colormap.
- *   arguments:
- *     style:
- *     window: 
- *   results:
- *     Either the style parameter, or a newly created style.
- *     If the style is newly created, the style parameter
- *     will be dereferenced, and the new style will have
- *     a reference count belonging to the caller.
+ * @style: a #GtkStyle.
+ * @window: a #GtkWindow.
+ * @returns: Either @style, or a newly-created #GtkStyle.
+ *   If the style is newly created, the style parameter
+ *   will be dereferenced, and the new style will have
+ *   a reference count belonging to the caller.
  *
+ * Attaches a style to a window; this process allocates the
+ * colors and creates the GC's for the style - it specializes
+ * it to a particular visual and colormap. The process may 
+ * involve the creation of a new style if the style has already 
+ * been attached to a window with a different style and colormap.
+ **/
+ /*
  * FIXME: The sequence - 
  *    create a style => s1
  *    attach s1 to v1, c1 => s1
@@ -509,8 +738,7 @@ gtk_style_new (void)
  * passes through the linked list when attaching (one to check for 
  * matching styles, one to look for empty unattached styles - but 
  * it will almost never be longer than 2 elements.
- *************************************************************/
-
+ */
 GtkStyle*
 gtk_style_attach (GtkStyle  *style,
                   GdkWindow *window)
@@ -518,13 +746,11 @@ gtk_style_attach (GtkStyle  *style,
   GSList *styles;
   GtkStyle *new_style = NULL;
   GdkColormap *colormap;
-  gint depth;
   
-  g_return_val_if_fail (style != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
   g_return_val_if_fail (window != NULL, NULL);
   
   colormap = gdk_window_get_colormap (window);
-  depth = gdk_window_get_visual (window)->depth;
   
   if (!style->styles)
     style->styles = g_slist_append (NULL, style);
@@ -536,11 +762,10 @@ gtk_style_attach (GtkStyle  *style,
       
       if (new_style->attach_count == 0)
         {
-          gtk_style_init (new_style, colormap, depth);
+          gtk_style_realize (new_style, colormap);
           break;
         }
-      else if (new_style->colormap == colormap &&
-               new_style->depth == depth)
+      else if (new_style->colormap == colormap)
         break;
       
       new_style = NULL;
@@ -550,18 +775,18 @@ gtk_style_attach (GtkStyle  *style,
   if (!new_style)
     {
       new_style = gtk_style_duplicate (style);
-      gtk_style_init (new_style, colormap, depth);
+      gtk_style_realize (new_style, colormap);
     }
 
   /* A style gets a refcount from being attached */
   if (new_style->attach_count == 0)
-    gtk_style_ref (new_style);
+    g_object_ref (new_style);
 
   /* Another refcount belongs to the parent */
   if (style != new_style) 
     {
-      gtk_style_unref (style);
-      gtk_style_ref (new_style);
+      g_object_unref (style);
+      g_object_ref (new_style);
     }
   
   new_style->attach_count++;
@@ -572,239 +797,184 @@ gtk_style_attach (GtkStyle  *style,
 void
 gtk_style_detach (GtkStyle *style)
 {
-  gint i;
-  
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   
   style->attach_count -= 1;
   if (style->attach_count == 0)
     {
-      if (style->engine)
-        style->engine->unrealize_style (style);
+      GTK_STYLE_GET_CLASS (style)->unrealize (style);
       
-      gtk_gc_release (style->black_gc);
-      gtk_gc_release (style->white_gc);
-      
-      for (i = 0; i < 5; i++)
-        {
-          gtk_gc_release (style->fg_gc[i]);
-          gtk_gc_release (style->bg_gc[i]);
-          gtk_gc_release (style->light_gc[i]);
-          gtk_gc_release (style->dark_gc[i]);
-          gtk_gc_release (style->mid_gc[i]);
-          gtk_gc_release (style->text_gc[i]);
-          gtk_gc_release (style->base_gc[i]);
-        }
+      gdk_colormap_unref (style->colormap);
+      style->colormap = NULL;
       
-      gtk_style_unref (style);
+      g_object_unref (style);
     }
 }
 
+/**
+ * gtk_style_ref:
+ * @style: a #GtkStyle.
+ * @returns: @style.
+ *
+ * Deprecated equivalent of g_object_ref().
+ **/
 GtkStyle*
 gtk_style_ref (GtkStyle *style)
 {
-  g_return_val_if_fail (style != NULL, NULL);
-  g_return_val_if_fail (style->ref_count > 0, NULL);
-  
-  style->ref_count += 1;
-  return style;
+  return (GtkStyle *) g_object_ref (G_OBJECT (style));
 }
 
+/**
+ * gtk_style_unref:
+ * @style: a #GtkStyle.
+ *
+ * Deprecated equivalent of g_object_unref().
+ **/
 void
 gtk_style_unref (GtkStyle *style)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->ref_count > 0);
-  
-  style->ref_count -= 1;
-  if (style->ref_count == 0)
-    gtk_style_destroy (style);
+  g_object_unref (G_OBJECT (style));
 }
 
 static void
-gtk_style_init (GtkStyle    *style,
-                GdkColormap *colormap,
-                gint         depth)
+gtk_style_realize (GtkStyle    *style,
+                   GdkColormap *colormap)
 {
-  GdkGCValues gc_values;
-  GdkGCValuesMask gc_values_mask;
-  gint i;
-  
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GDK_IS_COLORMAP (colormap));
   
-  style->colormap = colormap;
-  style->depth = depth;
+  style->colormap = gdk_colormap_ref (colormap);
+  style->depth = gdk_colormap_get_visual (colormap)->depth;
+
+  GTK_STYLE_GET_CLASS (style)->realize (style);
+}
+
+GtkIconSet*
+gtk_style_lookup_icon_set (GtkStyle   *style,
+                           const char *stock_id)
+{
+  GSList *iter;
+
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+  g_return_val_if_fail (stock_id != NULL, NULL);
   
-  for (i = 0; i < 5; i++)
+  iter = style->icon_factories;
+  while (iter != NULL)
     {
-      gtk_style_shade (&style->bg[i], &style->light[i], LIGHTNESS_MULT);
-      gtk_style_shade (&style->bg[i], &style->dark[i], DARKNESS_MULT);
+      GtkIconSet *icon_set = gtk_icon_factory_lookup (GTK_ICON_FACTORY (iter->data),
+                                                     stock_id);
+      if (icon_set)
+        return icon_set;
       
-      style->mid[i].red = (style->light[i].red + style->dark[i].red) / 2;
-      style->mid[i].green = (style->light[i].green + style->dark[i].green) / 2;
-      style->mid[i].blue = (style->light[i].blue + style->dark[i].blue) / 2;
+      iter = g_slist_next (iter);
     }
+
+  return gtk_icon_factory_lookup_default (stock_id);
+}
+
+/**
+ * gtk_draw_hline:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @x1: the starting x coordinate
+ * @x2: the ending x coordinate
+ * @y: the y coordinate
+ * 
+ * Draws a horizontal line from (@x1, @y) to (@x2, @y) in @window
+ * using the given style and state.
+ * 
+ * This function is deprecated, use gtk_paint_hline() instead.
+ **/
+void
+gtk_draw_hline (GtkStyle     *style,
+                GdkWindow    *window,
+                GtkStateType  state_type,
+                gint          x1,
+                gint          x2,
+                gint          y)
+{
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL);
   
-  gdk_color_black (colormap, &style->black);
-  gdk_color_white (colormap, &style->white);
-  
-  gc_values_mask = GDK_GC_FOREGROUND | GDK_GC_FONT;
-  if (style->font->type == GDK_FONT_FONT)
-    {
-      gc_values.font = style->font;
-    }
-  else if (style->font->type == GDK_FONT_FONTSET)
-    {
-      gc_values.font = default_font;
-    }
+  GTK_STYLE_GET_CLASS (style)->draw_hline (style, window, state_type, NULL, NULL, NULL, x1, x2, y);
+}
+
+
+/**
+ * gtk_draw_vline:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @y1: the starting y coordinate
+ * @y2: the ending y coordinate
+ * @x: the x coordinate
+ * 
+ * Draws a vertical line from (@x, @y1) to (@x, @y2) in @window
+ * using the given style and state.
+ * 
+ * This function is deprecated, use gtk_paint_vline() instead.
+ **/
+void
+gtk_draw_vline (GtkStyle     *style,
+                GdkWindow    *window,
+                GtkStateType  state_type,
+                gint          y1,
+                gint          y2,
+                gint          x)
+{
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL);
   
-  gc_values.foreground = style->black;
-  style->black_gc = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+  GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, NULL, NULL, NULL, y1, y2, x);
+}
+
+/**
+ * gtk_draw_shadow:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle 
+ * @height: width of the rectangle 
+ *
+ * Draws a shadow around the given rectangle in @window 
+ * using the given style and state and shadow type.
+ * 
+ * This function is deprecated, use gtk_paint_shadow() instead.
+ */
+void
+gtk_draw_shadow (GtkStyle      *style,
+                 GdkWindow     *window,
+                 GtkStateType   state_type,
+                 GtkShadowType  shadow_type,
+                 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);
   
-  gc_values.foreground = style->white;
-  style->white_gc = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-  
-  for (i = 0; i < 5; i++)
-    {
-      if (style->rc_style && style->rc_style->bg_pixmap_name[i])
-        style->bg_pixmap[i] = gtk_rc_load_image (style->colormap,
-                                                 &style->bg[i],
-                                                 style->rc_style->bg_pixmap_name[i]);
-      
-      if (!gdk_color_alloc (colormap, &style->fg[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->fg[i].red, style->fg[i].green, style->fg[i].blue);
-      if (!gdk_color_alloc (colormap, &style->bg[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->bg[i].red, style->bg[i].green, style->bg[i].blue);
-      if (!gdk_color_alloc (colormap, &style->light[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->light[i].red, style->light[i].green, style->light[i].blue);
-      if (!gdk_color_alloc (colormap, &style->dark[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->dark[i].red, style->dark[i].green, style->dark[i].blue);
-      if (!gdk_color_alloc (colormap, &style->mid[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->mid[i].red, style->mid[i].green, style->mid[i].blue);
-      if (!gdk_color_alloc (colormap, &style->text[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->text[i].red, style->text[i].green, style->text[i].blue);
-      if (!gdk_color_alloc (colormap, &style->base[i]))
-        g_warning ("unable to allocate color: ( %d %d %d )",
-                   style->base[i].red, style->base[i].green, style->base[i].blue);
-      
-      gc_values.foreground = style->fg[i];
-      style->fg_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-      
-      gc_values.foreground = style->bg[i];
-      style->bg_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-      
-      gc_values.foreground = style->light[i];
-      style->light_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-      
-      gc_values.foreground = style->dark[i];
-      style->dark_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-      
-      gc_values.foreground = style->mid[i];
-      style->mid_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-      
-      gc_values.foreground = style->text[i];
-      style->text_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-      
-      gc_values.foreground = style->base[i];
-      style->base_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
-    }
-  
-  if (style->engine)
-    style->engine->realize_style (style);
-}
-
-static void
-gtk_style_destroy (GtkStyle *style)
-{
-  g_return_if_fail (style->attach_count == 0);
-  
-  if (style->styles)
-    {
-      if (style->styles->data != style)
-        g_slist_remove (style->styles, style);
-      else
-        {
-          GSList *tmp_list = style->styles->next;
-         
-          while (tmp_list)
-            {
-              ((GtkStyle*) tmp_list->data)->styles = style->styles->next;
-              tmp_list = tmp_list->next;
-            }
-          g_slist_free_1 (style->styles);
-        }
-    }
-  
-  if (style->engine)
-    {
-      style->engine->destroy_style (style);
-      gtk_theme_engine_unref (style->engine);
-    }
-  
-  gdk_font_unref (style->font);
-  pango_font_description_free (style->font_desc);
-  
-  if (style->rc_style)
-    gtk_rc_style_unref (style->rc_style);
-
-  g_free (style);
-}
-
-void
-gtk_draw_hline (GtkStyle     *style,
-                GdkWindow    *window,
-                GtkStateType  state_type,
-                gint          x1,
-                gint          x2,
-                gint          y)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_hline != NULL);
-  
-  style->klass->draw_hline (style, window, state_type, NULL, NULL, NULL, x1, x2, y);
-}
-
-
-void
-gtk_draw_vline (GtkStyle     *style,
-                GdkWindow    *window,
-                GtkStateType  state_type,
-                gint          y1,
-                gint          y2,
-                gint          x)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_vline != NULL);
-  
-  style->klass->draw_vline (style, window, state_type, NULL, NULL, NULL, y1, y2, x);
-}
-
-
-void
-gtk_draw_shadow (GtkStyle      *style,
-                 GdkWindow     *window,
-                 GtkStateType   state_type,
-                 GtkShadowType  shadow_type,
-                 gint           x,
-                 gint           y,
-                 gint           width,
-                 gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_shadow != NULL);
-  
-  style->klass->draw_shadow (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_shadow (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
+/**
+ * gtk_draw_polygon:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @points: an array of #GdkPoint<!>s
+ * @npoints: length of @points
+ * @fill: %TRUE if the polygon should be filled
+ * 
+ * Draws a polygon on @window with the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_polygon() instead.
+ */ 
 void
 gtk_draw_polygon (GtkStyle      *style,
                   GdkWindow     *window,
@@ -814,13 +984,30 @@ gtk_draw_polygon (GtkStyle      *style,
                   gint           npoints,
                   gboolean       fill)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_polygon != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_polygon != NULL);
   
-  style->klass->draw_polygon (style, window, state_type, shadow_type, NULL, NULL, NULL, points, npoints, fill);
+  GTK_STYLE_GET_CLASS (style)->draw_polygon (style, window, state_type, shadow_type, NULL, NULL, NULL, points, npoints, fill);
 }
 
+/**
+ * gtk_draw_arrow:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @arrow_type: the type of arrow to draw
+ * @fill: %TRUE if the arrow tip should be filled
+ * @x: x origin of the rectangle to draw the arrow in
+ * @y: y origin of the rectangle to draw the arrow in
+ * @width: width of the rectangle to draw the arrow in
+ * @height: height of the rectangle to draw the arrow in
+ * 
+ * Draws an arrow in the given rectangle on @window using the given 
+ * parameters. @arrow_type determines the direction of the arrow.
+ *
+ * This function is deprecated, use gtk_paint_arrow() instead.
+ */
 void
 gtk_draw_arrow (GtkStyle      *style,
                 GdkWindow     *window,
@@ -833,14 +1020,27 @@ gtk_draw_arrow (GtkStyle      *style,
                 gint           width,
                 gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_arrow != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL);
   
-  style->klass->draw_arrow (style, window, state_type, shadow_type, NULL, NULL, NULL, arrow_type, fill, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_arrow (style, window, state_type, shadow_type, NULL, NULL, NULL, arrow_type, fill, x, y, width, height);
 }
 
-
+/**
+ * gtk_draw_diamond:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @x: x origin of the rectangle to draw the diamond in
+ * @y: y origin of the rectangle to draw the diamond in
+ * @width: width of the rectangle to draw the diamond in
+ * @height: height of the rectangle to draw the diamond in
+ *
+ * Draws a diamond in the given rectangle on @window using the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_diamond() instead.
+ */
 void
 gtk_draw_diamond (GtkStyle      *style,
                   GdkWindow     *window,
@@ -851,31 +1051,25 @@ gtk_draw_diamond (GtkStyle      *style,
                   gint           width,
                   gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_diamond != NULL);
-  
-  style->klass->draw_diamond (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
-}
-
-
-void
-gtk_draw_oval (GtkStyle      *style,
-               GdkWindow     *window,
-               GtkStateType   state_type,
-               GtkShadowType  shadow_type,
-               gint           x,
-               gint           y,
-               gint           width,
-               gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_oval != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL);
   
-  style->klass->draw_oval (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_diamond (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
+/**
+ * gtk_draw_string:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @x: x origin
+ * @y: y origin
+ * @string: the string to draw
+ * 
+ * Draws a text string on @window with the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_layout() instead.
+ */
 void
 gtk_draw_string (GtkStyle      *style,
                  GdkWindow     *window,
@@ -884,13 +1078,27 @@ gtk_draw_string (GtkStyle      *style,
                  gint           y,
                  const gchar   *string)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_string != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL);
   
-  style->klass->draw_string (style, window, state_type, NULL, NULL, NULL, x, y, string);
+  GTK_STYLE_GET_CLASS (style)->draw_string (style, window, state_type, NULL, NULL, NULL, x, y, string);
 }
 
+/**
+ * gtk_draw_box:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @x: x origin of the box
+ * @y: y origin of the box
+ * @width: the width of the box
+ * @height: the height of the box
+ * 
+ * Draws a box on @window with the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_box() instead.
+ */
 void
 gtk_draw_box (GtkStyle      *style,
               GdkWindow     *window,
@@ -901,13 +1109,27 @@ gtk_draw_box (GtkStyle      *style,
               gint           width,
               gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_box != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL);
   
-  style->klass->draw_box (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_box (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
+/**
+ * gtk_draw_flat_box:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @x: x origin of the box
+ * @y: y origin of the box
+ * @width: the width of the box
+ * @height: the height of the box
+ * 
+ * Draws a flat box on @window with the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_flat_box() instead.
+ */
 void
 gtk_draw_flat_box (GtkStyle      *style,
                    GdkWindow     *window,
@@ -918,13 +1140,28 @@ gtk_draw_flat_box (GtkStyle      *style,
                    gint           width,
                    gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_flat_box != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL);
   
-  style->klass->draw_flat_box (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_flat_box (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
+/**
+ * gtk_draw_check:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @x: x origin of the rectangle to draw the check in
+ * @y: y origin of the rectangle to draw the check in
+ * @width: the width of the rectangle to draw the check in
+ * @height: the height of the rectangle to draw the check in
+ * 
+ * Draws a check button indicator in the given rectangle on @window with 
+ * the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_check() instead.
+ */
 void
 gtk_draw_check (GtkStyle      *style,
                 GdkWindow     *window,
@@ -935,13 +1172,28 @@ gtk_draw_check (GtkStyle      *style,
                 gint           width,
                 gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_check != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL);
   
-  style->klass->draw_check (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_check (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
+/**
+ * gtk_draw_option:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @x: x origin of the rectangle to draw the option in
+ * @y: y origin of the rectangle to draw the option in
+ * @width: the width of the rectangle to draw the option in
+ * @height: the height of the rectangle to draw the option in
+ *
+ * Draws a radio button indicator in the given rectangle on @window with 
+ * the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_option() instead.
+ */
 void
 gtk_draw_option (GtkStyle      *style,
                 GdkWindow     *window,
@@ -952,48 +1204,28 @@ gtk_draw_option (GtkStyle      *style,
                 gint           width,
                 gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_option != NULL);
-  
-  style->klass->draw_option (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
-}
-
-void
-gtk_draw_cross (GtkStyle      *style,
-               GdkWindow     *window,
-               GtkStateType   state_type,
-               GtkShadowType  shadow_type,
-               gint           x,
-               gint           y,
-               gint           width,
-               gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_cross != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL);
   
-  style->klass->draw_cross (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
-}
-
-void
-gtk_draw_ramp (GtkStyle      *style,
-              GdkWindow     *window,
-              GtkStateType   state_type,
-              GtkShadowType  shadow_type,
-              GtkArrowType   arrow_type,
-              gint           x,
-              gint           y,
-              gint           width,
-              gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_ramp != NULL);
-  
-  style->klass->draw_ramp (style, window, state_type, shadow_type, NULL, NULL, NULL, arrow_type, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_option (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
+/**
+ * gtk_draw_tab:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @x: x origin of the rectangle to draw the tab in
+ * @y: y origin of the rectangle to draw the tab in
+ * @width: the width of the rectangle to draw the tab in
+ * @height: the height of the rectangle to draw the tab in
+ *
+ * Draws an option menu tab (i.e. the up and down pointing arrows)
+ * in the given rectangle on @window using the given parameters.
+ * 
+ * This function is deprecated, use gtk_paint_tab() instead.
+ */ 
 void
 gtk_draw_tab (GtkStyle      *style,
              GdkWindow     *window,
@@ -1004,11 +1236,10 @@ gtk_draw_tab (GtkStyle      *style,
              gint           width,
              gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_tab != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL);
   
-  style->klass->draw_tab (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
 }
 
 void
@@ -1024,11 +1255,10 @@ gtk_draw_shadow_gap (GtkStyle       *style,
                      gint            gap_x,
                      gint            gap_width)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_shadow_gap != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
   
-  style->klass->draw_shadow_gap (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side, gap_x, gap_width);
+  GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side, gap_x, gap_width);
 }
 
 void
@@ -1044,11 +1274,10 @@ gtk_draw_box_gap (GtkStyle       *style,
                   gint            gap_x,
                   gint            gap_width)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_box_gap != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL);
   
-  style->klass->draw_box_gap (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side, gap_x, gap_width);
+  GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side, gap_x, gap_width);
 }
 
 void
@@ -1062,13 +1291,26 @@ gtk_draw_extension (GtkStyle       *style,
                     gint            height,
                     GtkPositionType gap_side)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_extension != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL);
   
-  style->klass->draw_extension (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side);
+  GTK_STYLE_GET_CLASS (style)->draw_extension (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side);
 }
 
+/**
+ * gtk_draw_focus:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @x: the x origin of the rectangle around which to draw a focus indicator
+ * @y: the y origin of the rectangle around which to draw a focus indicator
+ * @width: the width of the rectangle around which to draw a focus indicator
+ * @height: the height of the rectangle around which to draw a focus indicator
+ *
+ * Draws a focus indicator around the given rectangle on @window using the
+ * given style.
+ * 
+ * This function is deprecated, use gtk_paint_focus() instead.
+ */
 void
 gtk_draw_focus (GtkStyle      *style,
                GdkWindow     *window,
@@ -1077,11 +1319,10 @@ gtk_draw_focus (GtkStyle      *style,
                gint           width,
                gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_focus != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL);
   
-  style->klass->draw_focus (style, window, NULL, NULL, NULL, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_focus (style, window, GTK_STATE_NORMAL, NULL, NULL, NULL, x, y, width, height);
 }
 
 void 
@@ -1095,11 +1336,10 @@ gtk_draw_slider (GtkStyle      *style,
                 gint           height,
                 GtkOrientation orientation)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_slider != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
   
-  style->klass->draw_slider (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
+  GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
 }
 
 void 
@@ -1113,88 +1353,534 @@ gtk_draw_handle (GtkStyle      *style,
                 gint           height,
                 GtkOrientation orientation)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_handle != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL);
   
-  style->klass->draw_handle (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
+  GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
 }
 
+void
+gtk_draw_expander (GtkStyle        *style,
+                   GdkWindow       *window,
+                   GtkStateType     state_type,
+                   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);
+  
+  GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type,
+                                              NULL, NULL, NULL,
+                                              x, y, expander_style);
+}
+
+void
+gtk_draw_layout (GtkStyle        *style,
+                 GdkWindow       *window,
+                 GtkStateType     state_type,
+                gboolean         use_text,
+                 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);
+  
+  GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text,
+                                            NULL, NULL, NULL,
+                                            x, y, layout);
+}
+
+/**
+ * gtk_draw_resize_grip:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @edge: the edge in which to draw the resize grip, currently only
+ *    %GTK_WINDOW_EDGE_SOUTH_EAST is implemented
+ * @x: the x origin of the rectangle in which to draw the resize grip
+ * @y: the y origin of the rectangle in which to draw the resize grip
+ * @width: the width of the rectangle in which to draw the resize grip
+ * @height: the height of the rectangle in which to draw the resize grip
+ *
+ * Draws a resize grip in the given rectangle on @window using the given
+ * parameters. 
+ * 
+ * This function is deprecated, use gtk_paint_resize_grip() instead.
+ */
+void
+gtk_draw_resize_grip (GtkStyle     *style,
+                      GdkWindow    *window,
+                      GtkStateType  state_type,
+                      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);
+
+  GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type,
+                                                 NULL, NULL, NULL,
+                                                 edge,
+                                                 x, y, width, height);
+}
+
+
+/**
+ * gtk_style_set_background:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * 
+ * Sets the background of @window to the background color or pixmap
+ * specified by @style for the given state.
+ */
 void
 gtk_style_set_background (GtkStyle    *style,
                           GdkWindow   *window,
                           GtkStateType state_type)
 {
-  GdkPixmap *pixmap;
-  gint parent_relative;
-  
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  if (style->engine && style->engine->set_background)
-    {
-      style->engine->set_background (style, window, state_type);
-      
-      return;
-    }
-  
-  if (style->bg_pixmap[state_type])
-    {
-      if (style->bg_pixmap[state_type] == (GdkPixmap*) GDK_PARENT_RELATIVE)
-        {
-          pixmap = NULL;
-          parent_relative = TRUE;
-        }
-      else
-        {
-          pixmap = style->bg_pixmap[state_type];
-          parent_relative = FALSE;
-        }
-      
-      gdk_window_set_back_pixmap (window, pixmap, parent_relative);
-    }
-  else
-    gdk_window_set_background (window, &style->bg[state_type]);
+  GTK_STYLE_GET_CLASS (style)->set_background (style, window, state_type);
 }
 
-
 /* Default functions */
-void
-gtk_style_apply_default_background (GtkStyle     *style,
-                                    GdkWindow    *window,
-                                    gboolean      set_bg,
-                                    GtkStateType  state_type, 
-                                    GdkRectangle *area, 
-                                    gint          x, 
-                                    gint          y, 
-                                    gint          width, 
-                                    gint          height)
+static GtkStyle *
+gtk_style_real_clone (GtkStyle *style)
 {
-  GdkRectangle new_rect, old_rect;
+  return GTK_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL));
+}
+
+static void
+gtk_style_real_copy (GtkStyle *style,
+                    GtkStyle *src)
+{
+  gint i;
   
-  if (area)
+  for (i = 0; i < 5; i++)
     {
-      old_rect.x = x;
-      old_rect.y = y;
-      old_rect.width = width;
-      old_rect.height = height;
+      style->fg[i] = src->fg[i];
+      style->bg[i] = src->bg[i];
+      style->text[i] = src->text[i];
+      style->base[i] = src->base[i];
       
-      if (!gdk_rectangle_intersect (area, &old_rect, &new_rect))
-        return;
+      style->bg_pixmap[i] = src->bg_pixmap[i];
     }
+
+  if (style->private_font)
+    gdk_font_unref (style->private_font);
+  style->private_font = src->private_font;
+  if (style->private_font)
+    gdk_font_ref (style->private_font);
+
+  if (style->font_desc)
+    pango_font_description_free (style->font_desc);
+  if (src->font_desc)
+    style->font_desc = pango_font_description_copy (src->font_desc);
   else
+    style->font_desc = NULL;
+  
+  style->xthickness = src->xthickness;
+  style->ythickness = src->ythickness;
+
+  if (style->rc_style)
+    gtk_rc_style_unref (style->rc_style);
+  style->rc_style = src->rc_style;
+  if (src->rc_style)
+    gtk_rc_style_ref (src->rc_style);
+
+  /* don't copy, just clear cache */
+  clear_property_cache (style);
+}
+
+static void
+gtk_style_real_init_from_rc (GtkStyle   *style,
+                            GtkRcStyle *rc_style)
+{
+  gint i;
+
+  /* cache _should_ be still empty */
+  clear_property_cache (style);
+
+  if (rc_style->font_desc)
+    pango_font_description_merge (style->font_desc, rc_style->font_desc, TRUE);
+    
+  for (i = 0; i < 5; i++)
     {
-      new_rect.x = x;
-      new_rect.y = y;
-      new_rect.width = width;
-      new_rect.height = height;
+      if (rc_style->color_flags[i] & GTK_RC_FG)
+       style->fg[i] = rc_style->fg[i];
+      if (rc_style->color_flags[i] & GTK_RC_BG)
+       style->bg[i] = rc_style->bg[i];
+      if (rc_style->color_flags[i] & GTK_RC_TEXT)
+       style->text[i] = rc_style->text[i];
+      if (rc_style->color_flags[i] & GTK_RC_BASE)
+       style->base[i] = rc_style->base[i];
     }
-  
-  if (!style->bg_pixmap[state_type] ||
-      gdk_window_get_type (window) == GDK_WINDOW_PIXMAP ||
-      (!set_bg && style->bg_pixmap[state_type] != (GdkPixmap*) GDK_PARENT_RELATIVE))
+
+  if (rc_style->xthickness >= 0)
+    style->xthickness = rc_style->xthickness;
+  if (rc_style->ythickness >= 0)
+    style->ythickness = rc_style->ythickness;
+
+  if (rc_style->icon_factories)
     {
-      GdkGC *gc = style->bg_gc[state_type];
+      GSList *iter;
+
+      style->icon_factories = g_slist_copy (rc_style->icon_factories);
+      
+      iter = style->icon_factories;
+      while (iter != NULL)
+        {
+          g_object_ref (G_OBJECT (iter->data));
+          
+          iter = g_slist_next (iter);
+        }
+    }
+}
+
+static gint
+style_property_values_cmp (gconstpointer bsearch_node1,
+                          gconstpointer bsearch_node2)
+{
+  const PropertyValue *val1 = bsearch_node1;
+  const PropertyValue *val2 = bsearch_node2;
+
+  if (val1->widget_type == val2->widget_type)
+    return val1->pspec < val2->pspec ? -1 : val1->pspec == val2->pspec ? 0 : 1;
+  else
+    return val1->widget_type < val2->widget_type ? -1 : 1;
+}
+
+const GValue*
+_gtk_style_peek_property_value (GtkStyle           *style,
+                               GType               widget_type,
+                               GParamSpec         *pspec,
+                               GtkRcPropertyParser parser)
+{
+  PropertyValue *pcache, key = { 0, NULL, { 0, } };
+  const GtkRcProperty *rcprop = NULL;
+  guint i;
+
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+  g_return_val_if_fail (g_type_is_a (pspec->owner_type, GTK_TYPE_WIDGET), NULL);
+  g_return_val_if_fail (g_type_is_a (widget_type, pspec->owner_type), NULL);
+
+  key.widget_type = widget_type;
+  key.pspec = pspec;
+
+  /* need value cache array */
+  if (!style->property_cache)
+    style->property_cache = g_array_new (FALSE, FALSE, sizeof (PropertyValue));
+  else
+    {
+      pcache = bsearch (&key,
+                       style->property_cache->data, style->property_cache->len,
+                       sizeof (PropertyValue), style_property_values_cmp);
+      if (pcache)
+       return &pcache->value;
+    }
+
+  i = 0;
+  while (i < style->property_cache->len &&
+        style_property_values_cmp (&key, &g_array_index (style->property_cache, PropertyValue, i)) >= 0)
+    i++;
+
+  g_array_insert_val (style->property_cache, i, key);
+  pcache = &g_array_index (style->property_cache, PropertyValue, i);
+
+  /* cache miss, initialize value type, then set contents */
+  g_param_spec_ref (pcache->pspec);
+  g_value_init (&pcache->value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+
+  /* value provided by rc style? */
+  if (style->rc_style)
+    {
+      GQuark prop_quark = g_quark_from_string (pspec->name);
+
+      do
+       {
+         rcprop = _gtk_rc_style_lookup_rc_property (style->rc_style,
+                                                    g_type_qname (widget_type),
+                                                    prop_quark);
+         if (rcprop)
+           break;
+         widget_type = g_type_parent (widget_type);
+       }
+      while (g_type_is_a (widget_type, pspec->owner_type));
+    }
+
+  /* when supplied by rc style, we need to convert */
+  if (rcprop && !_gtk_settings_parse_convert (parser, &rcprop->value,
+                                             pspec, &pcache->value))
+    {
+      gchar *contents = g_strdup_value_contents (&rcprop->value);
+      
+      g_message ("%s: failed to retrieve property `%s::%s' of type `%s' from rc file value \"%s\" of type `%s'",
+                rcprop->origin,
+                g_type_name (pspec->owner_type), pspec->name,
+                g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
+                contents,
+                G_VALUE_TYPE_NAME (&rcprop->value));
+      g_free (contents);
+      rcprop = NULL; /* needs default */
+    }
+  
+  /* not supplied by rc style (or conversion failed), revert to default */
+  if (!rcprop)
+    g_param_value_set_default (pspec, &pcache->value);
+
+  return &pcache->value;
+}
+
+static GdkPixmap *
+load_bg_image (GdkColormap *colormap,
+              GdkColor    *bg_color,
+              const gchar *filename)
+{
+  if (strcmp (filename, "<parent>") == 0)
+    return (GdkPixmap*) GDK_PARENT_RELATIVE;
+  else
+    {
+      return gdk_pixmap_colormap_create_from_xpm (NULL, colormap, NULL,
+                                                 bg_color,
+                                                 filename);
+    }
+}
+
+static void
+gtk_style_real_realize (GtkStyle *style)
+{
+  GdkGCValues gc_values;
+  GdkGCValuesMask gc_values_mask;
+  
+  gint i;
+
+  for (i = 0; i < 5; i++)
+    {
+      gtk_style_shade (&style->bg[i], &style->light[i], LIGHTNESS_MULT);
+      gtk_style_shade (&style->bg[i], &style->dark[i], DARKNESS_MULT);
+      
+      style->mid[i].red = (style->light[i].red + style->dark[i].red) / 2;
+      style->mid[i].green = (style->light[i].green + style->dark[i].green) / 2;
+      style->mid[i].blue = (style->light[i].blue + style->dark[i].blue) / 2;
+
+      style->text_aa[i].red = (style->text[i].red + style->base[i].red) / 2;
+      style->text_aa[i].green = (style->text[i].green + style->base[i].green) / 2;
+      style->text_aa[i].blue = (style->text[i].blue + style->base[i].blue) / 2;
+    }
+  
+  gdk_color_black (style->colormap, &style->black);
+  gdk_color_white (style->colormap, &style->white);
+  
+  gc_values_mask = GDK_GC_FOREGROUND;
+  
+  gc_values.foreground = style->black;
+  style->black_gc = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+  
+  gc_values.foreground = style->white;
+  style->white_gc = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+  
+  for (i = 0; i < 5; i++)
+    {
+      if (style->rc_style && style->rc_style->bg_pixmap_name[i])
+        style->bg_pixmap[i] = load_bg_image (style->colormap,
+                                            &style->bg[i],
+                                            style->rc_style->bg_pixmap_name[i]);
+      
+      if (!gdk_color_alloc (style->colormap, &style->fg[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->fg[i].red, style->fg[i].green, style->fg[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->bg[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->bg[i].red, style->bg[i].green, style->bg[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->light[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->light[i].red, style->light[i].green, style->light[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->dark[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->dark[i].red, style->dark[i].green, style->dark[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->mid[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->mid[i].red, style->mid[i].green, style->mid[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->text[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->text[i].red, style->text[i].green, style->text[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->base[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->base[i].red, style->base[i].green, style->base[i].blue);
+      if (!gdk_color_alloc (style->colormap, &style->text_aa[i]))
+        g_warning ("unable to allocate color: ( %d %d %d )",
+                   style->text_aa[i].red, style->text_aa[i].green, style->text_aa[i].blue);
+      
+      gc_values.foreground = style->fg[i];
+      style->fg_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+      
+      gc_values.foreground = style->bg[i];
+      style->bg_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+      
+      gc_values.foreground = style->light[i];
+      style->light_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+      
+      gc_values.foreground = style->dark[i];
+      style->dark_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+      
+      gc_values.foreground = style->mid[i];
+      style->mid_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+      
+      gc_values.foreground = style->text[i];
+      style->text_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+      
+      gc_values.foreground = style->base[i];
+      style->base_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+
+      gc_values.foreground = style->text_aa[i];
+      style->text_aa_gc[i] = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+    }
+}
+
+static void
+gtk_style_real_unrealize (GtkStyle *style)
+{
+  int i;
+
+  gtk_gc_release (style->black_gc);
+  gtk_gc_release (style->white_gc);
+      
+  for (i = 0; i < 5; i++)
+    {
+      gtk_gc_release (style->fg_gc[i]);
+      gtk_gc_release (style->bg_gc[i]);
+      gtk_gc_release (style->light_gc[i]);
+      gtk_gc_release (style->dark_gc[i]);
+      gtk_gc_release (style->mid_gc[i]);
+      gtk_gc_release (style->text_gc[i]);
+      gtk_gc_release (style->base_gc[i]);
+      gtk_gc_release (style->text_aa_gc[i]);
+
+      if (style->bg_pixmap[i] &&  style->bg_pixmap[i] != (GdkPixmap*) GDK_PARENT_RELATIVE)
+       gdk_pixmap_unref (style->bg_pixmap[i]);
+    }
+  
+  gdk_colormap_free_colors (style->colormap, style->fg, 5);
+  gdk_colormap_free_colors (style->colormap, style->bg, 5);
+  gdk_colormap_free_colors (style->colormap, style->light, 5);
+  gdk_colormap_free_colors (style->colormap, style->dark, 5);
+  gdk_colormap_free_colors (style->colormap, style->mid, 5);
+  gdk_colormap_free_colors (style->colormap, style->text, 5);
+  gdk_colormap_free_colors (style->colormap, style->base, 5);
+  gdk_colormap_free_colors (style->colormap, style->text_aa, 5);
+
+  style_unrealize_cursor_gcs (style);
+}
+
+static void
+gtk_style_real_set_background (GtkStyle    *style,
+                              GdkWindow   *window,
+                              GtkStateType state_type)
+{
+  GdkPixmap *pixmap;
+  gint parent_relative;
+  
+  if (style->bg_pixmap[state_type])
+    {
+      if (style->bg_pixmap[state_type] == (GdkPixmap*) GDK_PARENT_RELATIVE)
+        {
+          pixmap = NULL;
+          parent_relative = TRUE;
+        }
+      else
+        {
+          pixmap = style->bg_pixmap[state_type];
+          parent_relative = FALSE;
+        }
+      
+      gdk_window_set_back_pixmap (window, pixmap, parent_relative);
+    }
+  else
+    gdk_window_set_background (window, &style->bg[state_type]);
+}
+
+/**
+ * gtk_style_render_icon:
+ * @style: a #GtkStyle
+ * @source: the #GtkIconSource specifying the icon to render
+ * @direction: a text direction
+ * @state: a state
+ * @size: the size to render the icon at. A size of (GtkIconSize)-1
+ *        means render at the size of the source and don't scale.
+ * @widget: the widget 
+ * @detail: a style detail
+ * @returns: a newly-created #GdkPixbuf containing the rendered icon
+ *
+ * Renders the icon specified by @source at the given @size 
+ * according to the given parameters and returns the result in a 
+ * pixbuf.
+ */
+GdkPixbuf *
+gtk_style_render_icon (GtkStyle            *style,
+                       const GtkIconSource *source,
+                       GtkTextDirection     direction,
+                       GtkStateType         state,
+                       GtkIconSize          size,
+                       GtkWidget           *widget,
+                       const gchar         *detail)
+{
+  GdkPixbuf *pixbuf;
+  
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+  g_return_val_if_fail (GTK_STYLE_GET_CLASS (style)->render_icon != NULL, NULL);
+  
+  pixbuf = GTK_STYLE_GET_CLASS (style)->render_icon (style, source, direction, state,
+                                                     size, widget, detail);
+
+  g_return_val_if_fail (pixbuf != NULL, NULL);
+
+  return pixbuf;
+}
+
+/* Default functions */
+void
+gtk_style_apply_default_background (GtkStyle     *style,
+                                    GdkWindow    *window,
+                                    gboolean      set_bg,
+                                    GtkStateType  state_type, 
+                                    GdkRectangle *area, 
+                                    gint          x, 
+                                    gint          y, 
+                                    gint          width, 
+                                    gint          height)
+{
+  GdkRectangle new_rect, old_rect;
+  
+  if (area)
+    {
+      old_rect.x = x;
+      old_rect.y = y;
+      old_rect.width = width;
+      old_rect.height = height;
+      
+      if (!gdk_rectangle_intersect (area, &old_rect, &new_rect))
+        return;
+    }
+  else
+    {
+      new_rect.x = x;
+      new_rect.y = y;
+      new_rect.width = width;
+      new_rect.height = height;
+    }
+  
+  if (!style->bg_pixmap[state_type] ||
+      GDK_IS_PIXMAP (window) ||
+      (!set_bg && style->bg_pixmap[state_type] != (GdkPixmap*) GDK_PARENT_RELATIVE))
+    {
+      GdkGC *gc = style->bg_gc[state_type];
       
       if (style->bg_pixmap[state_type])
         {
@@ -1223,6 +1909,136 @@ gtk_style_apply_default_background (GtkStyle     *style,
     }
 }
 
+static GdkPixbuf*
+scale_or_ref (GdkPixbuf *src,
+              gint width,
+              gint height)
+{
+  if (width == gdk_pixbuf_get_width (src) &&
+      height == gdk_pixbuf_get_height (src))
+    {
+      gdk_pixbuf_ref (src);
+      return src;
+    }
+  else
+    {
+      return gdk_pixbuf_scale_simple (src,
+                                      width, height,
+                                      GDK_INTERP_BILINEAR);
+    }
+}
+
+static GdkPixbuf *
+gtk_default_render_icon (GtkStyle            *style,
+                         const GtkIconSource *source,
+                         GtkTextDirection     direction,
+                         GtkStateType         state,
+                         GtkIconSize          size,
+                         GtkWidget           *widget,
+                         const gchar         *detail)
+{
+  gint width = 1;
+  gint height = 1;
+  GdkPixbuf *scaled;
+  GdkPixbuf *stated;
+  GdkPixbuf *base_pixbuf;
+
+  /* Oddly, style can be NULL in this function, because
+   * GtkIconSet can be used without a style and if so
+   * it uses this function.
+   */
+
+  base_pixbuf = gtk_icon_source_get_pixbuf (source);
+
+  g_return_val_if_fail (base_pixbuf != NULL, NULL);
+  
+  if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup (size, &width, &height))
+    {
+      g_warning (G_STRLOC ": invalid icon size `%d'", size);
+      return NULL;
+    }
+
+  /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
+   * leave it alone.
+   */
+  if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source))
+    scaled = scale_or_ref (base_pixbuf, width, height);
+  else
+    scaled = GDK_PIXBUF (g_object_ref (G_OBJECT (base_pixbuf)));
+
+  /* If the state was wildcarded, then generate a state. */
+  if (gtk_icon_source_get_state_wildcarded (source))
+    {
+      if (state == GTK_STATE_INSENSITIVE)
+        {
+          stated = gdk_pixbuf_copy (scaled);      
+          
+          gdk_pixbuf_saturate_and_pixelate (scaled, stated,
+                                            0.8, TRUE);
+          
+          gdk_pixbuf_unref (scaled);
+        }
+      else if (state == GTK_STATE_PRELIGHT)
+        {
+          stated = gdk_pixbuf_copy (scaled);      
+          
+          gdk_pixbuf_saturate_and_pixelate (scaled, stated,
+                                            1.2, FALSE);
+          
+          gdk_pixbuf_unref (scaled);
+        }
+      else
+        {
+          stated = scaled;
+        }
+    }
+  else
+    stated = scaled;
+  
+  return stated;
+}
+
+static void
+sanitize_size (GdkWindow *window,
+              gint      *width,
+              gint      *height)
+{
+  if ((*width == -1) && (*height == -1))
+    gdk_window_get_size (window, width, height);
+  else if (*width == -1)
+    gdk_window_get_size (window, width, NULL);
+  else if (*height == -1)
+    gdk_window_get_size (window, NULL, height);
+}
+
+static void
+draw_part (GdkDrawable  *drawable,
+          GdkGC        *gc,
+          GdkRectangle *area,
+          gint          x,
+          gint          y,
+          IndicatorPart part)
+{
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, area);
+  
+  if (!indicator_parts[part].bmap)
+    indicator_parts[part].bmap = gdk_bitmap_create_from_data (drawable,
+                                                             indicator_parts[part].bits,
+                                                             INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
+
+  gdk_gc_set_ts_origin (gc, x, y);
+  gdk_gc_set_stipple (gc, indicator_parts[part].bmap);
+  gdk_gc_set_fill (gc, GDK_STIPPLED);
+
+  gdk_draw_rectangle (drawable, gc, TRUE, x, y, INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
+
+  gdk_gc_set_fill (gc, GDK_SOLID);
+
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, NULL);
+}
+
 static void
 gtk_default_draw_hline (GtkStyle     *style,
                         GdkWindow    *window,
@@ -1238,11 +2054,11 @@ gtk_default_draw_hline (GtkStyle     *style,
   gint thickness_dark;
   gint i;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  thickness_light = style->klass->ythickness / 2;
-  thickness_dark = style->klass->ythickness - thickness_light;
+  thickness_light = style->ythickness / 2;
+  thickness_dark = style->ythickness - thickness_light;
   
   if (area)
     {
@@ -1295,11 +2111,11 @@ gtk_default_draw_vline (GtkStyle     *style,
   gint thickness_dark;
   gint i;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  thickness_light = style->klass->xthickness / 2;
-  thickness_dark = style->klass->xthickness - thickness_light;
+  thickness_light = style->xthickness / 2;
+  thickness_dark = style->xthickness - thickness_light;
   
   if (area)
     {
@@ -1326,6 +2142,178 @@ gtk_default_draw_vline (GtkStyle     *style,
 }
 
 
+static void
+draw_thin_shadow (GtkStyle      *style,
+                 GdkWindow     *window,
+                 GtkStateType   state,
+                 GdkRectangle  *area,
+                 gint           x,
+                 gint           y,
+                 gint           width,
+                 gint           height)
+{
+  GdkGC *gc1, *gc2;
+
+  sanitize_size (window, &width, &height);
+  
+  gc1 = style->light_gc[state];
+  gc2 = style->dark_gc[state];
+  
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (gc1, area);
+      gdk_gc_set_clip_rectangle (gc2, area);
+    }
+  
+  gdk_draw_line (window, gc1,
+                x, y + height - 1, x + width - 1, y + height - 1);
+  gdk_draw_line (window, gc1,
+                x + width - 1, y,  x + width - 1, y + height - 1);
+      
+  gdk_draw_line (window, gc2,
+                x, y, x + width - 1, y);
+  gdk_draw_line (window, gc2,
+                x, y, x, y + height - 1);
+
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (gc1, NULL);
+      gdk_gc_set_clip_rectangle (gc2, NULL);
+    }
+}
+
+static void
+draw_spin_entry_shadow (GtkStyle      *style,
+                       GdkWindow     *window,
+                       GtkStateType   state,
+                       GdkRectangle  *area,
+                       gint           x,
+                       gint           y,
+                       gint           width,
+                       gint           height)
+{
+  gint window_width, window_height;
+  gboolean focus_inset;
+
+  gdk_window_get_size (window, &window_width, &window_height);
+
+  if (width == -1)
+    width = window_width;
+  if (height == 1)
+    height = window_height;
+
+  focus_inset = (width < window_width && height < window_height);
+  
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (style->light_gc[state], area);
+      gdk_gc_set_clip_rectangle (style->dark_gc[state], area);
+      gdk_gc_set_clip_rectangle (style->black_gc, area);
+      gdk_gc_set_clip_rectangle (style->bg_gc[state], area);
+      gdk_gc_set_clip_rectangle (style->base_gc[state], area);
+    }
+
+  gdk_draw_line (window, style->light_gc[state],
+                x, y + height - 1, x + width - 1, y + height - 1);
+
+  gdk_draw_line (window, 
+                style->base_gc[state],
+                x + width - 1,  y + 1, x + width - 1,  y + height - 3);
+      
+  if (!focus_inset)
+    {
+      gdk_draw_line (window, style->bg_gc[state],
+                    x + 1, y + height - 2, x + width - 1, y + height - 2);
+      gdk_draw_line (window, 
+                    style->base_gc[state],
+                    x + width - 2, y + 1, x + width - 2, y + height - 3);
+  
+      gdk_draw_line (window, style->black_gc,
+                    x + 1, y + 1, x + width - 1, y + 1);
+      gdk_draw_line (window, style->black_gc,
+                    x + 1, y + 1, x + 1, y + height - 2);
+    }
+      
+  gdk_draw_line (window, style->dark_gc[state],
+                x, y, x + width - 1, y);
+  gdk_draw_line (window, style->dark_gc[state],
+                x, y, x, y + height - 1);
+
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (style->light_gc[state], NULL);
+      gdk_gc_set_clip_rectangle (style->dark_gc[state], NULL);
+      gdk_gc_set_clip_rectangle (style->black_gc, NULL);
+      gdk_gc_set_clip_rectangle (style->bg_gc[state], NULL);
+      gdk_gc_set_clip_rectangle (style->base_gc[state], NULL);
+    }
+}
+
+static void
+draw_spinbutton_shadow (GtkStyle        *style,
+                       GdkWindow       *window,
+                       GtkStateType     state,
+                       GtkTextDirection direction,
+                       GdkRectangle    *area,
+                       gint             x,
+                       gint             y,
+                       gint             width,
+                       gint             height)
+{
+  sanitize_size (window, &width, &height);
+
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (style->black_gc, area);
+      gdk_gc_set_clip_rectangle (style->bg_gc[state], area);
+      gdk_gc_set_clip_rectangle (style->dark_gc[state], area);
+      gdk_gc_set_clip_rectangle (style->light_gc[state], area);
+    }
+
+  if (direction == GTK_TEXT_DIR_LTR)
+    {
+      gdk_draw_line (window, style->dark_gc[state],
+                    x, y, x + width - 1, y);
+      gdk_draw_line (window, style->black_gc,
+                    x, y + 1, x + width - 2, y + 1);
+      gdk_draw_line (window, style->black_gc,
+                    x + width - 2, y + 2, x + width - 2, y + height - 3);
+      gdk_draw_line (window, style->light_gc[state],
+                    x + width - 1, y + 1, x + width - 1, y + height - 2);
+      gdk_draw_line (window, style->light_gc[state],
+                    x, y + height - 1, x + width - 1, y + height - 1);
+      gdk_draw_line (window, style->bg_gc[state],
+                    x, y + height - 2, x + width - 2, y + height - 2);
+      gdk_draw_line (window, style->black_gc,
+                    x, y + 2, x, y + height - 3);
+    }
+  else
+    {
+      gdk_draw_line (window, style->dark_gc[state],
+                    x, y, x + width - 1, y);
+      gdk_draw_line (window, style->dark_gc[state],
+                    x, y + 1, x, y + height - 1);
+      gdk_draw_line (window, style->black_gc,
+                    x + 1, y + 1, x + width - 1, y + 1);
+      gdk_draw_line (window, style->black_gc,
+                    x + 1, y + 2, x + 1, y + height - 2);
+      gdk_draw_line (window, style->black_gc,
+                    x + width - 1, y + 2, x + width - 1, y + height - 3);
+      gdk_draw_line (window, style->light_gc[state],
+                    x + 1, y + height - 1, x + width - 1, y + height - 1);
+      gdk_draw_line (window, style->bg_gc[state],
+                    x + 2, y + height - 2, x + width - 1, y + height - 2);
+    }
+  
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (style->black_gc, NULL);
+      gdk_gc_set_clip_rectangle (style->bg_gc[state], NULL);
+      gdk_gc_set_clip_rectangle (style->dark_gc[state], NULL);
+      gdk_gc_set_clip_rectangle (style->light_gc[state], NULL);
+    }
+}
+
 static void
 gtk_default_draw_shadow (GtkStyle      *style,
                          GdkWindow     *window,
@@ -1345,15 +2333,37 @@ gtk_default_draw_shadow (GtkStyle      *style,
   gint thickness_dark;
   gint i;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
+
+  if (shadow_type == GTK_SHADOW_IN)
+    {
+      if (detail && (strcmp (detail, "buttondefault") == 0))
+       {
+         sanitize_size (window, &width, &height);
+
+         gdk_draw_rectangle (window, style->black_gc, FALSE,
+                             x, y, width - 1, height - 1);
+         
+         return;
+       }
+      if (detail && strcmp (detail, "trough") == 0)
+       {
+         draw_thin_shadow (style, window, state_type, area,
+                           x, y, width, height);
+         return;
+       }
+      if (widget && GTK_IS_SPIN_BUTTON (widget) &&
+         detail && strcmp (detail, "spinbutton") == 0)
+       {
+         draw_spinbutton_shadow (style, window, state_type,
+                                 gtk_widget_get_direction (widget), area, x, y, width, height);
+         
+         return;
+       }
+    }
   
-  if ((width == -1) && (height == -1))
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   switch (shadow_type)
     {
@@ -1389,105 +2399,236 @@ gtk_default_draw_shadow (GtkStyle      *style,
       break;
       
     case GTK_SHADOW_IN:
-      gdk_draw_line (window, gc1,
-                     x, y + height - 1, x + width - 1, y + height - 1);
-      gdk_draw_line (window, gc1,
-                     x + width - 1, y, x + width - 1, y + height - 1);
-      
-      gdk_draw_line (window, style->bg_gc[state_type],
-                     x + 1, y + height - 2, x + width - 2, y + height - 2);
-      gdk_draw_line (window, style->bg_gc[state_type],
-                     x + width - 2, y + 1, x + width - 2, y + height - 2);
-      
-      gdk_draw_line (window, style->black_gc,
-                     x + 1, y + 1, x + width - 2, y + 1);
-      gdk_draw_line (window, style->black_gc,
-                     x + 1, y + 1, x + 1, y + height - 2);
-      
-      gdk_draw_line (window, gc2,
-                     x, y, x + width - 1, y);
-      gdk_draw_line (window, gc2,
-                     x, y, x, y + height - 1);
+      /* Light around right and bottom edge */
+
+      if (style->ythickness > 0)
+        gdk_draw_line (window, gc1,
+                       x, y + height - 1, x + width - 1, y + height - 1);
+      if (style->xthickness > 0)
+        gdk_draw_line (window, gc1,
+                       x + width - 1, y, x + width - 1, y + height - 1);
+
+      if (style->ythickness > 1)
+        gdk_draw_line (window, style->bg_gc[state_type],
+                       x + 1, y + height - 2, x + width - 2, y + height - 2);
+      if (style->xthickness > 1)
+        gdk_draw_line (window, style->bg_gc[state_type],
+                       x + width - 2, y + 1, x + width - 2, y + height - 2);
+
+      /* Dark around left and top */
+
+      if (style->ythickness > 1)
+        gdk_draw_line (window, style->black_gc,
+                       x + 1, y + 1, x + width - 2, y + 1);
+      if (style->xthickness > 1)
+        gdk_draw_line (window, style->black_gc,
+                       x + 1, y + 1, x + 1, y + height - 2);
+
+      if (style->ythickness > 0)
+        gdk_draw_line (window, gc2,
+                       x, y, x + width - 1, y);
+      if (style->xthickness > 0)
+        gdk_draw_line (window, gc2,
+                       x, y, x, y + height - 1);
       break;
       
     case GTK_SHADOW_OUT:
-      gdk_draw_line (window, gc1,
-                     x + 1, y + height - 2, x + width - 2, y + height - 2);
-      gdk_draw_line (window, gc1,
-                     x + width - 2, y + 1, x + width - 2, y + height - 2);
-      
-      gdk_draw_line (window, gc2,
-                     x, y, x + width - 1, y);
-      gdk_draw_line (window, gc2,
-                     x, y, x, y + height - 1);
-      
-      gdk_draw_line (window, style->bg_gc[state_type],
-                     x + 1, y + 1, x + width - 2, y + 1);
-      gdk_draw_line (window, style->bg_gc[state_type],
-                     x + 1, y + 1, x + 1, y + height - 2);
+      /* Dark around right and bottom edge */
+
+      if (style->ythickness > 0)
+        {
+          if (style->ythickness > 1)
+            {
+              gdk_draw_line (window, gc1,
+                             x + 1, y + height - 2, x + width - 2, y + height - 2);
+              gdk_draw_line (window, style->black_gc,
+                             x, y + height - 1, x + width - 1, y + height - 1);
+            }
+          else
+            {
+              gdk_draw_line (window, gc1,
+                             x + 1, y + height - 1, x + width - 1, y + height - 1);
+            }
+        }
+
+      if (style->xthickness > 0)
+        {
+          if (style->xthickness > 1)
+            {
+              gdk_draw_line (window, gc1,
+                             x + width - 2, y + 1, x + width - 2, y + height - 2);
+              
+              gdk_draw_line (window, style->black_gc,
+                             x + width - 1, y, x + width - 1, y + height - 1);
+            }
+          else
+            {
+              gdk_draw_line (window, gc1,
+                             x + width - 1, y + 1, x + width - 1, y + height - 1);
+            }
+        }
       
-      gdk_draw_line (window, style->black_gc,
-                     x, y + height - 1, x + width - 1, y + height - 1);
-      gdk_draw_line (window, style->black_gc,
-                     x + width - 1, y, x + width - 1, y + height - 1);
+      /* Light around top and left */
+
+      if (style->ythickness > 0)
+        gdk_draw_line (window, gc2,
+                       x, y, x + width - 1, y);
+      if (style->xthickness > 0)
+        gdk_draw_line (window, gc2,
+                       x, y, x, y + height - 1);
+
+      if (style->ythickness > 1)
+        gdk_draw_line (window, style->bg_gc[state_type],
+                       x + 1, y + 1, x + width - 2, y + 1);
+      if (style->xthickness > 1)
+        gdk_draw_line (window, style->bg_gc[state_type],
+                       x + 1, y + 1, x + 1, y + height - 2);
       break;
       
     case GTK_SHADOW_ETCHED_IN:
     case GTK_SHADOW_ETCHED_OUT:
-      thickness_light = 1;
-      thickness_dark = 1;
+      if (style->xthickness > 0)
+        {
+          if (style->xthickness > 1)
+            {
+              thickness_light = 1;
+              thickness_dark = 1;
       
-      for (i = 0; i < thickness_dark; i++)
+              for (i = 0; i < thickness_dark; i++)
+                {
+                  gdk_draw_line (window, gc1,
+                                 x + width - i - 1,
+                                 y + i,
+                                 x + width - i - 1,
+                                 y + height - i - 1);
+                  gdk_draw_line (window, gc2,
+                                 x + i,
+                                 y + i,
+                                 x + i,
+                                 y + height - i - 2);
+                }
+      
+              for (i = 0; i < thickness_light; i++)
+                {
+                  gdk_draw_line (window, gc1,
+                                 x + thickness_dark + i,
+                                 y + thickness_dark + i,
+                                 x + thickness_dark + i,
+                                 y + height - thickness_dark - i - 1);
+                  gdk_draw_line (window, gc2,
+                                 x + width - thickness_light - i - 1,
+                                 y + thickness_dark + i,
+                                 x + width - thickness_light - i - 1,
+                                 y + height - thickness_light - 1);
+                }
+            }
+          else
+            {
+              gdk_draw_line (window, 
+                             style->dark_gc[state_type],
+                             x, y, x, y + height);                         
+              gdk_draw_line (window, 
+                             style->dark_gc[state_type],
+                             x + width, y, x + width, y + height);
+            }
+        }
+
+      if (style->ythickness > 0)
         {
-          gdk_draw_line (window, gc1,
-                         x + i,
-                         y + height - i - 1,
-                         x + width - i - 1,
-                         y + height - i - 1);
-          gdk_draw_line (window, gc1,
-                         x + width - i - 1,
-                         y + i,
-                         x + width - i - 1,
-                         y + height - i - 1);
+          if (style->ythickness > 1)
+            {
+              thickness_light = 1;
+              thickness_dark = 1;
+      
+              for (i = 0; i < thickness_dark; i++)
+                {
+                  gdk_draw_line (window, gc1,
+                                 x + i,
+                                 y + height - i - 1,
+                                 x + width - i - 1,
+                                 y + height - i - 1);
           
-          gdk_draw_line (window, gc2,
-                         x + i,
-                         y + i,
-                         x + width - i - 2,
-                         y + i);
-          gdk_draw_line (window, gc2,
-                         x + i,
-                         y + i,
-                         x + i,
-                         y + height - i - 2);
-        }
+                  gdk_draw_line (window, gc2,
+                                 x + i,
+                                 y + i,
+                                 x + width - i - 2,
+                                 y + i);
+                }
       
-      for (i = 0; i < thickness_light; i++)
-        {
-          gdk_draw_line (window, gc1,
-                         x + thickness_dark + i,
-                         y + thickness_dark + i,
-                         x + width - thickness_dark - i - 1,
-                         y + thickness_dark + i);
-          gdk_draw_line (window, gc1,
-                         x + thickness_dark + i,
-                         y + thickness_dark + i,
-                         x + thickness_dark + i,
-                         y + height - thickness_dark - i - 1);
+              for (i = 0; i < thickness_light; i++)
+                {
+                  gdk_draw_line (window, gc1,
+                                 x + thickness_dark + i,
+                                 y + thickness_dark + i,
+                                 x + width - thickness_dark - i - 1,
+                                 y + thickness_dark + i);
           
-          gdk_draw_line (window, gc2,
-                         x + thickness_dark + i,
-                         y + height - thickness_light - i - 1,
-                         x + width - thickness_light - 1,
-                         y + height - thickness_light - i - 1);
-          gdk_draw_line (window, gc2,
-                         x + width - thickness_light - i - 1,
-                         y + thickness_dark + i,
-                         x + width - thickness_light - i - 1,
-                         y + height - thickness_light - 1);
+                  gdk_draw_line (window, gc2,
+                                 x + thickness_dark + i,
+                                 y + height - thickness_light - i - 1,
+                                 x + width - thickness_light - 1,
+                                 y + height - thickness_light - i - 1);
+                }
+            }
+          else
+            {
+              gdk_draw_line (window, 
+                             style->dark_gc[state_type],
+                             x, y, x + width, y);
+              gdk_draw_line (window, 
+                             style->dark_gc[state_type],
+                             x, y + height, x + width, y + height);
+            }
         }
+      
       break;
     }
+
+  if (shadow_type == GTK_SHADOW_IN &&
+      widget && GTK_IS_SPIN_BUTTON (widget) &&
+      detail && strcmp (detail, "entry") == 0)
+    {
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+       {
+         gdk_draw_line (window,
+                        style->base_gc[state_type],
+                        x + width - 1, y + 2,
+                        x + width - 1, y + height - 3);
+         gdk_draw_line (window,
+                        style->base_gc[state_type],
+                        x + width - 2, y + 2,
+                        x + width - 2, y + height - 3);
+         gdk_draw_point (window,
+                         style->black_gc,
+                         x + width - 1, y + 1);
+         gdk_draw_point (window,
+                         style->bg_gc[state_type],
+                         x + width - 1, y + height - 2);
+       }
+      else
+       {
+         gdk_draw_line (window,
+                        style->base_gc[state_type],
+                        x, y + 2,
+                        x, y + height - 3);
+         gdk_draw_line (window,
+                        style->base_gc[state_type],
+                        x + 1, y + 2,
+                        x + 1, y + height - 3);
+         gdk_draw_point (window,
+                         style->black_gc,
+                         x, y + 1);
+         gdk_draw_line (window,
+                        style->bg_gc[state_type],
+                        x, y + height - 2,
+                        x + 1, y + height - 2);
+         gdk_draw_point (window,
+                         style->light_gc[state_type],
+                         x, y + height - 1);
+       }
+    }
+
+
   if (area)
     {
       gdk_gc_set_clip_rectangle (gc1, NULL);
@@ -1513,8 +2654,8 @@ gtk_default_draw_polygon (GtkStyle      *style,
                           gint           npoints,
                           gboolean       fill)
 {
-  static const gdouble pi_over_4 = M_PI_4;
-  static const gdouble pi_3_over_4 = M_PI_4 * 3;
+  static const gdouble pi_over_4 = G_PI_4;
+  static const gdouble pi_3_over_4 = G_PI_4 * 3;
   GdkGC *gc1;
   GdkGC *gc2;
   GdkGC *gc3;
@@ -1524,7 +2665,7 @@ gtk_default_draw_polygon (GtkStyle      *style,
   gint yadjust;
   gint i;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   g_return_if_fail (points != NULL);
   
@@ -1598,394 +2739,184 @@ gtk_default_draw_polygon (GtkStyle      *style,
             }
           
           gdk_draw_line (window, gc1,
-                         points[i].x-xadjust, points[i].y-yadjust,
-                         points[i+1].x-xadjust, points[i+1].y-yadjust);
-          gdk_draw_line (window, gc3,
-                         points[i].x, points[i].y,
-                         points[i+1].x, points[i+1].y);
-        }
-      else
-        {
-          if ((angle < -pi_3_over_4) || (angle > pi_3_over_4))
-            {
-              xadjust = 0;
-              yadjust = 1;
-            }
-          else
-            {
-              xadjust = 1;
-              yadjust = 0;
-            }
-          
-          gdk_draw_line (window, gc4,
-                         points[i].x+xadjust, points[i].y+yadjust,
-                         points[i+1].x+xadjust, points[i+1].y+yadjust);
-          gdk_draw_line (window, gc2,
-                         points[i].x, points[i].y,
-                         points[i+1].x, points[i+1].y);
-        }
-    }
-
-  if (area)
-    {
-      gdk_gc_set_clip_rectangle (gc1, NULL);
-      gdk_gc_set_clip_rectangle (gc2, NULL);
-      gdk_gc_set_clip_rectangle (gc3, NULL);
-      gdk_gc_set_clip_rectangle (gc4, NULL);
-    }
-}
-
-static void
-gtk_default_draw_arrow (GtkStyle      *style,
-                        GdkWindow     *window,
-                        GtkStateType   state_type,
-                        GtkShadowType  shadow_type,
-                        GdkRectangle  *area,
-                        GtkWidget     *widget,
-                        const gchar   *detail,
-                        GtkArrowType   arrow_type,
-                        gboolean       fill,
-                        gint           x,
-                        gint           y,
-                        gint           width,
-                        gint           height)
-{
-  GdkGC *gc1;
-  GdkGC *gc2;
-  GdkGC *gc3;
-  GdkGC *gc4;
-  gint half_width;
-  gint half_height;
-  GdkPoint points[3];
-  
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
-  
-  switch (shadow_type)
-    {
-    case GTK_SHADOW_IN:
-      gc1 = style->bg_gc[state_type];
-      gc2 = style->dark_gc[state_type];
-      gc3 = style->light_gc[state_type];
-      gc4 = style->black_gc;
-      break;
-    case GTK_SHADOW_OUT:
-      gc1 = style->dark_gc[state_type];
-      gc2 = style->light_gc[state_type];
-      gc3 = style->black_gc;
-      gc4 = style->bg_gc[state_type];
-      break;
-    case GTK_SHADOW_ETCHED_IN:
-      gc1 = style->light_gc[state_type];
-      gc2 = style->dark_gc[state_type];
-      gc3 = NULL;
-      gc4 = NULL;
-      break;
-    case GTK_SHADOW_ETCHED_OUT:
-      gc1 = style->dark_gc[state_type];
-      gc2 = style->light_gc[state_type];
-      gc3 = NULL;
-      gc4 = NULL;
-      break;
-    default:
-      return;
-    }
-  
-  if ((width == -1) && (height == -1))
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
-  
-  half_width = width / 2;
-  half_height = height / 2;
-  
-  if (area)
-    {
-      gdk_gc_set_clip_rectangle (gc1, area);
-      gdk_gc_set_clip_rectangle (gc2, area);
-      if ((gc3) && (gc4))
-        {
-          gdk_gc_set_clip_rectangle (gc3, area);
-          gdk_gc_set_clip_rectangle (gc4, area);
-        }
-    }
-  
-  switch (arrow_type)
-    {
-    case GTK_ARROW_UP:
-      if (fill)
-        {
-          points[0].x = x + half_width;
-          points[0].y = y;
-          points[1].x = x;
-          points[1].y = y + height - 1;
-          points[2].x = x + width - 1;
-          points[2].y = y + height - 1;
-          
-          gdk_draw_polygon (window, style->bg_gc[state_type], TRUE, points, 3);
-        }
-      
-      switch (shadow_type)
-        {
-        case GTK_SHADOW_IN:
-        case GTK_SHADOW_OUT:
-          
-          gdk_draw_line (window, gc1,
-                         x + 1, y + height - 2,
-                         x + width - 2, y + height - 2);
-          gdk_draw_line (window, gc3,
-                         x + 0, y + height - 1,
-                         x + width - 1, y + height - 1);
-          
-          gdk_draw_line (window, gc1,
-                         x + width - 2, y + height - 1,
-                         x + half_width, y + 1);
-          gdk_draw_line (window, gc3,
-                         x + width - 1, y + height - 1,
-                         x + half_width, y);
-          
-          gdk_draw_line (window, gc4,
-                         x + half_width, y + 1,
-                         x + 1, y + height - 1);
-          gdk_draw_line (window, gc2,
-                         x + half_width, y,
-                         x, y + height - 1);
-          break;
-          
-        case GTK_SHADOW_ETCHED_IN:
-        case GTK_SHADOW_ETCHED_OUT:
-          gdk_draw_line (window, gc1,
-                         x + half_width, y + 1,
-                         x + 1, y + height - 1);
-          gdk_draw_line (window, gc1,
-                         x + 1, y + height - 1,
-                         x + width - 1, y + height - 1);
-          gdk_draw_line (window, gc1,
-                         x + width - 1, y + height - 1,
-                         x + half_width + 1, y + 1);
-          
-          points[0].x = x + half_width;
-          points[0].y = y;
-          points[1].x = x;
-          points[1].y = y + height - 2;
-          points[2].x = x + width - 2;
-          points[2].y = y + height - 2;
-          
-          gdk_draw_polygon (window, gc2, FALSE, points, 3);
-          break;
-          
-        default:
-          break;
-        }
-      break;
-      
-    case GTK_ARROW_DOWN:
-      if (fill)
-        {
-          points[0].x = x + width - 1;
-          points[0].y = y;
-          points[1].x = x;
-          points[1].y = y;
-          points[2].x = x + half_width;
-          points[2].y = y + height - 1;
-          
-          gdk_draw_polygon (window, style->bg_gc[state_type], TRUE, points, 3);
-        }
-      switch (shadow_type)
-        {
-        case GTK_SHADOW_IN:
-        case GTK_SHADOW_OUT:
-          gdk_draw_line (window, gc4,
-                         x + width - 2,
-                         y + 1, x + 1, y + 1);
-          gdk_draw_line (window, gc2,
-                         x + width - 1, y,
-                         x, y);
-          
-          gdk_draw_line (window, gc4,
-                         x + 1, y,
-                         x + half_width, y + height - 2);
-          gdk_draw_line (window, gc2,
-                         x, y,
-                         x + half_width, y + height - 1);
-          
-          gdk_draw_line (window, gc1,
-                         x + half_width, y + height - 2,
-                         x + width - 2, y);
-          gdk_draw_line (window, gc3,
-                         x + half_width, y + height - 1,
-                         x + width - 1, y);
-          break;
-          
-        case GTK_SHADOW_ETCHED_IN:
-        case GTK_SHADOW_ETCHED_OUT:
-          gdk_draw_line (window, gc1,
-                         x + width - 1, y + 1,
-                         x + 1, y + 1);
-          gdk_draw_line (window, gc1,
-                         x + 1, y + 1,
-                         x + half_width + 1, y + height - 1);
-          gdk_draw_line (window, gc1,
-                         x + half_width + 1, y + height - 2,
-                         x + width - 1, y);
-          
-          points[0].x = x + width - 2;
-          points[0].y = y;
-          points[1].x = x;
-          points[1].y = y;
-          points[2].x = x + half_width;
-          points[2].y = y + height - 2;
-          
-          gdk_draw_polygon (window, gc2, FALSE, points, 3);
-          break;
-          
-        default:
-          break;
-        }
-      break;
-    case GTK_ARROW_LEFT:
-      if (fill)
-        {
-          points[0].x = x;
-          points[0].y = y + half_height;
-          points[1].x = x + width - 1;
-          points[1].y = y + height - 1;
-          points[2].x = x + width - 1;
-          points[2].y = y;
-          
-          gdk_draw_polygon (window, style->bg_gc[state_type], TRUE, points, 3);
-        }
-      
-      switch (shadow_type)
-        {
-        case GTK_SHADOW_IN:
-        case GTK_SHADOW_OUT:
-          gdk_draw_line (window, gc1,
-                         x + 1, y + half_height,
-                         x + width - 1, y + height - 1);
-          gdk_draw_line (window, gc3,
-                         x, y + half_height,
-                         x + width - 1, y + height - 1);
-          
-          gdk_draw_line (window, gc1,
-                         x + width - 2, y + height - 1,
-                         x + width - 2, y + 1);
-          gdk_draw_line (window, gc3,
-                         x + width - 1, y + height - 1,
-                         x + width - 1, y);
-          
-          gdk_draw_line (window, gc4,
-                         x + width - 1, y + 1,
-                         x + 1, y + half_height);
-          gdk_draw_line (window, gc2,
-                         x + width - 1, y,
-                         x, y + half_height);
-          break;
-          
-        case GTK_SHADOW_ETCHED_IN:
-        case GTK_SHADOW_ETCHED_OUT:
-          gdk_draw_line (window, gc1,
-                         x + width - 1, y + 1,
-                         x + 1, y + half_height);
-          gdk_draw_line (window, gc1,
-                         x + 1, y + half_height + 1,
-                         x + width - 1, y + height - 1);
-          gdk_draw_line (window, gc1,
-                         x + width - 1, y + height - 1,
-                         x + width - 1, y + 1);
-          
-          points[0].x = x + width - 2;
-          points[0].y = y;
-          points[1].x = x;
-          points[1].y = y + half_height;
-          points[2].x = x + width - 2;
-          points[2].y = y + height - 2;
-          
-          gdk_draw_polygon (window, gc2, FALSE, points, 3);
-          break;
-          
-        default:
-          break;
-        }
-      break;
-    case GTK_ARROW_RIGHT:
-      if (fill)
-        {
-          points[0].x = x + width - 1;
-          points[0].y = y + half_height;
-          points[1].x = x;
-          points[1].y = y;
-          points[2].x = x;
-          points[2].y = y + height - 1;
-          
-          gdk_draw_polygon (window, style->bg_gc[state_type], TRUE, points, 3);
-        }
-      
-      switch (shadow_type)
-        {
-        case GTK_SHADOW_IN:
-        case GTK_SHADOW_OUT:
-          gdk_draw_line (window, gc4,
-                         x + width - 1, y + half_height,
-                         x + 1, y + 1);
-          gdk_draw_line (window, gc2,
-                         x + width - 1, y + half_height,
-                         x, y);
-          gdk_draw_line (window, gc4,
-                         x + 1, y + 1,
-                         x + 1, y + height - 2);
-          gdk_draw_line (window, gc2,
-                         x, y,
-                         x, y + height - 1);
-          
-          gdk_draw_line (window, gc1,
-                         x + 1, y + height - 2,
-                         x + width - 1, y + half_height);
-          gdk_draw_line (window, gc3,
-                         x, y + height - 1,
-                         x + width - 1, y + half_height);
-          break;
-          
-        case GTK_SHADOW_ETCHED_IN:
-        case GTK_SHADOW_ETCHED_OUT:
-          gdk_draw_line (window, gc1,
-                         x + width - 1, y + half_height + 1,
-                         x + 1, y + 1);
-          gdk_draw_line (window, gc1,
-                         x + 1, y + 1,
-                         x + 1, y + height - 1);
-          gdk_draw_line (window, gc1,
-                         x + 1, y + height - 1,
-                         x + width - 1, y + half_height + 1);
-          
-          points[0].x = x + width - 2;
-          points[0].y = y + half_height;
-          points[1].x = x;
-          points[1].y = y;
-          points[2].x = x;
-          points[2].y = y + height - 1;
-          
-          gdk_draw_polygon (window, gc2, FALSE, points, 3);
-          break;
+                         points[i].x-xadjust, points[i].y-yadjust,
+                         points[i+1].x-xadjust, points[i+1].y-yadjust);
+          gdk_draw_line (window, gc3,
+                         points[i].x, points[i].y,
+                         points[i+1].x, points[i+1].y);
+        }
+      else
+        {
+          if ((angle < -pi_3_over_4) || (angle > pi_3_over_4))
+            {
+              xadjust = 0;
+              yadjust = 1;
+            }
+          else
+            {
+              xadjust = 1;
+              yadjust = 0;
+            }
           
-        default:
-          break;
+          gdk_draw_line (window, gc4,
+                         points[i].x+xadjust, points[i].y+yadjust,
+                         points[i+1].x+xadjust, points[i+1].y+yadjust);
+          gdk_draw_line (window, gc2,
+                         points[i].x, points[i].y,
+                         points[i+1].x, points[i+1].y);
         }
-      break;
     }
 
   if (area)
     {
       gdk_gc_set_clip_rectangle (gc1, NULL);
       gdk_gc_set_clip_rectangle (gc2, NULL);
-      if (gc3)
-        {
-          gdk_gc_set_clip_rectangle (gc3, NULL);
-          gdk_gc_set_clip_rectangle (gc4, NULL);
-        }
+      gdk_gc_set_clip_rectangle (gc3, NULL);
+      gdk_gc_set_clip_rectangle (gc4, NULL);
+    }
+}
+
+static void
+draw_arrow (GdkWindow     *window,
+           GdkGC         *gc,
+           GdkRectangle  *area,
+           GtkArrowType   arrow_type,
+           gint           x,
+           gint           y,
+           gint           width,
+           gint           height)
+{
+  gint i, j;
+
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, area);
+
+  if (arrow_type == GTK_ARROW_DOWN)
+    {
+      for (i = 0, j = 0; i < height; i++, j++)
+       gdk_draw_line (window, gc, x + j, y + i, x + width - j - 1, y + i);
+    }
+  else if (arrow_type == GTK_ARROW_UP)
+    {
+      for (i = height - 1, j = 0; i >= 0; i--, j++)
+       gdk_draw_line (window, gc, x + j, y + i, x + width - j - 1, y + i);
+    }
+  else if (arrow_type == GTK_ARROW_LEFT)
+    {
+      for (i = width - 1, j = 0; i >= 0; i--, j++)
+       gdk_draw_line (window, gc, x + i, y + j, x + i, y + height - j - 1);
+    }
+  else if (arrow_type == GTK_ARROW_RIGHT)
+    {
+      for (i = 0, j = 0; i < width; i++, j++)
+       gdk_draw_line (window, gc, x + i, y + j, x + i, y + height - j - 1);
+    }
+
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, NULL);
+}
+
+static void
+calculate_arrow_geometry (GtkArrowType  arrow_type,
+                         gint         *x,
+                         gint         *y,
+                         gint         *width,
+                         gint         *height)
+{
+  gint w = *width;
+  gint h = *height;
+  
+  switch (arrow_type)
+    {
+    case GTK_ARROW_UP:
+    case GTK_ARROW_DOWN:
+      w += (w % 2) - 1;
+      h = (w / 2 + 1);
+      
+      if (h > *height)
+       {
+         h = *height;
+         w = 2 * h - 1;
+       }
+      
+      if (arrow_type == GTK_ARROW_DOWN)
+       {
+         if (*height % 2 == 1 || h % 2 == 0)
+           *height += 1;
+       }
+      else
+       {
+         if (*height % 2 == 0 || h % 2 == 0)
+           *height -= 1;
+       }
+      break;
+
+    case GTK_ARROW_RIGHT:
+    case GTK_ARROW_LEFT:
+      h += (h % 2) - 1;
+      w = (h / 2 + 1);
+      
+      if (w > *width)
+       {
+         w = *width;
+         h = 2 * w - 1;
+       }
+      
+      if (arrow_type == GTK_ARROW_RIGHT)
+       {
+         if (*width % 2 == 1 || w % 2 == 0)
+           *width += 1;
+       }
+      else
+       {
+         if (*width % 2 == 0 || w % 2 == 0)
+           *width -= 1;
+       }
+      break;
+      
+    default:
+      /* should not be reached */
+      break;
     }
+
+  *x += (*width - w) / 2;
+  *y += (*height - h) / 2;
+  *height = h;
+  *width = w;
+}
+
+static void
+gtk_default_draw_arrow (GtkStyle      *style,
+                       GdkWindow     *window,
+                       GtkStateType   state,
+                       GtkShadowType  shadow,
+                       GdkRectangle  *area,
+                       GtkWidget     *widget,
+                       const gchar   *detail,
+                       GtkArrowType   arrow_type,
+                       gboolean       fill,
+                       gint           x,
+                       gint           y,
+                       gint           width,
+                       gint           height)
+{
+  gint original_width, original_x;
+  
+  sanitize_size (window, &width, &height);
+
+  original_width = width;
+  original_x = x;
+
+  calculate_arrow_geometry (arrow_type, &x, &y, &width, &height);
+  
+  if (detail && strcmp (detail, "menuitem") == 0)
+    x = original_x + original_width - width;
+
+  if (state == GTK_STATE_INSENSITIVE)
+    draw_arrow (window, style->white_gc, area, arrow_type,
+               x + 1, y + 1, width, height);
+  draw_arrow (window, style->fg_gc[state], area, arrow_type,
+             x, y, width, height);
 }
 
 static void
@@ -2003,16 +2934,23 @@ gtk_default_draw_diamond (GtkStyle      *style,
 {
   gint half_width;
   gint half_height;
-  
-  g_return_if_fail (style != NULL);
+  GdkGC *outer_nw = NULL;
+  GdkGC *outer_ne = NULL;
+  GdkGC *outer_sw = NULL;
+  GdkGC *outer_se = NULL;
+  GdkGC *middle_nw = NULL;
+  GdkGC *middle_ne = NULL;
+  GdkGC *middle_sw = NULL;
+  GdkGC *middle_se = NULL;
+  GdkGC *inner_nw = NULL;
+  GdkGC *inner_ne = NULL;
+  GdkGC *inner_sw = NULL;
+  GdkGC *inner_se = NULL;
+  
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  if ((width == -1) && (height == -1))
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   half_width = width / 2;
   half_height = height / 2;
@@ -2024,89 +2962,91 @@ gtk_default_draw_diamond (GtkStyle      *style,
       gdk_gc_set_clip_rectangle (style->dark_gc[state_type], area);
       gdk_gc_set_clip_rectangle (style->black_gc, area);
     }
+  
   switch (shadow_type)
     {
     case GTK_SHADOW_IN:
-      gdk_draw_line (window, style->bg_gc[state_type],
-                     x + 2, y + half_height,
-                     x + half_width, y + height - 2);
-      gdk_draw_line (window, style->bg_gc[state_type],
-                     x + half_width, y + height - 2,
-                     x + width - 2, y + half_height);
-      gdk_draw_line (window, style->light_gc[state_type],
-                     x + 1, y + half_height,
-                     x + half_width, y + height - 1);
-      gdk_draw_line (window, style->light_gc[state_type],
-                     x + half_width, y + height - 1,
-                     x + width - 1, y + half_height);
-      gdk_draw_line (window, style->light_gc[state_type],
-                     x, y + half_height,
-                     x + half_width, y + height);
-      gdk_draw_line (window, style->light_gc[state_type],
-                     x + half_width, y + height,
-                     x + width, y + half_height);
-      
-      gdk_draw_line (window, style->black_gc,
-                     x + 2, y + half_height,
-                     x + half_width, y + 2);
-      gdk_draw_line (window, style->black_gc,
-                     x + half_width, y + 2,
-                     x + width - 2, y + half_height);
-      gdk_draw_line (window, style->dark_gc[state_type],
-                     x + 1, y + half_height,
-                     x + half_width, y + 1);
-      gdk_draw_line (window, style->dark_gc[state_type],
-                     x + half_width, y + 1,
-                     x + width - 1, y + half_height);
-      gdk_draw_line (window, style->dark_gc[state_type],
-                     x, y + half_height,
-                     x + half_width, y);
-      gdk_draw_line (window, style->dark_gc[state_type],
-                     x + half_width, y,
-                     x + width, y + half_height);
+      inner_sw = inner_se = style->bg_gc[state_type];
+      middle_sw = middle_se = style->light_gc[state_type];
+      outer_sw = outer_se = style->light_gc[state_type];
+      inner_nw = inner_ne = style->black_gc;
+      middle_nw = middle_ne = style->dark_gc[state_type];
+      outer_nw = outer_ne = style->dark_gc[state_type];
       break;
+          
     case GTK_SHADOW_OUT:
-      gdk_draw_line (window, style->dark_gc[state_type],
+      inner_sw = inner_se = style->dark_gc[state_type];
+      middle_sw = middle_se = style->dark_gc[state_type];
+      outer_sw = outer_se = style->black_gc;
+      inner_nw = inner_ne = style->bg_gc[state_type];
+      middle_nw = middle_ne = style->light_gc[state_type];
+      outer_nw = outer_ne = style->light_gc[state_type];
+      break;
+
+    case GTK_SHADOW_ETCHED_IN:
+      inner_sw = inner_se = style->bg_gc[state_type];
+      middle_sw = middle_se = style->dark_gc[state_type];
+      outer_sw = outer_se = style->light_gc[state_type];
+      inner_nw = inner_ne = style->bg_gc[state_type];
+      middle_nw = middle_ne = style->light_gc[state_type];
+      outer_nw = outer_ne = style->dark_gc[state_type];
+      break;
+
+    case GTK_SHADOW_ETCHED_OUT:
+      inner_sw = inner_se = style->bg_gc[state_type];
+      middle_sw = middle_se = style->light_gc[state_type];
+      outer_sw = outer_se = style->dark_gc[state_type];
+      inner_nw = inner_ne = style->bg_gc[state_type];
+      middle_nw = middle_ne = style->dark_gc[state_type];
+      outer_nw = outer_ne = style->light_gc[state_type];
+      break;
+      
+    default:
+
+      break;
+    }
+
+  if (inner_sw)
+    {
+      gdk_draw_line (window, inner_sw,
                      x + 2, y + half_height,
                      x + half_width, y + height - 2);
-      gdk_draw_line (window, style->dark_gc[state_type],
+      gdk_draw_line (window, inner_se,
                      x + half_width, y + height - 2,
                      x + width - 2, y + half_height);
-      gdk_draw_line (window, style->dark_gc[state_type],
+      gdk_draw_line (window, middle_sw,
                      x + 1, y + half_height,
                      x + half_width, y + height - 1);
-      gdk_draw_line (window, style->dark_gc[state_type],
+      gdk_draw_line (window, middle_se,
                      x + half_width, y + height - 1,
                      x + width - 1, y + half_height);
-      gdk_draw_line (window, style->black_gc,
+      gdk_draw_line (window, outer_sw,
                      x, y + half_height,
                      x + half_width, y + height);
-      gdk_draw_line (window, style->black_gc,
+      gdk_draw_line (window, outer_se,
                      x + half_width, y + height,
                      x + width, y + half_height);
-      
-      gdk_draw_line (window, style->bg_gc[state_type],
+  
+      gdk_draw_line (window, inner_nw,
                      x + 2, y + half_height,
                      x + half_width, y + 2);
-      gdk_draw_line (window, style->bg_gc[state_type],
+      gdk_draw_line (window, inner_ne,
                      x + half_width, y + 2,
                      x + width - 2, y + half_height);
-      gdk_draw_line (window, style->light_gc[state_type],
+      gdk_draw_line (window, middle_nw,
                      x + 1, y + half_height,
                      x + half_width, y + 1);
-      gdk_draw_line (window, style->light_gc[state_type],
+      gdk_draw_line (window, middle_ne,
                      x + half_width, y + 1,
                      x + width - 1, y + half_height);
-      gdk_draw_line (window, style->light_gc[state_type],
+      gdk_draw_line (window, outer_nw,
                      x, y + half_height,
                      x + half_width, y);
-      gdk_draw_line (window, style->light_gc[state_type],
+      gdk_draw_line (window, outer_ne,
                      x + half_width, y,
                      x + width, y + half_height);
-      break;
-    default:
-      break;
     }
+  
   if (area)
     {
       gdk_gc_set_clip_rectangle (style->light_gc[state_type], NULL);
@@ -2116,25 +3056,6 @@ gtk_default_draw_diamond (GtkStyle      *style,
     }
 }
 
-static void
-gtk_default_draw_oval (GtkStyle      *style,
-                       GdkWindow     *window,
-                       GtkStateType   state_type,
-                       GtkShadowType  shadow_type,
-                       GdkRectangle  *area,
-                       GtkWidget     *widget,
-                       const gchar   *detail,
-                       gint           x,
-                       gint           y,
-                       gint           width,
-                       gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
-
-  g_warning ("gtk_default_draw_oval(): FIXME, this function is currently unimplemented");
-}
-
 static void
 gtk_default_draw_string (GtkStyle      *style,
                          GdkWindow     *window,
@@ -2146,7 +3067,7 @@ gtk_default_draw_string (GtkStyle      *style,
                          gint           y,
                          const gchar   *string)
 {
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
   if (area)
@@ -2156,9 +3077,9 @@ gtk_default_draw_string (GtkStyle      *style,
     }
 
   if (state_type == GTK_STATE_INSENSITIVE)
-    gdk_draw_string (window, style->font, style->white_gc, x + 1, y + 1, string);
+    gdk_draw_string (window, gtk_style_get_font (style), style->white_gc, x + 1, y + 1, string);
 
-  gdk_draw_string (window, style->font, style->fg_gc[state_type], x, y, string);
+  gdk_draw_string (window, gtk_style_get_font (style), style->fg_gc[state_type], x, y, string);
 
   if (area)
     {
@@ -2167,6 +3088,37 @@ gtk_default_draw_string (GtkStyle      *style,
     }
 }
 
+static void
+option_menu_get_props (GtkWidget      *widget,
+                      GtkRequisition *indicator_size,
+                      GtkBorder      *indicator_spacing)
+{
+  GtkRequisition *tmp_size = NULL;
+  GtkBorder *tmp_spacing = NULL;
+  
+  if (widget)
+    gtk_widget_style_get (widget, 
+                         "indicator_size", &tmp_size,
+                         "indicator_spacing", &tmp_spacing,
+                         NULL);
+
+  if (tmp_size)
+    {
+      *indicator_size = *tmp_size;
+      g_free (tmp_size);
+    }
+  else
+    *indicator_size = default_option_indicator_size;
+
+  if (tmp_spacing)
+    {
+      *indicator_spacing = *tmp_spacing;
+      g_free (tmp_spacing);
+    }
+  else
+    *indicator_spacing = default_option_indicator_spacing;
+}
+
 static void 
 gtk_default_draw_box (GtkStyle      *style,
                      GdkWindow     *window,
@@ -2180,18 +3132,44 @@ gtk_default_draw_box (GtkStyle      *style,
                      gint           width,
                      gint           height)
 {
-  g_return_if_fail (style != NULL);
+  gboolean is_spinbutton_box = FALSE;
+  
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
+
+  if (widget && GTK_IS_SPIN_BUTTON (widget) && detail)
+    {
+      if (strcmp (detail, "spinbutton_up") == 0)
+       {
+         y += 2;
+         width -= 3;
+         height -= 2;
+
+         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+           x += 2;
+         else
+           x += 1;
+
+         is_spinbutton_box = TRUE;
+       }
+      else if (strcmp (detail, "spinbutton_down") == 0)
+       {
+         width -= 3;
+         height -= 2;
+
+         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+           x += 2;
+         else
+           x += 1;
+
+         is_spinbutton_box = TRUE;
+       }
+    }
   
   if (!style->bg_pixmap[state_type] || 
-      gdk_window_get_type (window) == GDK_WINDOW_PIXMAP)
+      GDK_IS_PIXMAP (window))
     {
       if (area)
        gdk_gc_set_clip_rectangle (style->bg_gc[state_type], area);
@@ -2205,9 +3183,76 @@ gtk_default_draw_box (GtkStyle      *style,
     gtk_style_apply_default_background (style, window,
                                         widget && !GTK_WIDGET_NO_WINDOW (widget),
                                         state_type, area, x, y, width, height);
-  
+
+  if (is_spinbutton_box)
+    {
+      GdkGC *upper_gc;
+      GdkGC *lower_gc;
+      
+      lower_gc = style->dark_gc[state_type];
+      if (shadow_type == GTK_SHADOW_OUT)
+       upper_gc = style->light_gc[state_type];
+      else
+       upper_gc = style->dark_gc[state_type];
+
+      if (area)
+       {
+         gdk_gc_set_clip_rectangle (style->dark_gc[state_type], area);
+         gdk_gc_set_clip_rectangle (style->light_gc[state_type], area);
+       }
+      
+      gdk_draw_line (window, upper_gc, x, y, x + width - 1, y);
+      gdk_draw_line (window, lower_gc, x, y + height - 1, x + width - 1, y + height - 1);
+
+      if (area)
+       {
+         gdk_gc_set_clip_rectangle (style->dark_gc[state_type], NULL);
+         gdk_gc_set_clip_rectangle (style->light_gc[state_type], NULL);
+       }
+      return;
+    }
+
   gtk_paint_shadow (style, window, state_type, shadow_type, area, widget, detail,
                     x, y, width, height);
+
+  if (detail && strcmp (detail, "optionmenu") == 0)
+    {
+      GtkRequisition indicator_size;
+      GtkBorder indicator_spacing;
+
+      option_menu_get_props (widget, &indicator_size, &indicator_spacing);
+
+      sanitize_size (window, &width, &height);
+  
+      gtk_paint_vline (style, window, state_type, area, widget,
+                      detail,
+                      y + style->ythickness + 1,
+                      y + height - style->ythickness - 3,
+                      x + width - (indicator_size.width + indicator_spacing.left + indicator_spacing.right) - style->xthickness);
+    }
+}
+
+static GdkGC*
+get_darkened_gc (GdkWindow *window,
+                 GdkColor  *color,
+                 gint       darken_count)
+{
+  GdkColor src = *color;
+  GdkColor shaded;
+  GdkGC *gc;
+  
+  gc = gdk_gc_new (window);
+
+  while (darken_count)
+    {
+      gtk_style_shade (&src, &shaded, 0.93);
+      src = shaded;
+      --darken_count;
+    }
+  
+  gdk_gc_set_rgb_fg_color (gc, &shaded);
+
+  return gc;
 }
 
 static void 
@@ -2224,33 +3269,76 @@ gtk_default_draw_flat_box (GtkStyle      *style,
                            gint           height)
 {
   GdkGC *gc1;
+  GdkGC *freeme = NULL;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   if (detail)
     {
-      if (!strcmp ("text", detail) && state_type == GTK_STATE_SELECTED)
-       gc1 = style->bg_gc[GTK_STATE_SELECTED];
-      else if (!strcmp ("viewportbin", detail))
-       gc1 = style->bg_gc[GTK_STATE_NORMAL];
-      else if (!strcmp ("entry_bg", detail))
-       gc1 = style->base_gc[state_type];
+      if (state_type == GTK_STATE_SELECTED)
+        {
+          if (!strcmp ("text", detail))
+            gc1 = style->bg_gc[GTK_STATE_SELECTED];
+          else if (!strncmp ("cell_even", detail, strlen ("cell_even")) ||
+                  !strncmp ("cell_odd", detail, strlen ("cell_odd")))
+            {
+             /* This has to be really broken; alex made me do it. -jrb */
+             if (GTK_WIDGET_HAS_FOCUS (widget))
+               gc1 = style->base_gc[state_type];
+             else 
+               gc1 = style->base_gc[GTK_STATE_ACTIVE];
+            }
+          else
+            {
+              gc1 = style->bg_gc[state_type];
+            }
+        }
       else
-       gc1 = style->bg_gc[state_type];
+        {
+          if (!strcmp ("viewportbin", detail))
+            gc1 = style->bg_gc[GTK_STATE_NORMAL];
+          else if (!strcmp ("entry_bg", detail))
+            gc1 = style->base_gc[state_type];
+
+          /* For trees: even rows are base color, odd rows are a shade of
+           * the base color, the sort column is a shade of the original color
+           * for that row.
+           */
+
+          /* FIXME when we have style properties, clean this up.
+           */
+          
+          else if (!strcmp ("cell_even", detail) ||
+                   !strcmp ("cell_odd", detail) ||
+                   !strcmp ("cell_even_ruled", detail))
+            {
+             gc1 = style->base_gc[state_type];
+            }
+          else if (!strcmp ("cell_even_sorted", detail) ||
+                   !strcmp ("cell_odd_sorted", detail) ||
+                   !strcmp ("cell_odd_ruled", detail) ||
+                   !strcmp ("cell_even_ruled_sorted", detail))
+            {
+             freeme = get_darkened_gc (window, &style->base[state_type], 1);
+              gc1 = freeme;
+            }
+          else if (!strcmp ("cell_odd_ruled_sorted", detail))
+            {
+              freeme = get_darkened_gc (window, &style->base[state_type], 2);
+              gc1 = freeme;
+            }
+          else
+            gc1 = style->bg_gc[state_type];
+        }
     }
   else
     gc1 = style->bg_gc[state_type];
   
   if (!style->bg_pixmap[state_type] || gc1 != style->bg_gc[state_type] ||
-      gdk_window_get_type (window) == GDK_WINDOW_PIXMAP)
+      GDK_IS_PIXMAP (window))
     {
       if (area)
        gdk_gc_set_clip_rectangle (gc1, area);
@@ -2269,6 +3357,10 @@ gtk_default_draw_flat_box (GtkStyle      *style,
     gtk_style_apply_default_background (style, window,
                                         widget && !GTK_WIDGET_NO_WINDOW (widget),
                                         state_type, area, x, y, width, height);
+
+
+  if (freeme)
+    g_object_unref (G_OBJECT (freeme));
 }
 
 static void 
@@ -2284,8 +3376,71 @@ gtk_default_draw_check (GtkStyle      *style,
                        gint           width,
                        gint           height)
 {
-  gtk_paint_box (style, window, state_type, shadow_type, area, widget, detail,
-                 x, y, width, height);
+  if (detail && strcmp (detail, "cellcheck") == 0)
+    {
+      gdk_draw_rectangle (window,
+                         widget->style->base_gc[state_type],
+                         TRUE,
+                          x, y,
+                         width, height);
+      gdk_draw_rectangle (window,
+                         widget->style->text_gc[state_type],
+                         FALSE,
+                          x, y,
+                         width, height);
+
+      x -= (1 + INDICATOR_PART_SIZE - width) / 2;
+      y -= (((1 + INDICATOR_PART_SIZE - height) / 2) - 1);
+      if (shadow_type == GTK_SHADOW_IN)
+       {
+         draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT);
+         draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA);
+       }
+    }
+  else
+    {
+      x -= (1 + INDICATOR_PART_SIZE - width) / 2;
+      y -= (1 + INDICATOR_PART_SIZE - height) / 2;
+      
+      if (strcmp (detail, "check") == 0)       /* Menu item */
+       {
+         if (shadow_type == GTK_SHADOW_IN)
+           {
+             draw_part (window, style->black_gc, area, x, y, CHECK_TEXT);
+             draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_AA);
+           }
+         else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+           {
+             draw_part (window, style->black_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
+             draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
+           }
+       }
+      else
+       {
+         GdkGC *base_gc = style->base_gc[state_type];
+
+         if (state_type == GTK_STATE_ACTIVE)
+           base_gc = style->bg_gc[GTK_STATE_ACTIVE];
+         
+         draw_part (window, base_gc, area, x, y, CHECK_BASE);
+         draw_part (window, style->black_gc, area, x, y, CHECK_BLACK);
+         draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_DARK);
+         draw_part (window, style->mid_gc[state_type], area, x, y, CHECK_MID);
+         draw_part (window, style->light_gc[state_type], area, x, y, CHECK_LIGHT);
+         
+         if (shadow_type == GTK_SHADOW_IN)
+           {
+             draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT);
+             draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA);
+           }
+         else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+           {
+             draw_part (window, style->text_gc[state_type], area, x, y, CHECK_INCONSISTENT_TEXT);
+             draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
+           }
+       }
+    }
+
 }
 
 static void 
@@ -2297,51 +3452,73 @@ gtk_default_draw_option (GtkStyle      *style,
                         GtkWidget     *widget,
                         const gchar   *detail,
                         gint           x,
-                        gint           y,
-                        gint           width,
-                        gint           height)
-{
-  gtk_paint_diamond (style, window, state_type, shadow_type, area, widget, 
-                     detail, x, y, width, height);
-}
-
-static void 
-gtk_default_draw_cross (GtkStyle      *style,
-                       GdkWindow     *window,
-                       GtkStateType   state_type,
-                       GtkShadowType  shadow_type,
-                       GdkRectangle  *area,
-                       GtkWidget     *widget,
-                       const gchar   *detail,
-                       gint           x,
-                       gint           y,
-                       gint           width,
-                       gint           height)
+                        gint           y,
+                        gint           width,
+                        gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
-
-  g_warning ("gtk_default_draw_cross(): FIXME, this function is currently unimplemented");
-}
+  if (detail && strcmp (detail, "cellradio") == 0)
+    {
+      gdk_draw_arc (window,
+                   widget->style->fg_gc[state_type],
+                   FALSE,
+                    x, y,
+                   width,
+                   height,
+                   0, 360*64);
+
+      if (shadow_type == GTK_SHADOW_IN)
+       {
+         gdk_draw_arc (window,
+                       widget->style->fg_gc[state_type],
+                       TRUE,
+                        x + 2,
+                        y + 2,
+                       width - 4,
+                       height - 4,
+                       0, 360*64);
+       }
+    }
+  else
+    {
+      x -= (1 + INDICATOR_PART_SIZE - width) / 2;
+      y -= (1 + INDICATOR_PART_SIZE - height) / 2;
+      
+      if (strcmp (detail, "option") == 0)      /* Menu item */
+       {
+         if (shadow_type == GTK_SHADOW_IN)
+           {
+             draw_part (window, style->fg_gc[state_type], area, x, y, RADIO_TEXT);
+           }
+         else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+           {
+             draw_part (window, style->black_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
+             draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
+           }
+       }
+      else
+       {
+         GdkGC *base_gc = style->base_gc[state_type];
 
-static void 
-gtk_default_draw_ramp    (GtkStyle      *style,
-                          GdkWindow     *window,
-                          GtkStateType   state_type,
-                          GtkShadowType  shadow_type,
-                          GdkRectangle  *area,
-                          GtkWidget     *widget,
-                          const gchar   *detail,
-                          GtkArrowType   arrow_type,
-                          gint           x,
-                          gint           y,
-                          gint           width,
-                          gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
+         if (state_type == GTK_STATE_ACTIVE)
+           base_gc = style->bg_gc[GTK_STATE_ACTIVE];
 
-  g_warning ("gtk_default_draw_ramp(): FIXME, this function is currently unimplemented");
+         draw_part (window, base_gc, area, x, y, RADIO_BASE);
+         draw_part (window, style->black_gc, area, x, y, RADIO_BLACK);
+         draw_part (window, style->dark_gc[state_type], area, x, y, RADIO_DARK);
+         draw_part (window, style->mid_gc[state_type], area, x, y, RADIO_MID);
+         draw_part (window, style->light_gc[state_type], area, x, y, RADIO_LIGHT);
+         
+         if (shadow_type == GTK_SHADOW_IN)
+           {
+             draw_part (window, style->text_gc[state_type], area, x, y, RADIO_TEXT);
+           }
+         else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+           {
+             draw_part (window, style->text_aa_gc[state_type], area, x, y, RADIO_INCONSISTENT_AA);
+             draw_part (window, style->text_gc[state_type], area, x, y, RADIO_INCONSISTENT_TEXT);
+           }
+       }
+    }
 }
 
 static void
@@ -2357,11 +3534,39 @@ gtk_default_draw_tab (GtkStyle      *style,
                      gint           width,
                      gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
+#define ARROW_SPACE 4
+
+  GtkRequisition indicator_size;
+  GtkBorder indicator_spacing;
+  gint arrow_height;
+  
+  option_menu_get_props (widget, &indicator_size, &indicator_spacing);
+
+  indicator_size.width += (indicator_size.width % 2) - 1;
+  arrow_height = indicator_size.width / 2 + 1;
+
+  x += (width - indicator_size.width) / 2;
+  y += (height - (2 * arrow_height + ARROW_SPACE)) / 2;
+
+  if (state_type == GTK_STATE_INSENSITIVE)
+    {
+      draw_arrow (window, style->white_gc, area,
+                 GTK_ARROW_UP, x + 1, y + 1,
+                 indicator_size.width, arrow_height);
+      
+      draw_arrow (window, style->white_gc, area,
+                 GTK_ARROW_DOWN, x + 1, y + arrow_height + ARROW_SPACE + 1,
+                 indicator_size.width, arrow_height);
+    }
+  
+  draw_arrow (window, style->fg_gc[state_type], area,
+             GTK_ARROW_UP, x, y,
+             indicator_size.width, arrow_height);
   
-  gtk_paint_box (style, window, state_type, shadow_type, area, widget, detail,
-                 x, y, width, height);
+  
+  draw_arrow (window, style->fg_gc[state_type], area,
+             GTK_ARROW_DOWN, x, y + arrow_height + ARROW_SPACE,
+             indicator_size.width, arrow_height);
 }
 
 static void 
@@ -2385,15 +3590,10 @@ gtk_default_draw_shadow_gap (GtkStyle       *style,
   GdkGC *gc3 = NULL;
   GdkGC *gc4 = NULL;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   switch (shadow_type)
     {
@@ -2469,7 +3669,7 @@ gtk_default_draw_shadow_gap (GtkStyle       *style,
               gdk_draw_line (window, gc1,
                              x + gap_x + gap_width, y, x + width - 2, y);
               gdk_draw_line (window, gc2,
-                             x + gap_x + gap_width, y + 1, x + width - 2, y + 1);
+                             x + gap_x + gap_width, y + 1, x + width - 3, y + 1);
               gdk_draw_line (window, gc2,
                              x + gap_x + gap_width - 1, y, x + gap_x + gap_width - 1, y);
             }
@@ -2606,19 +3806,14 @@ gtk_default_draw_box_gap (GtkStyle       *style,
   GdkGC *gc3 = NULL;
   GdkGC *gc4 = NULL;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
   gtk_style_apply_default_background (style, window,
                                       widget && !GTK_WIDGET_NO_WINDOW (widget),
                                       state_type, area, x, y, width, height);
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   switch (shadow_type)
     {
@@ -2830,19 +4025,14 @@ gtk_default_draw_extension (GtkStyle       *style,
   GdkGC *gc3 = NULL;
   GdkGC *gc4 = NULL;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
   gtk_style_apply_default_background (style, window,
                                       widget && !GTK_WIDGET_NO_WINDOW (widget),
                                       GTK_STATE_NORMAL, area, x, y, width, height);
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   switch (shadow_type)
     {
@@ -2895,10 +4085,10 @@ gtk_default_draw_extension (GtkStyle       *style,
           gtk_style_apply_default_background (style, window,
                                               widget && !GTK_WIDGET_NO_WINDOW (widget),
                                               state_type, area,
-                                              x + style->klass->xthickness, 
+                                              x + style->xthickness, 
                                               y, 
-                                              width - (2 * style->klass->xthickness), 
-                                              height - (style->klass->ythickness));
+                                              width - (2 * style->xthickness), 
+                                              height - (style->ythickness));
           gdk_draw_line (window, gc1,
                          x, y, x, y + height - 2);
           gdk_draw_line (window, gc2,
@@ -2917,10 +4107,10 @@ gtk_default_draw_extension (GtkStyle       *style,
           gtk_style_apply_default_background (style, window,
                                               widget && !GTK_WIDGET_NO_WINDOW (widget),
                                               state_type, area,
-                                              x + style->klass->xthickness, 
-                                              y + style->klass->ythickness, 
-                                              width - (2 * style->klass->xthickness), 
-                                              height - (style->klass->ythickness));
+                                              x + style->xthickness, 
+                                              y + style->ythickness, 
+                                              width - (2 * style->xthickness), 
+                                              height - (style->ythickness));
           gdk_draw_line (window, gc1,
                          x + 1, y, x + width - 2, y);
           gdk_draw_line (window, gc1,
@@ -2940,9 +4130,9 @@ gtk_default_draw_extension (GtkStyle       *style,
                                               widget && !GTK_WIDGET_NO_WINDOW (widget),
                                               state_type, area,
                                               x, 
-                                              y + style->klass->ythickness, 
-                                              width - (style->klass->xthickness), 
-                                              height - (2 * style->klass->ythickness));
+                                              y + style->ythickness, 
+                                              width - (style->xthickness), 
+                                              height - (2 * style->ythickness));
           gdk_draw_line (window, gc1,
                          x, y, x + width - 2, y);
           gdk_draw_line (window, gc2,
@@ -2961,10 +4151,10 @@ gtk_default_draw_extension (GtkStyle       *style,
           gtk_style_apply_default_background (style, window,
                                               widget && !GTK_WIDGET_NO_WINDOW (widget),
                                               state_type, area,
-                                              x + style->klass->xthickness, 
-                                              y + style->klass->ythickness, 
-                                              width - (style->klass->xthickness), 
-                                              height - (2 * style->klass->ythickness));
+                                              x + style->xthickness, 
+                                              y + style->ythickness, 
+                                              width - (style->xthickness), 
+                                              height - (2 * style->ythickness));
           gdk_draw_line (window, gc1,
                          x + 1, y, x + width - 1, y);
           gdk_draw_line (window, gc1,
@@ -2993,58 +4183,139 @@ gtk_default_draw_extension (GtkStyle       *style,
 
 static void 
 gtk_default_draw_focus (GtkStyle      *style,
-                        GdkWindow     *window,
-                        GdkRectangle  *area,
-                        GtkWidget     *widget,
-                        const gchar   *detail,
-                        gint           x,
-                        gint           y,
-                        gint           width,
-                        gint           height)
+                       GdkWindow     *window,
+                       GtkStateType   state_type,
+                       GdkRectangle  *area,
+                       GtkWidget     *widget,
+                       const gchar   *detail,
+                       gint           x,
+                       gint           y,
+                       gint           width,
+                       gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (window != NULL);
-  
-  if (width == -1 && height == -1)
-    {
-      gdk_window_get_size (window, &width, &height);
-      width -= 1;
-      height -= 1;
-    }
-  else if (width == -1)
-    {
-      gdk_window_get_size (window, &width, NULL);
-      width -= 1;
-    }
-  else if (height == -1)
+  GdkPoint points[5];
+  GdkGC    *gc;
+  gboolean free_dash_list = FALSE;
+  gint line_width = 1;
+  gchar *dash_list = "\1\1";
+  gint dash_len;
+
+  gc = style->fg_gc[state_type];
+
+  if (widget)
     {
-      gdk_window_get_size (window, NULL, &height);
-      height -= 1;
-    }
+      gtk_widget_style_get (widget,
+                           "focus-line-width", &line_width,
+                           "focus-line-pattern", (gchar *)&dash_list,
+                           NULL);
+
+      free_dash_list = TRUE;
+  }
 
+  sanitize_size (window, &width, &height);
+  
   if (area)
-    gdk_gc_set_clip_rectangle (style->black_gc, area);
+    gdk_gc_set_clip_rectangle (gc, area);
+
+  gdk_gc_set_line_attributes (gc, line_width,
+                             dash_list[0] ? GDK_LINE_ON_OFF_DASH : GDK_LINE_SOLID,
+                             GDK_CAP_BUTT, GDK_JOIN_MITER);
+
 
   if (detail && !strcmp (detail, "add-mode"))
     {
-      gdk_gc_set_line_attributes (style->black_gc, 1, GDK_LINE_ON_OFF_DASH, 0, 0);
-      gdk_gc_set_dashes (style->black_gc, 0, "\4\4", 2);
-      
-      gdk_draw_rectangle (window,
-                          style->black_gc, FALSE,
-                          x, y, width, height);
+      if (free_dash_list)
+       g_free (dash_list);
       
-      gdk_gc_set_line_attributes (style->black_gc, 1, GDK_LINE_SOLID, 0, 0);
+      dash_list = "\4\4";
+      free_dash_list = FALSE;
+    }
+
+  points[0].x = x + line_width / 2;
+  points[0].y = y + line_width / 2;
+  points[1].x = x + width - line_width + line_width / 2;
+  points[1].y = y + line_width / 2;
+  points[2].x = x + width - line_width + line_width / 2;
+  points[2].y = y + height - line_width + line_width / 2;
+  points[3].x = x + line_width / 2;
+  points[3].y = y + height - line_width + line_width / 2;
+  points[4] = points[0];
+
+  if (!dash_list[0])
+    {
+      gdk_draw_lines (window, gc, points, 5);
     }
   else
     {
-      gdk_draw_rectangle (window,
-                          style->black_gc, FALSE,
-                          x, y, width, height);
+      /* We go through all the pain below because the X rasterization
+       * rules don't really work right for dashed lines if you
+       * want continuity in segments that go between top/right
+       * and left/bottom. For instance, a top left corner
+       * with a 1-1 dash is drawn as:
+       *
+       *  X X X 
+       *  X
+       *
+       *  X
+       *
+       * This is because pixels on the top and left boundaries
+       * of polygons are drawn, but not on the bottom and right.
+       * So, if you have a line going up that turns the corner
+       * and goes right, there is a one pixel shift in the pattern.
+       *
+       * So, to fix this, we drawn the top and right in one call,
+       * then the left and bottom in another call, fixing up
+       * the dash offset for the second call ourselves to get
+       * continuity at the upper left.
+       *
+       * It's not perfect since we really should have a join at
+       * the upper left and lower right instead of two intersecting
+       * lines but that's only really apparent for no-dashes,
+       * which (for this reason) are done as one polygon and
+       * don't to through this code path.
+       */
+      
+      dash_len = strlen (dash_list);
+      
+      if (dash_list[0])
+       gdk_gc_set_dashes (gc, 0, dash_list, dash_len);
+      
+      gdk_draw_lines (window, gc, points, 3);
+      
+      /* We draw this line one farther over than it is "supposed" to
+       * because of another rasterization problem ... if two 1 pixel
+       * unjoined lines meet at the lower right, there will be a missing
+       * pixel.
+       */
+      points[2].x += 1;
+      
+      if (dash_list[0])
+       {
+         gint dash_pixels = 0;
+         gint i;
+         
+         /* Adjust the dash offset for the bottom and left so we
+          * match up at the upper left.
+          */
+         for (i = 0; i < dash_len; i++)
+           dash_pixels += dash_list[i];
+      
+         if (dash_len % 2 == 1)
+           dash_pixels *= 2;
+         
+         gdk_gc_set_dashes (gc, dash_pixels - (width + height - 2 * line_width) % dash_pixels, dash_list, dash_len);
+       }
+      
+      gdk_draw_lines (window, gc, points + 2, 3);
     }
 
+  gdk_gc_set_line_attributes (gc, 0, GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
+
   if (area)
-    gdk_gc_set_clip_rectangle (style->black_gc, NULL);
+    gdk_gc_set_clip_rectangle (gc, NULL);
+
+  if (free_dash_list)
+    g_free (dash_list);
 }
 
 static void 
@@ -3061,27 +4332,27 @@ gtk_default_draw_slider (GtkStyle      *style,
                          gint           height,
                          GtkOrientation orientation)
 {
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
+  sanitize_size (window, &width, &height);
   
   gtk_paint_box (style, window, state_type, shadow_type,
                  area, widget, detail, x, y, width, height);
 
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    gtk_paint_vline (style, window, state_type, area, widget, detail, 
-                     style->klass->ythickness, 
-                     height - style->klass->ythickness - 1, width / 2);
-  else
-    gtk_paint_hline (style, window, state_type, area, widget, detail, 
-                     style->klass->xthickness, 
-                     width - style->klass->xthickness - 1, height / 2);
+  if (detail &&
+      (strcmp ("hscale", detail) == 0 ||
+       strcmp ("vscale", detail) == 0))
+    {
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        gtk_paint_vline (style, window, state_type, area, widget, detail, 
+                         y + style->ythickness, 
+                         y + height - style->ythickness - 1, x + width / 2);
+      else
+        gtk_paint_hline (style, window, state_type, area, widget, detail, 
+                         x + style->xthickness, 
+                         x + width - style->xthickness - 1, y + height / 2);
+    }
 }
 
 static void
@@ -3125,90 +4396,495 @@ gtk_default_draw_handle (GtkStyle      *style,
                         gint           height,
                         GtkOrientation orientation)
 {
-  gint xx, yy;
-  gint xthick, ythick;
-  GdkGC *light_gc, *dark_gc;
-  GdkRectangle rect;
-  GdkRectangle dest;
-  gint intersect;
+  gint xx, yy;
+  gint xthick, ythick;
+  GdkGC *light_gc, *dark_gc;
+  GdkRectangle rect;
+  GdkRectangle dest;
+  gint intersect;
+  
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (window != NULL);
+  
+  sanitize_size (window, &width, &height);
+  
+  gtk_paint_box (style, window, state_type, shadow_type, area, widget, 
+                 detail, x, y, width, height);
+  
+  
+  if (!strcmp (detail, "paned"))
+    {
+      /* we want to ignore the shadow border in paned widgets */
+      xthick = 0;
+      ythick = 0;
+
+      light_gc = style->light_gc[state_type];
+      dark_gc = style->black_gc;
+    }
+  else
+    {
+      xthick = style->xthickness;
+      ythick = style->ythickness;
+
+      light_gc = style->light_gc[state_type];
+      dark_gc = style->dark_gc[state_type];
+    }
+  
+  rect.x = x + xthick;
+  rect.y = y + ythick;
+  rect.width = width - (xthick * 2);
+  rect.height = height - (ythick * 2);
+
+  if (area)
+      intersect = gdk_rectangle_intersect (area, &rect, &dest);
+  else
+    {
+      intersect = TRUE;
+      dest = rect;
+    }
+
+  if (!intersect)
+    return;
+
+  gdk_gc_set_clip_rectangle (light_gc, &dest);
+  gdk_gc_set_clip_rectangle (dark_gc, &dest);
+
+  if (!strcmp (detail, "paned"))
+    {
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+       for (xx = x + width/2 - 15; xx <= x + width/2 + 15; xx += 5)
+         draw_dot (window, light_gc, dark_gc, xx, y + height/2 - 1, 3);
+      else
+       for (yy = y + height/2 - 15; yy <= y + height/2 + 15; yy += 5)
+         draw_dot (window, light_gc, dark_gc, x + width/2 - 1, yy, 3);
+    }
+  else
+    {
+      for (yy = y + ythick; yy < (y + height - ythick); yy += 3)
+       for (xx = x + xthick; xx < (x + width - xthick); xx += 6)
+         {
+           draw_dot (window, light_gc, dark_gc, xx, yy, 2);
+           draw_dot (window, light_gc, dark_gc, xx + 3, yy + 1, 2);
+         }
+    }
+
+  gdk_gc_set_clip_rectangle (light_gc, NULL);
+  gdk_gc_set_clip_rectangle (dark_gc, NULL);
+}
+
+static void
+create_expander_affine (gdouble affine[6],
+                       gint    degrees,
+                       gint    expander_size,
+                       gint    x,
+                       gint    y)
+{
+  gdouble s, c;
+  gdouble width;
+  gdouble height;
+
+  width = expander_size / 4.0;
+  height = expander_size / 2.0;
+  
+  s = sin (degrees * G_PI / 180.0);
+  c = cos (degrees * G_PI / 180.0);
+  
+  affine[0] = c;
+  affine[1] = s;
+  affine[2] = -s;
+  affine[3] = c;
+  affine[4] = -width * c - height * -s + x;
+  affine[5] = -width * s - height * c + y;
+}
+
+static void
+apply_affine_on_point (double affine[6], GdkPoint *point)
+{
+  gdouble x, y;
+
+  x = point->x * affine[0] + point->y * affine[2] + affine[4];
+  y = point->x * affine[1] + point->y * affine[3] + affine[5];
+
+  point->x = x;
+  point->y = y;
+}
+
+static void
+gtk_style_draw_polygon_with_gc (GdkWindow *window, GdkGC *gc, gint line_width,
+                               gboolean do_fill, GdkPoint *points, gint n_points)
+{
+  gdk_gc_set_line_attributes (gc, line_width,
+                             GDK_LINE_SOLID,
+                             GDK_CAP_BUTT, GDK_JOIN_MITER);
+
+  gdk_draw_polygon (window, gc, do_fill, points, n_points);
+  gdk_gc_set_line_attributes (gc, 0, GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
+}
+
+static void
+gtk_default_draw_expander (GtkStyle        *style,
+                           GdkWindow       *window,
+                           GtkStateType     state_type,
+                           GdkRectangle    *area,
+                           GtkWidget       *widget,
+                           const gchar     *detail,
+                           gint             x,
+                           gint             y,
+                          GtkExpanderStyle expander_style)
+{
+  gint expander_size;
+  GdkPoint points[3];
+  gint i;
+  gint line_width;
+  gdouble affine[6];
+  gint degrees = 0;
+
+  gtk_widget_style_get (widget,
+                       "expander_size", &expander_size,
+                       NULL);
+  line_width = MAX (1, expander_size/7);
+
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], area);
+      gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], area);
+    }
+
+  expander_size -= (line_width * 2 - 2);
+  points[0].x = line_width / 2;
+  points[0].y = line_width / 2;
+  points[1].x = expander_size / 2 + line_width / 2;
+  points[1].y = expander_size / 2 + line_width / 2;
+  points[2].x = line_width / 2;
+  points[2].y = expander_size + line_width / 2;
+
+  switch (expander_style)
+    {
+    case GTK_EXPANDER_COLLAPSED:
+      degrees = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? 180 : 0;
+      break;
+    case GTK_EXPANDER_SEMI_COLLAPSED:
+      degrees = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? 150 : 30;
+      break;
+    case GTK_EXPANDER_SEMI_EXPANDED:
+      degrees = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? 120 : 60;
+      break;
+    case GTK_EXPANDER_EXPANDED:
+      degrees = 90;
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  create_expander_affine (affine, degrees, expander_size, x, y);
+
+  for (i = 0; i < 3; i++)
+    apply_affine_on_point (affine, &points[i]);
+
+  if (state_type == GTK_STATE_PRELIGHT)
+    {
+      gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
+                                     1, TRUE, points, 3);
+    }
+  else if (state_type == GTK_STATE_ACTIVE)
+    {
+      gtk_style_draw_polygon_with_gc (window, style->light_gc[GTK_STATE_ACTIVE],
+                                     1, TRUE, points, 3);
+      gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
+                                     line_width, FALSE, points, 3);
+    }
+  else
+    {
+      gtk_style_draw_polygon_with_gc (window, style->base_gc[GTK_STATE_NORMAL],
+                                     1, TRUE, points, 3);
+      gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
+                                     line_width, FALSE, points, 3);
+    }
+  if (area)
+    {
+      gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], NULL);
+      gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], NULL);
+    }
+}
+
+typedef struct _ByteRange ByteRange;
+
+struct _ByteRange
+{
+  guint start;
+  guint end;
+};
+
+static ByteRange*
+range_new (guint start,
+           guint end)
+{
+  ByteRange *br = g_new (ByteRange, 1);
+
+  br->start = start;
+  br->end = end;
+  
+  return br;
+}
+
+static PangoLayout*
+get_insensitive_layout (PangoLayout *layout)
+{
+  GSList *embossed_ranges = NULL;
+  GSList *stippled_ranges = NULL;
+  PangoLayoutIter *iter;
+  GSList *tmp_list = NULL;
+  PangoLayout *new_layout;
+  PangoAttrList *attrs;
+  GdkBitmap *stipple = NULL;
+  
+  iter = pango_layout_get_iter (layout);
+  
+  do
+    {
+      PangoLayoutRun *run;
+      PangoAttribute *attr;
+      gboolean need_stipple = FALSE;
+      ByteRange *br;
+      
+      run = pango_layout_iter_get_run (iter);
+
+      if (run)
+        {
+          tmp_list = run->item->analysis.extra_attrs;
+
+          while (tmp_list != NULL)
+            {
+              attr = tmp_list->data;
+              switch (attr->klass->type)
+                {
+                case PANGO_ATTR_FOREGROUND:
+                case PANGO_ATTR_BACKGROUND:
+                  need_stipple = TRUE;
+                  break;
+              
+                default:
+                  break;
+                }
+
+              if (need_stipple)
+                break;
+          
+              tmp_list = g_slist_next (tmp_list);
+            }
+
+          br = range_new (run->item->offset, run->item->offset + run->item->length);
+      
+          if (need_stipple)
+            stippled_ranges = g_slist_prepend (stippled_ranges, br);
+          else
+            embossed_ranges = g_slist_prepend (embossed_ranges, br);
+        }
+    }
+  while (pango_layout_iter_next_run (iter));
+
+  pango_layout_iter_free (iter);
+
+  new_layout = pango_layout_copy (layout);
+
+  attrs = pango_layout_get_attributes (new_layout);
+
+  if (attrs == NULL)
+    {
+      /* Create attr list if there wasn't one */
+      attrs = pango_attr_list_new ();
+      pango_layout_set_attributes (new_layout, attrs);
+      pango_attr_list_unref (attrs);
+    }
+  
+  tmp_list = embossed_ranges;
+  while (tmp_list != NULL)
+    {
+      PangoAttribute *attr;
+      ByteRange *br = tmp_list->data;
+
+      attr = gdk_pango_attr_embossed_new (TRUE);
+
+      attr->start_index = br->start;
+      attr->end_index = br->end;
+      
+      pango_attr_list_change (attrs, attr);
+
+      g_free (br);
+      
+      tmp_list = g_slist_next (tmp_list);
+    }
+
+  g_slist_free (embossed_ranges);
+  
+  tmp_list = stippled_ranges;
+  while (tmp_list != NULL)
+    {
+      PangoAttribute *attr;
+      ByteRange *br = tmp_list->data;
+
+      if (stipple == NULL)
+        {
+#define gray50_width 2
+#define gray50_height 2
+          static char gray50_bits[] = {
+            0x02, 0x01
+          };
+
+          stipple = gdk_bitmap_create_from_data (NULL,
+                                                 gray50_bits, gray50_width,
+                                                 gray50_height);
+        }
+      
+      attr = gdk_pango_attr_stipple_new (stipple);
+
+      attr->start_index = br->start;
+      attr->end_index = br->end;
+      
+      pango_attr_list_change (attrs, attr);
+
+      g_free (br);
+      
+      tmp_list = g_slist_next (tmp_list);
+    }
+
+  g_slist_free (stippled_ranges);
+  
+  if (stipple)
+    g_object_unref (G_OBJECT (stipple));
+
+  return new_layout;
+}
+
+static void
+gtk_default_draw_layout (GtkStyle        *style,
+                         GdkWindow       *window,
+                         GtkStateType     state_type,
+                        gboolean         use_text,
+                         GdkRectangle    *area,
+                         GtkWidget       *widget,
+                         const gchar     *detail,
+                         gint             x,
+                         gint             y,
+                         PangoLayout     *layout)
+{
+  GdkGC *gc;
   
-  g_return_if_fail (style != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (window != NULL);
+
+  gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type];
   
-  if (width == -1 && height == -1)
-    gdk_window_get_size (window, &width, &height);
-  else if (width == -1)
-    gdk_window_get_size (window, &width, NULL);
-  else if (height == -1)
-    gdk_window_get_size (window, NULL, &height);
-  
-  gtk_paint_box (style, window, state_type, shadow_type, area, widget, 
-                 detail, x, y, width, height);
-  
-  
-  if (!strcmp (detail, "paned"))
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, area);
+
+  if (state_type == GTK_STATE_INSENSITIVE)
     {
-      /* we want to ignore the shadow border in paned widgets */
-      xthick = 0;
-      ythick = 0;
+      PangoLayout *ins;
 
-      light_gc = style->light_gc[state_type];
-      dark_gc = style->black_gc;
+      ins = get_insensitive_layout (layout);
+      
+      gdk_draw_layout (window, gc, x, y, ins);
+
+      g_object_unref (G_OBJECT (ins));
     }
   else
     {
-      xthick = style->klass->xthickness;
-      ythick = style->klass->ythickness;
-
-      light_gc = style->light_gc[state_type];
-      dark_gc = style->dark_gc[state_type];
+      gdk_draw_layout (window, gc, x, y, layout);
     }
-  
-  rect.x = x + xthick;
-  rect.y = y + ythick;
-  rect.width = width - (xthick * 2);
-  rect.height = height - (ythick * 2);
 
   if (area)
-      intersect = gdk_rectangle_intersect (area, &rect, &dest);
-  else
+    gdk_gc_set_clip_rectangle (gc, NULL);
+}
+
+static void
+gtk_default_draw_resize_grip (GtkStyle       *style,
+                              GdkWindow      *window,
+                              GtkStateType    state_type,
+                              GdkRectangle   *area,
+                              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 (window != NULL);
+  
+  if (area)
     {
-      intersect = TRUE;
-      dest = rect;
+      gdk_gc_set_clip_rectangle (style->light_gc[state_type], area);
+      gdk_gc_set_clip_rectangle (style->dark_gc[state_type], area);
+      gdk_gc_set_clip_rectangle (style->bg_gc[state_type], area);
     }
 
-  if (!intersect)
-    return;
-
-  gdk_gc_set_clip_rectangle (light_gc, &dest);
-  gdk_gc_set_clip_rectangle (dark_gc, &dest);
-
-  if (!strcmp (detail, "paned"))
+  /* make it square, aligning to bottom right */
+  if (width < height)
+    {
+      y += (height - width);
+      height = width;
+    }
+  else if (height < width)
     {
-      gint window_width;
-      gint window_height;
+      x += (width - height);
+      width = height;
+    }
 
-      gdk_window_get_size (window, &window_width, &window_height);
+  /* Clear background */
+  gtk_style_apply_default_background (style, window, FALSE,
+                                     state_type, area,
+                                     x, y, width, height);   
 
-      if (orientation == GTK_ORIENTATION_HORIZONTAL)
-       for (xx = window_width/2 - 15; xx <= window_width/2 + 15; xx += 5)
-         draw_dot (window, light_gc, dark_gc, xx, window_height/2 - 1, 3);
-      else
-       for (yy = window_height/2 - 15; yy <= window_height/2 + 15; yy += 5)
-         draw_dot (window, light_gc, dark_gc, window_width/2 - 1, yy, 3);
+  switch (edge)
+    {
+    case GDK_WINDOW_EDGE_SOUTH_EAST:
+      {
+        gint xi, yi;
+
+        xi = x;
+        yi = y;
+
+        while (xi < (x + width - 3))
+          {
+            gdk_draw_line (window,
+                           style->light_gc[state_type],
+                           xi, y + height,
+                           x + width, yi);                           
+
+            ++xi;
+            ++yi;
+            
+            gdk_draw_line (window,
+                           style->dark_gc[state_type],
+                           xi, y + height,
+                           x + width, yi);                           
+
+            ++xi;
+            ++yi;
+            
+            gdk_draw_line (window,
+                           style->dark_gc[state_type],
+                           xi, y + height,
+                           x + width, yi);
+
+            xi += 3;
+            yi += 3;
+          }
+      }
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
     }
-  else
+  
+  if (area)
     {
-      for (yy = y + ythick; yy < (y + height - ythick); yy += 3)
-       for (xx = x + xthick; xx < (x + width - xthick); xx += 6)
-         {
-           draw_dot (window, light_gc, dark_gc, xx, yy, 2);
-           draw_dot (window, light_gc, dark_gc, xx + 3, yy + 1, 2);
-         }
+      gdk_gc_set_clip_rectangle (style->light_gc[state_type], NULL);
+      gdk_gc_set_clip_rectangle (style->dark_gc[state_type], NULL);
+      gdk_gc_set_clip_rectangle (style->bg_gc[state_type], NULL);
     }
-
-  gdk_gc_set_clip_rectangle (light_gc, NULL);
-  gdk_gc_set_clip_rectangle (dark_gc, NULL);
 }
 
 static void
@@ -3395,6 +5071,22 @@ hls_to_rgb (gdouble *h,
     }
 }
 
+
+/**
+ * gtk_paint_hline:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @area: rectangle to which the output is clipped
+ * @widget:
+ * @detail: 
+ * @x1: the starting x coordinate
+ * @x2: the ending x coordinate
+ * @y: the y coordinate
+ * 
+ * Draws a horizontal line from (@x1, @y) to (@x2, @y) in @window
+ * using the given style and state.
+ **/ 
 void 
 gtk_paint_hline (GtkStyle      *style,
                  GdkWindow     *window,
@@ -3406,13 +5098,27 @@ gtk_paint_hline (GtkStyle      *style,
                  gint          x2,
                  gint          y)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_hline != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL);
   
-  style->klass->draw_hline (style, window, state_type, area, widget, detail, x1, x2, y);
+  GTK_STYLE_GET_CLASS (style)->draw_hline (style, window, state_type, area, widget, detail, x1, x2, y);
 }
 
+/**
+ * gtk_paint_vline:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @area: rectangle to which the output is clipped
+ * @widget:
+ * @detail: 
+ * @y1: the starting y coordinate
+ * @y2: the ending y coordinate
+ * @x: the x coordinate
+ * 
+ * Draws a vertical line from (@x, @y1) to (@x, @y1) in @window
+ * using the given style and state.
+ */
 void
 gtk_paint_vline (GtkStyle      *style,
                  GdkWindow     *window,
@@ -3424,11 +5130,10 @@ gtk_paint_vline (GtkStyle      *style,
                  gint          y2,
                  gint          x)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_vline != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL);
   
-  style->klass->draw_vline (style, window, state_type, area, widget, detail, y1, y2, x);
+  GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, area, widget, detail, y1, y2, x);
 }
 
 void
@@ -3444,11 +5149,10 @@ gtk_paint_shadow (GtkStyle     *style,
                   gint          width,
                   gint          height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_shadow != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
   
-  style->klass->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3463,11 +5167,10 @@ gtk_paint_polygon (GtkStyle      *style,
                    gint           npoints,
                    gboolean       fill)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_shadow != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
   
-  style->klass->draw_polygon (style, window, state_type, shadow_type, area, widget, detail, points, npoints, fill);
+  GTK_STYLE_GET_CLASS (style)->draw_polygon (style, window, state_type, shadow_type, area, widget, detail, points, npoints, fill);
 }
 
 void
@@ -3485,11 +5188,10 @@ gtk_paint_arrow (GtkStyle      *style,
                  gint           width,
                  gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_arrow != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL);
   
-  style->klass->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
 }
 
 void
@@ -3505,33 +5207,28 @@ gtk_paint_diamond (GtkStyle      *style,
                    gint        width,
                    gint        height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_diamond != NULL);
-  
-  style->klass->draw_diamond (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-}
-
-void
-gtk_paint_oval (GtkStyle      *style,
-                GdkWindow     *window,
-                GtkStateType   state_type,
-                GtkShadowType  shadow_type,
-                GdkRectangle  *area,
-                GtkWidget     *widget,
-                const gchar   *detail,
-                gint           x,
-                gint           y,
-                gint           width,
-                gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_oval != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL);
   
-  style->klass->draw_oval (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_diamond (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
+/**
+ * gtk_paint_string:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @area: clip rectangle
+ * @widget: the widget
+ * @detail: a style detail
+ * @x: x origin
+ * @y: y origin
+ * @string: the string to draw
+ * 
+ * Draws a text string on @window with the given parameters.
+ *
+ * This function is deprecated, use gtk_paint_layout() instead.
+ */
 void
 gtk_paint_string (GtkStyle      *style,
                   GdkWindow     *window,
@@ -3543,11 +5240,10 @@ gtk_paint_string (GtkStyle      *style,
                   gint           y,
                   const gchar   *string)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_string != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL);
   
-  style->klass->draw_string (style, window, state_type, area, widget, detail, x, y, string);
+  GTK_STYLE_GET_CLASS (style)->draw_string (style, window, state_type, area, widget, detail, x, y, string);
 }
 
 void
@@ -3563,11 +5259,10 @@ gtk_paint_box (GtkStyle      *style,
                gint           width,
                gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_box != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL);
   
-  style->klass->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3583,11 +5278,10 @@ gtk_paint_flat_box (GtkStyle      *style,
                     gint           width,
                     gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_flat_box != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL);
   
-  style->klass->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3603,11 +5297,10 @@ gtk_paint_check (GtkStyle      *style,
                  gint           width,
                  gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_check != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL);
   
-  style->klass->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3623,52 +5316,10 @@ gtk_paint_option (GtkStyle      *style,
                   gint           width,
                   gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_option != NULL);
-  
-  style->klass->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-}
-
-void
-gtk_paint_cross (GtkStyle      *style,
-                 GdkWindow     *window,
-                 GtkStateType   state_type,
-                 GtkShadowType  shadow_type,
-                 GdkRectangle  *area,
-                 GtkWidget     *widget,
-                 const gchar   *detail,
-                 gint           x,
-                 gint           y,
-                 gint           width,
-                 gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_cross != NULL);
-  
-  style->klass->draw_cross (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-}
-
-void
-gtk_paint_ramp (GtkStyle      *style,
-                GdkWindow     *window,
-                GtkStateType   state_type,
-                GtkShadowType  shadow_type,
-                GdkRectangle  *area,
-                GtkWidget     *widget,
-                const gchar   *detail,
-                GtkArrowType   arrow_type,
-                gint           x,
-                gint           y,
-                gint           width,
-                gint           height)
-{
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_ramp != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL);
   
-  style->klass->draw_ramp (style, window, state_type, shadow_type, area, widget, detail, arrow_type, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3684,11 +5335,10 @@ gtk_paint_tab (GtkStyle      *style,
                gint           width,
                gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_tab != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL);
   
-  style->klass->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3707,11 +5357,10 @@ gtk_paint_shadow_gap (GtkStyle       *style,
                       gint            gap_x,
                       gint            gap_width)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_shadow_gap != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
   
-  style->klass->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
+  GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
 }
 
 
@@ -3731,11 +5380,10 @@ gtk_paint_box_gap (GtkStyle       *style,
                    gint            gap_x,
                    gint            gap_width)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_box_gap != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL);
   
-  style->klass->draw_box_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
+  GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
 }
 
 void
@@ -3752,16 +5400,16 @@ gtk_paint_extension (GtkStyle       *style,
                      gint            height,
                      GtkPositionType gap_side)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_extension != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL);
   
-  style->klass->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
+  GTK_STYLE_GET_CLASS (style)->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
 }
 
 void
 gtk_paint_focus (GtkStyle      *style,
                  GdkWindow     *window,
+                GtkStateType   state_type,
                  GdkRectangle  *area,
                  GtkWidget     *widget,
                  const gchar   *detail,
@@ -3770,11 +5418,10 @@ gtk_paint_focus (GtkStyle      *style,
                  gint           width,
                  gint           height)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_focus != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL);
   
-  style->klass->draw_focus (style, window, area, widget, detail, x, y, width, height);
+  GTK_STYLE_GET_CLASS (style)->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
 }
 
 void
@@ -3791,11 +5438,10 @@ gtk_paint_slider (GtkStyle      *style,
                   gint           height,
                   GtkOrientation orientation)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_slider != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
   
-  style->klass->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+  GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
 }
 
 void
@@ -3812,9 +5458,400 @@ gtk_paint_handle (GtkStyle      *style,
                   gint           height,
                   GtkOrientation orientation)
 {
-  g_return_if_fail (style != NULL);
-  g_return_if_fail (style->klass != NULL);
-  g_return_if_fail (style->klass->draw_handle != NULL);
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL);
   
-  style->klass->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+  GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+}
+
+void
+gtk_paint_expander (GtkStyle        *style,
+                    GdkWindow       *window,
+                    GtkStateType     state_type,
+                    GdkRectangle    *area,
+                    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);
+  
+  GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type, area,
+                                              widget, detail, x, y, expander_style);
+}
+
+void
+gtk_paint_layout (GtkStyle        *style,
+                  GdkWindow       *window,
+                  GtkStateType     state_type,
+                 gboolean         use_text,
+                  GdkRectangle    *area,
+                  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);
+  
+  GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, area,
+                                            widget, detail, x, y, layout);
+}
+
+void
+gtk_paint_resize_grip (GtkStyle      *style,
+                       GdkWindow     *window,
+                       GtkStateType   state_type,
+                       GdkRectangle  *area,
+                       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);
+
+  GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type,
+                                                 area, widget, detail,
+                                                 edge, x, y, width, height);
+}
+
+/**
+ * gtk_border_copy:
+ * @border: a #GtkBorder.
+ * @returns: a copy of @border.
+ *
+ * Copies a #GtkBorder structure.
+ **/
+GtkBorder *
+gtk_border_copy (const GtkBorder *border)
+{
+  return (GtkBorder *)g_memdup (border, sizeof (GtkBorder));
+}
+
+/**
+ * gtk_border_free:
+ * @border: a #GtkBorder.
+ * 
+ * Frees a #GtkBorder structure.
+ **/
+void
+gtk_border_free (GtkBorder *border)
+{
+  g_free (border);
+}
+
+GType
+gtk_border_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GtkTypeBorder",
+                                            (GBoxedCopyFunc) gtk_border_copy,
+                                            (GBoxedFreeFunc) gtk_border_free);
+
+  return our_type;
+}
+
+/**
+ * gtk_style_get_font:
+ * @style: a #GtkStyle
+ * 
+ * Gets the #GdkFont to use for the given style. This is
+ * meant only as a replacement for direct access to @style->font
+ * and should not be used in new code. New code should
+ * use @style->font_desc instead.
+ * 
+ * Return value: the #GdkFont for the style. This font is owned
+ *   by the style; if you want to keep around a copy, you must
+ *   call gdk_font_ref().
+ **/
+GdkFont *
+gtk_style_get_font (GtkStyle *style)
+{
+  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+
+  if (style->private_font && style->private_font_desc)
+    {
+      if (!style->font_desc ||
+         !pango_font_description_equal (style->private_font_desc, style->font_desc))
+       {
+         gdk_font_unref (style->private_font);
+         style->private_font = NULL;
+         
+         if (style->private_font_desc)
+           {
+             pango_font_description_free (style->private_font_desc);
+             style->private_font_desc = NULL;
+           }
+       }
+    }
+  
+  if (!style->private_font)
+    {
+      if (style->font_desc)
+       {
+         style->private_font = gdk_font_from_description (style->font_desc);
+         style->private_font_desc = pango_font_description_copy (style->font_desc);
+       }
+
+      if (!style->private_font)
+       style->private_font = gdk_font_load ("fixed");
+
+      if (!style->private_font) 
+       g_error ("Unable to load \"fixed\" font");
+    }
+
+  return style->private_font;
+}
+
+/**
+ * gtk_style_set_font:
+ * @style: a #GtkStyle.
+ * @font: a #GdkFont, or %NULL to use the #GdkFont corresponding
+ *   to style->font_desc.
+ * 
+ * Sets the #GdkFont to use for a given style. This is
+ * meant only as a replacement for direct access to style->font
+ * and should not be used in new code. New code should
+ * use style->font_desc instead.
+ **/
+void
+gtk_style_set_font (GtkStyle *style,
+                   GdkFont  *font)
+{
+  GdkFont *old_font;
+
+  g_return_if_fail (GTK_IS_STYLE (style));
+
+  old_font = style->private_font;
+
+  style->private_font = font;
+  if (font)
+    gdk_font_ref (font);
+
+  if (old_font)
+    gdk_font_unref (old_font);
+
+  if (style->private_font_desc)
+    {
+      pango_font_description_free (style->private_font_desc);
+      style->private_font_desc = NULL;
+    }
+}
+
+typedef struct _CursorInfo CursorInfo;
+
+struct _CursorInfo
+{
+  GType for_type;
+  GdkGC *primary_gc;
+  GdkGC *secondary_gc;
+};
+
+static void
+style_unrealize_cursor_gcs (GtkStyle *style)
+{
+  CursorInfo *
+  
+  cursor_info = g_object_get_data (G_OBJECT (style), "gtk-style-cursor-info");
+  if (cursor_info)
+    {
+      if (cursor_info->primary_gc)
+       gtk_gc_release (cursor_info->primary_gc);
+
+      if (cursor_info->secondary_gc)
+       gtk_gc_release (cursor_info->secondary_gc);
+      
+      g_free (cursor_info);
+      g_object_set_data (G_OBJECT (style), "gtk-style-cursor-info", NULL);
+    }
+}
+
+static GdkGC *
+make_cursor_gc (GtkWidget   *widget,
+               const gchar *property_name,
+               GdkColor    *fallback)
+{
+  GdkGCValues gc_values;
+  GdkGCValuesMask gc_values_mask;
+  GdkColor *cursor_color;
+
+  gtk_widget_style_get (widget, property_name, &cursor_color, NULL);
+  
+  gc_values_mask = GDK_GC_FOREGROUND;
+  if (cursor_color)
+    {
+      gc_values.foreground = *cursor_color;
+      gdk_color_free (cursor_color);
+    }
+  else
+    gc_values.foreground = *fallback;
+  
+  gdk_rgb_find_color (widget->style->colormap, &gc_values.foreground);
+  return gtk_gc_get (widget->style->depth, widget->style->colormap, &gc_values, gc_values_mask);
+}
+
+/**
+ * _gtk_get_insertion_cursor_gc:
+ * @widget: a #GtkWidget
+ * @is_primary: if the cursor should be the primary cursor color.
+ * 
+ * Get a GC suitable for drawing the primary or secondary text
+ * cursor.
+ *
+ * Note: the return value is ref'ed because calls to this function
+ *  on other widgets could result in this the GC being released
+ *  which would be an unexpected side effect. If made public,
+ *  this function should possibly be called create_insertion_cursor_gc().
+ *
+ * Return value: an appropriate #GdkGC. Call g_object_unref() on
+ *   the gc when you are done with it; this GC may be shared with
+ *   other users, so you must not modify the GC except for temporarily
+ *   setting the clip before drawing with the GC, and then unsetting the clip
+ *   again afterwards.
+ **/
+GdkGC *
+_gtk_get_insertion_cursor_gc (GtkWidget *widget,
+                             gboolean   is_primary)
+{
+  CursorInfo *cursor_info;
+
+  cursor_info = g_object_get_data (G_OBJECT (widget->style), "gtk-style-cursor-info");
+  if (!cursor_info)
+    {
+      cursor_info = g_new (CursorInfo, 1);
+      g_object_set_data (G_OBJECT (widget->style), "gtk-style-cursor-info", cursor_info);
+      cursor_info->primary_gc = NULL;
+      cursor_info->secondary_gc = NULL;
+      cursor_info->for_type = G_TYPE_INVALID;
+    }
+
+  /* We have to keep track of the type because gtk_widget_style_get()
+   * can return different results when called on the same property and
+   * same style but for different widgets. :-(. That is,
+   * GtkEntry::cursor-color = "red" in a style will modify the cursor
+   * color for entries but not for text view.
+   */
+  if (cursor_info->for_type != G_OBJECT_TYPE (widget))
+    {
+      cursor_info->for_type = G_OBJECT_TYPE (widget);
+      if (cursor_info->primary_gc)
+       {
+         gtk_gc_release (cursor_info->primary_gc);
+         cursor_info->primary_gc = NULL;
+       }
+      if (cursor_info->secondary_gc)
+       {
+         gtk_gc_release (cursor_info->secondary_gc);
+         cursor_info->secondary_gc = NULL;
+       }
+    }
+
+  if (is_primary)
+    {
+      if (!cursor_info->primary_gc)
+       cursor_info->primary_gc = make_cursor_gc (widget,
+                                                 "cursor-color",
+                                                 &widget->style->black);
+       
+      return g_object_ref (cursor_info->primary_gc);
+    }
+  else
+    {
+      static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+      
+      if (!cursor_info->secondary_gc)
+       cursor_info->secondary_gc = make_cursor_gc (widget,
+                                                   "secondary-cursor-color",
+                                                   &gray);
+       
+      return g_object_ref (cursor_info->secondary_gc);
+    }
+}
+
+/**
+ * _gtk_draw_insertion_cursor:
+ * @widget: a #GtkWidget
+ * @drawable: a #GdkDrawable
+ * @gc: a #GdkGC
+ * @location: location where to draw the cursor (@location->width is ignored)
+ * @direction: whether the cursor is left-to-right or
+ *             right-to-left. Should never be #GTK_TEXT_DIR_NONE
+ * @draw_arrow: %TRUE to draw a directional arrow on the
+ *        cursor. Should be %FALSE unless the cursor is split.
+ * 
+ * Draws a text caret on @drawable at @location. This is not a style function
+ * but merely a convenience function for drawing the standard cursor shape.
+ **/
+void
+_gtk_draw_insertion_cursor (GtkWidget        *widget,
+                           GdkDrawable      *drawable,
+                           GdkGC            *gc,
+                           GdkRectangle     *location,
+                            GtkTextDirection  direction,
+                            gboolean          draw_arrow)
+{
+  gint stem_width;
+  gint arrow_width;
+  gint x, y;
+  gint i;
+  gfloat cursor_aspect_ratio;
+  gint offset;
+  
+  g_return_if_fail (direction != GTK_TEXT_DIR_NONE);
+  
+  gtk_widget_style_get (widget, "cursor-aspect-ratio", &cursor_aspect_ratio, NULL);
+  
+  stem_width = location->height * cursor_aspect_ratio + 1;
+  arrow_width = stem_width + 1;
+
+  /* put (stem_width % 2) on the proper side of the cursor */
+  if (direction == GTK_TEXT_DIR_LTR)
+    offset = stem_width / 2;
+  else
+    offset = stem_width - stem_width / 2;
+  
+  for (i = 0; i < stem_width; i++)
+    gdk_draw_line (drawable, gc,
+                  location->x + i - offset, location->y,
+                  location->x + i - offset, location->y + location->height - 1);
+
+  if (draw_arrow)
+    {
+      if (direction == GTK_TEXT_DIR_RTL)
+        {
+          x = location->x - offset - 1;
+          y = location->y + location->height - arrow_width * 2 - arrow_width + 1;
+  
+          for (i = 0; i < arrow_width; i++)
+            {
+              gdk_draw_line (drawable, gc,
+                             x, y + i + 1,
+                             x, y + 2 * arrow_width - i - 1);
+              x --;
+            }
+        }
+      else if (direction == GTK_TEXT_DIR_LTR)
+        {
+          x = location->x + stem_width - offset;
+          y = location->y + location->height - arrow_width * 2 - arrow_width + 1;
+  
+          for (i = 0; i < arrow_width; i++) 
+            {
+              gdk_draw_line (drawable, gc,
+                             x, y + i + 1,
+                             x, y + 2 * arrow_width - i - 1);
+              x++;
+            }
+        }
+    }
 }