X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=modules%2Fengines%2Fms-windows%2Fmsw_style.c;h=f8a95227bc0fe5cea7bec0fedfc9f933faaada2c;hb=a4cde82365d766d63a062313c7ff6670c4b1eb74;hp=1105fa1cb36f92ef1b799283c4773d3a732414f5;hpb=78dc2debc05c220bb9ec9b1671a32cc5cbe6b857;p=~andy%2Fgtk diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index 1105fa1cb..f8a95227b 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -16,9 +16,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library 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. + * License along with this library. If not, see . */ /* @@ -43,6 +41,10 @@ #include "gtk/gtk.h" #include "gtk/gtk.h" +#ifndef GTK_COMPILATION +#define GTK_COMPILATION +#endif +#include "gtk/gtkmenushellprivate.h" #ifdef BUILDING_STANDALONE #include "gdk/gdkwin32.h" @@ -82,81 +84,137 @@ typedef enum #define PART_SIZE 13 -static const gchar check_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 +static const unsigned char check_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, 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 const gchar 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 +static const unsigned char check_base_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar 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 +static const unsigned char check_black_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar 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 +static const unsigned char check_dark_bits[] = { + 0xff, 0x1f, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00 }; -static const gchar 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 +static const unsigned char check_light_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0xfe, 0x1f, 0x00, 0x00 }; -static const gchar 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 +static const unsigned char check_mid_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar check_text_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x88, 0x03, - 0xd8, 0x01, 0xf8, - 0x00, 0x70, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +static const unsigned char check_text_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x00, 0x03, 0x00, 0x00, 0x88, 0x03, 0x00, 0x00, + 0xd8, 0x01, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, + 0x70, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar check_inconsistent_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xf0, 0x03, 0xf0, - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +static const unsigned char check_inconsistent_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, + 0xf0, 0x03, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar radio_base_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, 0x03, 0xfc, 0x07, 0xfc, 0x07, - 0xfc, 0x07, 0xfc, - 0x07, 0xfc, 0x07, 0xf8, 0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00 +static const unsigned char radio_base_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x01, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, + 0xfc, 0x07, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x00, + 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar 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 +static const unsigned char radio_black_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, + 0x0c, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar radio_dark_bits[] = { - 0xf0, 0x01, 0x0c, 0x06, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, - 0x01, 0x00, 0x01, - 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00 +static const unsigned char radio_dark_bits[] = { + 0xf0, 0x01, 0x00, 0x00, 0x0c, 0x06, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar radio_light_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x10, - 0x00, 0x10, 0x00, - 0x10, 0x00, 0x10, 0x00, 0x08, 0x00, 0x08, 0x0c, 0x06, 0xf0, 0x01 +static const unsigned char radio_light_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x0c, 0x06, 0x00, 0x00, + 0xf0, 0x01, 0x00, 0x00 }; -static const gchar radio_mid_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x08, 0x00, 0x08, - 0x00, 0x08, 0x00, - 0x08, 0x00, 0x08, 0x00, 0x04, 0x0c, 0x06, 0xf0, 0x01, 0x00, 0x00 +static const unsigned char radio_mid_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x0c, 0x06, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; -static const gchar 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 +static const unsigned char radio_text_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, + 0xf0, 0x01, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; static struct { - const gchar *bits; - GdkBitmap *bmap; + const unsigned char *bits; + cairo_surface_t *bmap; } parts[] = { { check_aa_bits, NULL }, { check_base_bits, NULL }, @@ -411,7 +469,7 @@ msw_style_setup_system_settings (void) setup_menu_settings (settings); /* - http://developer.gnome.org/doc/API/2.0/gtk/GtkSettings.html + http://library.gnome.org/devel/gtk/stable/GtkSettings.html http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/systemparametersinfo.asp http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/getsystemmetrics.asp */ } @@ -604,8 +662,9 @@ setup_msw_rc_style (void) btn_face.red, btn_face.green, btn_face.blue); gtk_rc_parse_string (buf); - /* enable coloring for text on buttons TODO: use GetThemeMetric for the - border and outside border */ + /* enable coloring for text on buttons + * TODO: use GetThemeMetric for the border and outside border + * TODO: child-displacement-x & y should be 0 when XP theme is active */ g_snprintf (buf, sizeof (buf), "style \"msw-button\" = \"msw-default\"\n" "{\n" @@ -793,7 +852,7 @@ setup_system_styles (GtkStyle *style) sys_color_to_gtk_color (XP_THEME_CLASS_TEXT, COLOR_GRAYTEXT, &style->fg[GTK_STATE_INSENSITIVE]); sys_color_to_gtk_color (XP_THEME_CLASS_BUTTON, COLOR_BTNTEXT, - &style->bg[GTK_STATE_ACTIVE]); + &style->fg[GTK_STATE_ACTIVE]); sys_color_to_gtk_color (XP_THEME_CLASS_WINDOW, COLOR_WINDOWTEXT, &style->fg[GTK_STATE_PRELIGHT]); @@ -817,37 +876,14 @@ setup_system_styles (GtkStyle *style) } } -static gboolean -sanitize_size (GdkWindow *window, gint *width, gint *height) -{ - gboolean set_bg = FALSE; - - if ((*width == -1) && (*height == -1)) - { - set_bg = GDK_IS_WINDOW (window); - gdk_drawable_get_size (window, width, height); - } - else if (*width == -1) - { - gdk_drawable_get_size (window, width, NULL); - } - else if (*height == -1) - { - gdk_drawable_get_size (window, NULL, height); - } - - return set_bg; -} - static XpThemeElement map_gtk_progress_bar_to_xp (GtkProgressBar *progress_bar, gboolean trough) { XpThemeElement ret; - switch (gtk_progress_bar_get_orientation (progress_bar)) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (progress_bar))) { - case GTK_PROGRESS_LEFT_TO_RIGHT: - case GTK_PROGRESS_RIGHT_TO_LEFT: + case GTK_ORIENTATION_HORIZONTAL: ret = trough ? XP_THEME_ELEMENT_PROGRESS_TROUGH_H : XP_THEME_ELEMENT_PROGRESS_BAR_H; @@ -871,7 +907,7 @@ is_combo_box_child (GtkWidget *w) if (w == NULL) return FALSE; - for (tmp = w->parent; tmp; tmp = tmp->parent) + for (tmp = gtk_widget_get_parent (w); tmp; tmp = gtk_widget_get_parent (tmp)) { if (GTK_IS_COMBO_BOX (tmp)) return TRUE; @@ -883,9 +919,9 @@ is_combo_box_child (GtkWidget *w) /* This function is not needed anymore */ /* static gboolean combo_box_draw_arrow (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state, - GdkRectangle *area, GtkWidget *widget) + GtkWidget *widget) { if (xp_theme_is_active ()) return TRUE; @@ -897,9 +933,9 @@ combo_box_draw_arrow (GtkStyle *style, HDC dc; XpDCInfo dc_info; - dc = get_window_dc (style, window, state, &dc_info, area->x, area->y, area->width, + dc = get_window_dc (style, cr, state, &dc_info, area->x, area->y, area->width, area->height, &rect); - border = (GTK_TOGGLE_BUTTON (widget->parent)-> + border = (GTK_TOGGLE_BUTTON (gtk_widget_get_parent (widget))-> active ? DFCS_PUSHED | DFCS_FLAT : 0); InflateRect (&rect, 1, 1); @@ -914,37 +950,25 @@ combo_box_draw_arrow (GtkStyle *style, }*/ static void -draw_part (GdkDrawable *drawable, - GdkGC *gc, GdkRectangle *area, gint x, gint y, Part part) +draw_part (cairo_t *cr, + GdkColor *gc, gint x, gint y, Part part) { - if (area) - gdk_gc_set_clip_rectangle (gc, area); - if (!parts[part].bmap) { - parts[part].bmap = gdk_bitmap_create_from_data (drawable, - parts[part].bits, - PART_SIZE, PART_SIZE); + parts[part].bmap = cairo_image_surface_create_for_data ((unsigned char *)parts[part].bits, + CAIRO_FORMAT_A1, + PART_SIZE, PART_SIZE, 4); } - gdk_gc_set_ts_origin (gc, x, y); - gdk_gc_set_stipple (gc, parts[part].bmap); - gdk_gc_set_fill (gc, GDK_STIPPLED); - - gdk_draw_rectangle (drawable, gc, TRUE, x, y, PART_SIZE, PART_SIZE); - - gdk_gc_set_fill (gc, GDK_SOLID); - - if (area) - gdk_gc_set_clip_rectangle (gc, NULL); + gdk_cairo_set_source_color (cr, gc); + cairo_mask_surface (cr, parts[part].bmap, x, y); } static void draw_check (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state, GtkShadowType shadow, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -955,8 +979,8 @@ draw_check (GtkStyle *style, { if (shadow == GTK_SHADOW_IN) { - draw_part (window, &style->black, area, x, y, CHECK_TEXT); - draw_part (window, &style->dark[state], area, x, y, CHECK_AA); + draw_part (cr, &style->black, x, y, CHECK_TEXT); + draw_part (cr, &style->dark[state], x, y, CHECK_AA); } } else @@ -976,31 +1000,27 @@ draw_check (GtkStyle *style, break; } - if (!xp_theme_draw (window, theme_elt, - style, x, y, width, height, state, area)) + if (!xp_theme_draw (cr, theme_elt, + style, x, y, width, height, state)) { if (detail && !strcmp (detail, "cellcheck")) state = GTK_STATE_NORMAL; - draw_part (window, &style->black, area, x, y, CHECK_BLACK); - draw_part (window, &style->dark[state], area, x, y, CHECK_DARK); - draw_part (window, &style->mid[state], area, x, y, CHECK_MID); - draw_part (window, &style->light[state], area, x, y, CHECK_LIGHT); - draw_part (window, &style->base[state], area, x, y, CHECK_BASE); + draw_part (cr, &style->black, x, y, CHECK_BLACK); + draw_part (cr, &style->dark[state], x, y, CHECK_DARK); + draw_part (cr, &style->mid[state], x, y, CHECK_MID); + draw_part (cr, &style->light[state], x, y, CHECK_LIGHT); + draw_part (cr, &style->base[state], x, y, CHECK_BASE); if (shadow == GTK_SHADOW_IN) { - draw_part (window, &style->text[state], area, x, - y, CHECK_TEXT); - draw_part (window, &style->text_aa[state], area, - x, y, CHECK_AA); + draw_part (cr, &style->text[state], x, y, CHECK_TEXT); + draw_part (cr, &style->text_aa[state], x, y, CHECK_AA); } else if (shadow == GTK_SHADOW_ETCHED_IN) { - draw_part (window, &style->text[state], area, x, y, - CHECK_INCONSISTENT); - draw_part (window, &style->text_aa[state], area, x, y, - CHECK_AA); + draw_part (cr, &style->text[state], x, y, CHECK_INCONSISTENT); + draw_part (cr, &style->text_aa[state], x, y, CHECK_AA); } } } @@ -1008,15 +1028,12 @@ draw_check (GtkStyle *style, static void draw_expander (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, GtkExpanderStyle expander_style) { - cairo_t *cr = gdk_cairo_create (window); - gint expander_size; gint expander_semi_size; XpThemeElement xp_expander; @@ -1041,19 +1058,16 @@ draw_expander (GtkStyle *style, if (expander_size > 2) expander_size -= 2; - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); +/* FIXME: wtf? gdk_cairo_set_source_color (cr, &style->fg[state]); - } + */ expander_semi_size = expander_size / 2; x -= expander_semi_size; y -= expander_semi_size; - if (!xp_theme_draw (window, xp_expander, style, - x, y, expander_size, expander_size, state, area)) + if (!xp_theme_draw (cr, xp_expander, style, + x, y, expander_size, expander_size, state)) { HDC dc; RECT rect; @@ -1061,7 +1075,7 @@ draw_expander (GtkStyle *style, HGDIOBJ old_pen; XpDCInfo dc_info; - dc = get_window_dc (style, window, state, &dc_info, x, y, expander_size, + dc = get_window_dc (style, cr, state, &dc_info, x, y, expander_size, expander_size, &rect); FrameRect (dc, &rect, GetSysColorBrush (COLOR_GRAYTEXT)); InflateRect (&rect, -1, -1); @@ -1089,16 +1103,13 @@ draw_expander (GtkStyle *style, DeleteObject (pen); release_window_dc (&dc_info); } - - cairo_destroy(cr); } static void draw_option (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state, GtkShadowType shadow, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -1109,15 +1120,15 @@ draw_option (GtkStyle *style, { if (shadow == GTK_SHADOW_IN) { - draw_part (window, &style->fg[state], area, x, y, RADIO_TEXT); + draw_part (cr, &style->fg[state], x, y, RADIO_TEXT); } } else { - if (xp_theme_draw (window, shadow == GTK_SHADOW_IN + if (xp_theme_draw (cr, shadow == GTK_SHADOW_IN ? XP_THEME_ELEMENT_PRESSED_RADIO_BUTTON : XP_THEME_ELEMENT_RADIO_BUTTON, - style, x, y, width, height, state, area)) + style, x, y, width, height, state)) { } else @@ -1125,37 +1136,27 @@ draw_option (GtkStyle *style, if (detail && !strcmp (detail, "cellradio")) state = GTK_STATE_NORMAL; - draw_part (window, &style->black, area, x, y, RADIO_BLACK); - draw_part (window, &style->dark[state], area, x, y, RADIO_DARK); - draw_part (window, &style->mid[state], area, x, y, RADIO_MID); - draw_part (window, &style->light[state], area, x, y, RADIO_LIGHT); - draw_part (window, &style->base[state], area, x, y, RADIO_BASE); + draw_part (cr, &style->black, x, y, RADIO_BLACK); + draw_part (cr, &style->dark[state], x, y, RADIO_DARK); + draw_part (cr, &style->mid[state], x, y, RADIO_MID); + draw_part (cr, &style->light[state], x, y, RADIO_LIGHT); + draw_part (cr, &style->base[state], x, y, RADIO_BASE); if (shadow == GTK_SHADOW_IN) - draw_part (window, &style->text[state], area, x, y, RADIO_TEXT); + draw_part (cr, &style->text[state], x, y, RADIO_TEXT); } } } static void -draw_varrow (GdkWindow *window, +draw_varrow (cairo_t *cr, GdkColor *gc, GtkShadowType shadow_type, - GdkRectangle *area, GtkArrowType arrow_type, gint x, gint y, gint width, gint height) { gint steps, extra; gint y_start, y_increment; gint i; - cairo_t *cr; - - cr = gdk_cairo_create (window); - - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); - } width = width + width % 2 - 1; /* Force odd */ steps = 1 + width / 2; @@ -1178,29 +1179,17 @@ draw_varrow (GdkWindow *window, x + (i - extra), y_start + i * y_increment, x + width - (i - extra) - 1, y_start + i * y_increment); } - - cairo_destroy(cr); } static void -draw_harrow (GdkWindow *window, +draw_harrow (cairo_t *cr, GdkColor *gc, GtkShadowType shadow_type, - GdkRectangle *area, GtkArrowType arrow_type, gint x, gint y, gint width, gint height) { gint steps, extra; gint x_start, x_increment; gint i; - cairo_t *cr; - - cr = gdk_cairo_create (window); - - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); - } height = height + height % 2 - 1; /* Force odd */ steps = 1 + height / 2; @@ -1223,8 +1212,6 @@ draw_harrow (GdkWindow *window, x_start + i * x_increment, y + (i - extra), x_start + i * x_increment, y + height - (i - extra) - 1); } - - cairo_destroy(cr); } /* This function makes up for some brokeness in gtkrange.c @@ -1296,10 +1283,9 @@ to_xp_arrow (GtkArrowType arrow_type) static void draw_arrow (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state, GtkShadowType shadow, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, GtkArrowType arrow_type, @@ -1312,8 +1298,6 @@ draw_arrow (GtkStyle *style, name = gtk_widget_get_name (widget); - sanitize_size (window, &width, &height); - if (GTK_IS_ARROW (widget) && is_combo_box_child (widget) && xp_theme_is_active ()) return; @@ -1336,7 +1320,7 @@ draw_arrow (GtkStyle *style, ++y; } - draw_varrow (window, &style->fg[state], shadow, area, + draw_varrow (cr, &style->fg[state], shadow, arrow_type, x, y, width, height); return; @@ -1356,15 +1340,15 @@ draw_arrow (GtkStyle *style, reverse_engineer_stepper_box (widget, arrow_type, &box_x, &box_y, &box_width, &box_height); - if (gtk_range_get_adjustment(&scrollbar->range)->page_size >= - (gtk_range_get_adjustment(&scrollbar->range)->upper - - gtk_range_get_adjustment(&scrollbar->range)->lower)) + if (gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)) >= + (gtk_adjustment_get_upper(gtk_range_get_adjustment(&scrollbar->range)) - + gtk_adjustment_get_lower(gtk_range_get_adjustment(&scrollbar->range)))) { is_disabled = TRUE; } - if (xp_theme_draw (window, to_xp_arrow (arrow_type), style, box_x, box_y, - box_width, box_height, state, area)) + if (xp_theme_draw (cr, to_xp_arrow (arrow_type), style, box_x, box_y, + box_width, box_height, state)) { } else @@ -1398,9 +1382,7 @@ draw_arrow (GtkStyle *style, if (widget) { - sanitize_size (window, &width, &height); - - dc = get_window_dc (style, window, state, &dc_info, + dc = get_window_dc (style, cr, state, &dc_info, box_x, box_y, box_width, box_height, &rect); DrawFrameControl (dc, &rect, DFC_SCROLL, btn_type | (shadow == @@ -1416,20 +1398,23 @@ draw_arrow (GtkStyle *style, if (name && !strcmp (name, "gtk-toolbar-arrow")) { if (xp_theme_draw - (window, XP_THEME_ELEMENT_REBAR_CHEVRON, style, x, y, - width, height, state, area)) + (cr, XP_THEME_ELEMENT_REBAR_CHEVRON, style, x, y, + width, height, state)) { return; } } /* probably a gtk combo box on a toolbar */ - else if (0 /* widget->parent && GTK_IS_BUTTON - (widget->parent) */ ) + else if (0 /* gtk_widget_get_parent (widget) && GTK_IS_BUTTON + (gtk_widget_get_parent (widget)) */ ) { + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); if (xp_theme_draw - (window, XP_THEME_ELEMENT_COMBOBUTTON, style, x - 3, - widget->allocation.y + 1, width + 5, - widget->allocation.height - 4, state, area)) + (cr, XP_THEME_ELEMENT_COMBOBUTTON, style, x - 3, + allocation.y + 1, width + 5, + allocation.height - 4, state)) { return; } @@ -1440,7 +1425,7 @@ draw_arrow (GtkStyle *style, x += (width - 7) / 2; y += (height - 5) / 2; - draw_varrow (window, &style->fg[state], shadow, area, + draw_varrow (cr, &style->fg[state], shadow, arrow_type, x, y, 7, 5); } else @@ -1448,7 +1433,7 @@ draw_arrow (GtkStyle *style, x += (width - 5) / 2; y += (height - 7) / 2; - draw_harrow (window, &style->fg[state], shadow, area, + draw_harrow (cr, &style->fg[state], shadow, arrow_type, x, y, 5, 7); } } @@ -1496,7 +1481,7 @@ is_toolbar_child (GtkWidget *wid) if (GTK_IS_TOOLBAR (wid) || GTK_IS_HANDLE_BOX (wid)) return TRUE; else - wid = wid->parent; + wid = gtk_widget_get_parent (wid); } return FALSE; @@ -1510,7 +1495,7 @@ is_menu_tool_button_child (GtkWidget *wid) if (GTK_IS_MENU_TOOL_BUTTON (wid)) return TRUE; else - wid = wid->parent; + wid = gtk_widget_get_parent (wid); } return FALSE; } @@ -1570,9 +1555,9 @@ draw_3d_border (HDC hdc, RECT *rc, gboolean sunken) } static gboolean -draw_menu_item (GdkWindow *window, GtkWidget *widget, GtkStyle *style, +draw_menu_item (cairo_t *cr, GtkWidget *widget, GtkStyle *style, gint x, gint y, gint width, gint height, - GtkStateType state_type, GdkRectangle *area) + GtkStateType state_type) { GtkWidget *parent; GtkMenuShell *bar; @@ -1582,8 +1567,8 @@ draw_menu_item (GdkWindow *window, GtkWidget *widget, GtkStyle *style, if (xp_theme_is_active ()) { - return (xp_theme_draw (window, XP_THEME_ELEMENT_MENU_ITEM, style, - x, y, width, height, state_type, area)); + return (xp_theme_draw (cr, XP_THEME_ELEMENT_MENU_ITEM, style, + x, y, width, height, state_type)); } if ((parent = gtk_widget_get_parent (widget)) @@ -1591,11 +1576,11 @@ draw_menu_item (GdkWindow *window, GtkWidget *widget, GtkStyle *style, { bar = GTK_MENU_SHELL (parent); - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (state_type == GTK_STATE_PRELIGHT) { - draw_3d_border (dc, &rect, bar->active); + draw_3d_border (dc, &rect, bar->priv->active); } release_window_dc (&dc_info); @@ -1633,9 +1618,9 @@ get_dither_brush (void) } static gboolean -draw_tool_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, +draw_tool_button (cairo_t *cr, GtkWidget *widget, GtkStyle *style, gint x, gint y, gint width, gint height, - GtkStateType state_type, GdkRectangle *area) + GtkStateType state_type) { HDC dc; RECT rect; @@ -1644,8 +1629,8 @@ draw_tool_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, if (xp_theme_is_active ()) { - return (xp_theme_draw (window, XP_THEME_ELEMENT_TOOLBAR_BUTTON, style, - x, y, width, height, state_type, area)); + return (xp_theme_draw (cr, XP_THEME_ELEMENT_TOOLBAR_BUTTON, style, + x, y, width, height, state_type)); } if (GTK_IS_TOGGLE_BUTTON (widget)) @@ -1662,7 +1647,7 @@ draw_tool_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, return FALSE; } - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (state_type == GTK_STATE_PRELIGHT) { if (is_toggled) @@ -1674,7 +1659,7 @@ draw_tool_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, } else if (state_type == GTK_STATE_ACTIVE) { - if (is_toggled && !is_menu_tool_button_child (widget->parent)) + if (is_toggled && !is_menu_tool_button_child (gtk_widget_get_parent (widget))) { SetTextColor (dc, GetSysColor (COLOR_3DHILIGHT)); SetBkColor (dc, GetSysColor (COLOR_BTNFACE)); @@ -1690,7 +1675,7 @@ draw_tool_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, } static void -draw_push_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, +draw_push_button (cairo_t *cr, GtkWidget *widget, GtkStyle *style, gint x, gint y, gint width, gint height, GtkStateType state_type, gboolean is_default) { @@ -1698,7 +1683,7 @@ draw_push_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, RECT rect; XpDCInfo dc_info; - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (GTK_IS_TOGGLE_BUTTON (widget)) { @@ -1743,10 +1728,9 @@ draw_push_button (GdkWindow *window, GtkWidget *widget, GtkStyle *style, static void draw_box (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -1758,22 +1742,22 @@ draw_box (GtkStyle *style, HDC dc; int cx; - border = (GTK_TOGGLE_BUTTON (widget)->active ? DFCS_PUSHED | DFCS_FLAT : 0); + border = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) ? DFCS_PUSHED | DFCS_FLAT : 0); - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); DrawFrameControl (dc, &rect, DFC_SCROLL, DFCS_SCROLLDOWN | border); release_window_dc (&dc_info); if (xp_theme_is_active () - && xp_theme_draw (window, XP_THEME_ELEMENT_COMBOBUTTON, style, x, y, - width, height, state_type, area)) + && xp_theme_draw (cr, XP_THEME_ELEMENT_COMBOBUTTON, style, x, y, + width, height, state_type)) { cx = GetSystemMetrics(SM_CXVSCROLL); x += width - cx; width = cx; - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width - cx, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width - cx, height, &rect); FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW)); release_window_dc (&dc_info); return; @@ -1783,11 +1767,11 @@ draw_box (GtkStyle *style, if (detail && (!strcmp (detail, "button") || !strcmp (detail, "buttondefault"))) { - if (GTK_IS_TREE_VIEW (widget->parent)) + if (GTK_IS_TREE_VIEW (gtk_widget_get_parent (widget))) { if (xp_theme_draw - (window, XP_THEME_ELEMENT_LIST_HEADER, style, x, y, - width, height, state_type, area)) + (cr, XP_THEME_ELEMENT_LIST_HEADER, style, x, y, + width, height, state_type)) { return; } @@ -1796,7 +1780,7 @@ draw_box (GtkStyle *style, HDC dc; RECT rect; XpDCInfo dc_info; - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); DrawFrameControl (dc, &rect, DFC_BUTTON, DFCS_BUTTONPUSH | (state_type == @@ -1805,12 +1789,12 @@ draw_box (GtkStyle *style, release_window_dc (&dc_info); } } - else if (is_toolbar_child (widget->parent) + else if (is_toolbar_child (gtk_widget_get_parent (widget)) || (!GTK_IS_BUTTON (widget) || (GTK_RELIEF_NONE == gtk_button_get_relief (GTK_BUTTON (widget))))) { - if (draw_tool_button (window, widget, style, x, y, - width, height, state_type, area)) + if (draw_tool_button (cr, widget, style, x, y, + width, height, state_type)) { return; } @@ -1819,15 +1803,15 @@ draw_box (GtkStyle *style, { gboolean is_default = gtk_widget_has_default (widget); if (xp_theme_draw - (window, + (cr, is_default ? XP_THEME_ELEMENT_DEFAULT_BUTTON : XP_THEME_ELEMENT_BUTTON, style, x, y, width, height, - state_type, area)) + state_type)) { return; } - draw_push_button (window, widget, style, + draw_push_button (cr, widget, style, x, y, width, height, state_type, is_default); return; @@ -1845,17 +1829,17 @@ draw_box (GtkStyle *style, else if (detail && (!strcmp (detail, "spinbutton_up") || !strcmp (detail, "spinbutton_down"))) { - if (!xp_theme_draw (window, + if (!xp_theme_draw (cr, (!strcmp (detail, "spinbutton_up")) ? XP_THEME_ELEMENT_SPIN_BUTTON_UP : XP_THEME_ELEMENT_SPIN_BUTTON_DOWN, - style, x, y, width, height, state_type, area)) + style, x, y, width, height, state_type)) { RECT rect; XpDCInfo dc_info; HDC dc; - dc = get_window_dc (style, window, state_type, &dc_info, + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); DrawEdge (dc, &rect, state_type == @@ -1871,11 +1855,11 @@ draw_box (GtkStyle *style, GtkScrollbar *scrollbar = GTK_SCROLLBAR (widget); gboolean is_v = GTK_IS_VSCROLLBAR (widget); - if (xp_theme_draw (window, + if (xp_theme_draw (cr, is_v ? XP_THEME_ELEMENT_SCROLLBAR_V : XP_THEME_ELEMENT_SCROLLBAR_H, - style, x, y, width, height, state_type, area)) + style, x, y, width, height, state_type)) { XpThemeElement gripper = (is_v ? XP_THEME_ELEMENT_SCROLLBAR_GRIPPER_V : @@ -1894,15 +1878,15 @@ draw_box (GtkStyle *style, return; } - xp_theme_draw (window, gripper, style, x, y, - width, height, state_type, area); + xp_theme_draw (cr, gripper, style, x, y, + width, height, state_type); return; } else { - if (gtk_range_get_adjustment(&scrollbar->range)->page_size >= - (gtk_range_get_adjustment(&scrollbar->range)->upper - - gtk_range_get_adjustment(&scrollbar->range)->lower)) + if (gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)) >= + (gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)) - + gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)))) { return; } @@ -1917,8 +1901,8 @@ draw_box (GtkStyle *style, XpThemeElement xp_progress_bar = map_gtk_progress_bar_to_xp (progress_bar, FALSE); - if (xp_theme_draw (window, xp_progress_bar, style, x, y, - width, height, state_type, area)) + if (xp_theme_draw (cr, xp_progress_bar, style, x, y, + width, height, state_type)) { return; } @@ -1929,8 +1913,8 @@ draw_box (GtkStyle *style, else if (detail && strcmp (detail, "menuitem") == 0) { shadow_type = GTK_SHADOW_NONE; - if (draw_menu_item (window, widget, style, - x, y, width, height, state_type, area)) + if (draw_menu_item (cr, widget, style, + x, y, width, height, state_type)) { return; } @@ -1943,8 +1927,8 @@ draw_box (GtkStyle *style, XpThemeElement xp_progress_bar = map_gtk_progress_bar_to_xp (progress_bar, TRUE); if (xp_theme_draw - (window, xp_progress_bar, style, x, y, width, height, - state_type, area)) + (cr, xp_progress_bar, style, x, y, width, height, + state_type)) { return; } @@ -1957,11 +1941,11 @@ draw_box (GtkStyle *style, { gboolean is_vertical = GTK_IS_VSCROLLBAR (widget); - if (xp_theme_draw (window, + if (xp_theme_draw (cr, is_vertical ? XP_THEME_ELEMENT_TROUGH_V : XP_THEME_ELEMENT_TROUGH_H, - style, x, y, width, height, state_type, area)) + style, x, y, width, height, state_type)) { return; } @@ -1971,8 +1955,7 @@ draw_box (GtkStyle *style, RECT rect; XpDCInfo dc_info; - sanitize_size (window, &width, &height); - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); SetTextColor (dc, GetSysColor (COLOR_3DHILIGHT)); SetBkColor (dc, GetSysColor (COLOR_BTNFACE)); @@ -1989,39 +1972,39 @@ draw_box (GtkStyle *style, if (!xp_theme_is_active ()) { - parent_class->draw_box (style, window, state_type, - GTK_SHADOW_NONE, area, + parent_class->draw_box (style, cr, state_type, + GTK_SHADOW_NONE, widget, detail, x, y, width, height); } if (is_vertical) { if (xp_theme_draw - (window, XP_THEME_ELEMENT_SCALE_TROUGH_V, + (cr, XP_THEME_ELEMENT_SCALE_TROUGH_V, style, (2 * x + width) / 2, y, 2, height, - state_type, area)) + state_type)) { return; } - parent_class->draw_box (style, window, state_type, + parent_class->draw_box (style, cr, state_type, GTK_SHADOW_ETCHED_IN, - area, NULL, NULL, + NULL, NULL, (2 * x + width) / 2, y, 1, height); } else { if (xp_theme_draw - (window, XP_THEME_ELEMENT_SCALE_TROUGH_H, + (cr, XP_THEME_ELEMENT_SCALE_TROUGH_H, style, x, (2 * y + height) / 2, width, 2, - state_type, area)) + state_type)) { return; } - parent_class->draw_box (style, window, state_type, + parent_class->draw_box (style, cr, state_type, GTK_SHADOW_ETCHED_IN, - area, NULL, NULL, x, + NULL, NULL, x, (2 * y + height) / 2, width, 1); } @@ -2030,8 +2013,8 @@ draw_box (GtkStyle *style, } else if (detail && strcmp (detail, "optionmenu") == 0) { - if (xp_theme_draw (window, XP_THEME_ELEMENT_EDIT_TEXT, - style, x, y, width, height, state_type, area)) + if (xp_theme_draw (cr, XP_THEME_ELEMENT_EDIT_TEXT, + style, x, y, width, height, state_type)) { return; } @@ -2047,9 +2030,8 @@ draw_box (GtkStyle *style, || strcmp (detail, "toolbar") == 0 || strcmp (detail, "menubar") == 0)) { - sanitize_size (window, &width, &height); - if (xp_theme_draw (window, XP_THEME_ELEMENT_REBAR, - style, x, y, width, height, state_type, area)) + if (xp_theme_draw (cr, XP_THEME_ELEMENT_REBAR, + style, x, y, width, height, state_type)) { return; } @@ -2063,8 +2045,8 @@ draw_box (GtkStyle *style, } else if (detail && !strcmp (detail, "notebook") && GTK_IS_NOTEBOOK (widget)) { - if (xp_theme_draw (window, XP_THEME_ELEMENT_TAB_PANE, style, - x, y, width, height, state_type, area)) + if (xp_theme_draw (cr, XP_THEME_ELEMENT_TAB_PANE, style, + x, y, width, height, state_type)) { return; } @@ -2077,8 +2059,8 @@ draw_box (GtkStyle *style, if (name && !strcmp (name, "gtk-tooltips")) { if (xp_theme_draw - (window, XP_THEME_ELEMENT_TOOLTIP, style, x, y, width, - height, state_type, area)) + (cr, XP_THEME_ELEMENT_TOOLTIP, style, x, y, width, + height, state_type)) { return; } @@ -2089,7 +2071,7 @@ draw_box (GtkStyle *style, XpDCInfo dc_info; HDC hdc; - hdc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + hdc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); brush = GetSysColorBrush (COLOR_3DDKSHADOW); @@ -2108,7 +2090,7 @@ draw_box (GtkStyle *style, } } - parent_class->draw_box (style, window, state_type, shadow_type, area, + parent_class->draw_box (style, cr, state_type, shadow_type, widget, detail, x, y, width, height); if (detail && strcmp (detail, "optionmenu") == 0) @@ -2119,8 +2101,6 @@ draw_box (GtkStyle *style, option_menu_get_props (widget, &indicator_size, &indicator_spacing); - sanitize_size (window, &width, &height); - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) { vline_x = @@ -2133,7 +2113,7 @@ draw_box (GtkStyle *style, indicator_spacing.left + indicator_spacing.right) - style->xthickness; - parent_class->draw_vline (style, window, state_type, area, widget, + parent_class->draw_vline (style, cr, state_type, widget, detail, y + style->ythickness + 1, y + height - style->ythickness - 3, vline_x); @@ -2143,10 +2123,9 @@ draw_box (GtkStyle *style, static void draw_tab (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state, GtkShadowType shadow, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -2156,14 +2135,17 @@ draw_tab (GtkStyle *style, gint arrow_height; g_return_if_fail (style != NULL); - g_return_if_fail (window != NULL); + g_return_if_fail (cr != NULL); if (detail && !strcmp (detail, "optionmenutab")) { - if (xp_theme_draw (window, XP_THEME_ELEMENT_COMBOBUTTON, - style, x - 5, widget->allocation.y + 1, - width + 10, widget->allocation.height - 2, - state, area)) + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); + if (xp_theme_draw (cr, XP_THEME_ELEMENT_COMBOBUTTON, + style, x - 5, allocation.y + 1, + width + 10, allocation.height - 2, + state)) { return; } @@ -2176,7 +2158,7 @@ draw_tab (GtkStyle *style, y += (height - arrow_height) / 2; - draw_varrow (window, &style->black, shadow, area, GTK_ARROW_DOWN, + draw_varrow (cr, &style->black, shadow, GTK_ARROW_DOWN, x, y, indicator_size.width, arrow_height); } @@ -2294,19 +2276,23 @@ DrawTab (HDC hdc, const RECT R, gint32 aPosition, gboolean aSelected, static gboolean draw_themed_tab_button (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkNotebook *notebook, gint x, gint y, gint width, gint height, gint gap_side) { +/* FIXME: poop GdkPixmap *pixmap = NULL; + */ gint border_width = gtk_container_get_border_width (GTK_CONTAINER (notebook)); GtkWidget *widget = GTK_WIDGET (notebook); - GdkRectangle draw_rect, clip_rect; + GdkRectangle draw_rect; GdkPixbufRotation rotation = GDK_PIXBUF_ROTATE_NONE; - cairo_t *cr; + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); if (gap_side == GTK_POS_TOP) { @@ -2319,8 +2305,9 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.width = width + 2; draw_rect.height = height; - clip_rect = draw_rect; +/* FIXME: wtf? clip_rect.height--; + */ } else { @@ -2328,15 +2315,14 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.y = y; draw_rect.width = width - 2; draw_rect.height = height - 2; - clip_rect = draw_rect; } /* If we are currently drawing the right-most tab, and if that tab is the selected tab... */ - widget_right = widget->allocation.x + widget->allocation.width - border_width - 2; + widget_right = allocation.x + allocation.width - border_width - 2; if (draw_rect.x + draw_rect.width >= widget_right) { - draw_rect.width = clip_rect.width = widget_right - draw_rect.x; + draw_rect.width = widget_right - draw_rect.x; } } if (gap_side == GTK_POS_BOTTOM) @@ -2349,8 +2335,6 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.y = y; draw_rect.width = width + 2; draw_rect.height = height; - - clip_rect = draw_rect; } else { @@ -2358,15 +2342,14 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.y = y + 2; draw_rect.width = width - 2; draw_rect.height = height - 2; - clip_rect = draw_rect; } /* If we are currently drawing the right-most tab, and if that tab is the selected tab... */ - widget_right = widget->allocation.x + widget->allocation.width - border_width - 2; + widget_right = allocation.x + allocation.width - border_width - 2; if (draw_rect.x + draw_rect.width >= widget_right) { - draw_rect.width = clip_rect.width = widget_right - draw_rect.x; + draw_rect.width = widget_right - draw_rect.x; } rotation = GDK_PIXBUF_ROTATE_UPSIDEDOWN; @@ -2382,8 +2365,9 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.width = width; draw_rect.height = height + 2; - clip_rect = draw_rect; +/* FIXME: wtf? clip_rect.width--; + */ } else { @@ -2391,15 +2375,14 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.y = y + 2; draw_rect.width = width - 2; draw_rect.height = height - 2; - clip_rect = draw_rect; } /* If we are currently drawing the bottom-most tab, and if that tab is the selected tab... */ - widget_bottom = widget->allocation.x + widget->allocation.height - border_width - 2; + widget_bottom = allocation.x + allocation.height - border_width - 2; if (draw_rect.y + draw_rect.height >= widget_bottom) { - draw_rect.height = clip_rect.height = widget_bottom - draw_rect.y; + draw_rect.height = widget_bottom - draw_rect.y; } rotation = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE; @@ -2415,8 +2398,9 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.width = width; draw_rect.height = height + 2; - clip_rect = draw_rect; +/* FIXME: wtf? clip_rect.width--; + */ } else { @@ -2424,15 +2408,14 @@ draw_themed_tab_button (GtkStyle *style, draw_rect.y = y + 2; draw_rect.width = width - 2; draw_rect.height = height - 2; - clip_rect = draw_rect; } /* If we are currently drawing the bottom-most tab, and if that tab is the selected tab... */ - widget_bottom = widget->allocation.x + widget->allocation.height - border_width - 2; + widget_bottom = allocation.x + allocation.height - border_width - 2; if (draw_rect.y + draw_rect.height >= widget_bottom) { - draw_rect.height = clip_rect.height = widget_bottom - draw_rect.y; + draw_rect.height = widget_bottom - draw_rect.y; } rotation = GDK_PIXBUF_ROTATE_CLOCKWISE; @@ -2440,25 +2423,28 @@ draw_themed_tab_button (GtkStyle *style, if (gap_side == GTK_POS_TOP) { - if (!xp_theme_draw (window, XP_THEME_ELEMENT_TAB_ITEM, style, + if (!xp_theme_draw (cr, XP_THEME_ELEMENT_TAB_ITEM, style, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height, - state_type, &clip_rect)) + state_type)) { return FALSE; } } else { +/* FIXME: poop */ +#if 0 GdkPixbuf *pixbuf; GdkPixbuf *rotated; if (gap_side == GTK_POS_LEFT || gap_side == GTK_POS_RIGHT) { - pixmap = gdk_pixmap_new (window, clip_rect.height, clip_rect.width, -1); + pixmap = gdk_pixmap_new (cr, draw_rect.height, draw_rect.width, -1); if (!xp_theme_draw (pixmap, XP_THEME_ELEMENT_TAB_ITEM, style, - draw_rect.y - clip_rect.y, draw_rect.x - clip_rect.x, +/* FIXME: wtf? */ + draw_rect.y - draw_rect.y, draw_rect.x - draw_rect.x, draw_rect.height, draw_rect.width, state_type, 0)) { g_object_unref (pixmap); @@ -2466,15 +2452,16 @@ draw_themed_tab_button (GtkStyle *style, } pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL, 0, 0, 0, 0, - clip_rect.height, clip_rect.width); + draw_rect.height, draw_rect.width); g_object_unref (pixmap); } else { - pixmap = gdk_pixmap_new (window, clip_rect.width, clip_rect.height, -1); + pixmap = gdk_pixmap_new (cr, draw_rect.width, draw_rect.height, -1); if (!xp_theme_draw (pixmap, XP_THEME_ELEMENT_TAB_ITEM, style, - draw_rect.x - clip_rect.x, draw_rect.y - clip_rect.y, +/* FIXME: wtf? */ + draw_rect.x - draw_rect.x, draw_rect.y - draw_rect.y, draw_rect.width, draw_rect.height, state_type, 0)) { g_object_unref (pixmap); @@ -2482,7 +2469,7 @@ draw_themed_tab_button (GtkStyle *style, } pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL, 0, 0, 0, 0, - clip_rect.width, clip_rect.height); + draw_rect.width, draw_rect.height); g_object_unref (pixmap); } @@ -2495,7 +2482,7 @@ draw_themed_tab_button (GtkStyle *style, // pixel at the top. There may be a better solution than this if someone // has time to discover it. if (gap_side == GTK_POS_BOTTOM && state_type == GTK_STATE_NORMAL - && x == widget->allocation.x) + && x == allocation.x) { int rowstride = gdk_pixbuf_get_rowstride (pixbuf); int n_channels = gdk_pixbuf_get_n_channels (pixbuf); @@ -2510,11 +2497,10 @@ draw_themed_tab_button (GtkStyle *style, } } - cr = gdk_cairo_create (window); gdk_cairo_set_source_pixbuf (cr, pixbuf, clip_rect.x, clip_rect.y); cairo_paint (cr); - cairo_destroy (cr); g_object_unref (pixbuf); +#endif } return TRUE; @@ -2522,10 +2508,9 @@ draw_themed_tab_button (GtkStyle *style, static gboolean draw_tab_button (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height, gint gap_side) @@ -2537,10 +2522,8 @@ draw_tab_button (GtkStyle *style, XpDCInfo dc_info; HDC dc; gint32 aPosition; - cairo_t *cr; - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); - cr = gdk_cairo_create (window); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (gap_side == GTK_POS_TOP) aPosition = BF_TOP; @@ -2553,20 +2536,17 @@ draw_tab_button (GtkStyle *style, if (state_type == GTK_STATE_PRELIGHT) state_type = GTK_STATE_NORMAL; - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); + +/* FIXME: wtf? gdk_cairo_set_source_color (cr, &style->dark[state_type]); - } + */ DrawTab (dc, rect, aPosition, state_type != GTK_STATE_PRELIGHT, (gap_side != GTK_POS_LEFT), (gap_side != GTK_POS_RIGHT)); - cairo_destroy (cr); - release_window_dc (&dc_info); + return TRUE; } @@ -2575,10 +2555,9 @@ draw_tab_button (GtkStyle *style, static void draw_extension (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, @@ -2588,29 +2567,33 @@ draw_extension (GtkStyle *style, { GtkNotebook *notebook = GTK_NOTEBOOK (widget); - /* Why this differs from gap_side, I have no idea.. */ - int real_gap_side = gtk_notebook_get_tab_pos (notebook); + /* draw_themed_tab_button and draw_tab_button expect to work with tab + * position, instead of simply taking the "side of the gap" (gap_side) + * which simply said is the side of the tab that touches the notebook + * frame and is always the exact opposite of the gap side... */ + int tab_pos = gtk_notebook_get_tab_pos (notebook); - if (!draw_themed_tab_button (style, window, state_type, - GTK_NOTEBOOK (widget), x, y, - width, height, real_gap_side)) + if (!draw_themed_tab_button (style, cr, state_type, + notebook, x, y, + width, height, tab_pos)) { - if (!draw_tab_button (style, window, state_type, - shadow_type, area, widget, - detail, x, y, width, height, real_gap_side)) + if (!draw_tab_button (style, cr, state_type, + shadow_type, widget, + detail, x, y, width, height, tab_pos)) { - parent_class->draw_extension (style, window, state_type, - shadow_type, area, widget, detail, + /* GtkStyle expects the usual gap_side */ + parent_class->draw_extension (style, cr, state_type, + shadow_type, widget, detail, x, y, width, height, - real_gap_side); + gap_side); } } } } static void -draw_box_gap (GtkStyle *style, GdkWindow *window, GtkStateType state_type, - GtkShadowType shadow_type, GdkRectangle *area, +draw_box_gap (GtkStyle *style, cairo_t *cr, GtkStateType state_type, + GtkShadowType shadow_type, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width) @@ -2650,15 +2633,15 @@ draw_box_gap (GtkStyle *style, GdkWindow *window, GtkStateType state_type, h2 = height; } - if (xp_theme_draw (window, XP_THEME_ELEMENT_TAB_PANE, style, - x2, y2, w2, h2, state_type, area)) + if (xp_theme_draw (cr, XP_THEME_ELEMENT_TAB_PANE, style, + x2, y2, w2, h2, state_type)) { return; } } - parent_class->draw_box_gap (style, window, state_type, shadow_type, - area, widget, detail, x, y, width, height, + parent_class->draw_box_gap (style, cr, state_type, shadow_type, + widget, detail, x, y, width, height, gap_side, gap_x, gap_width); } @@ -2684,9 +2667,9 @@ is_popup_window_child (GtkWidget *widget) } static void -draw_flat_box (GtkStyle *style, GdkWindow *window, +draw_flat_box (GtkStyle *style, cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, + GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { if (detail) @@ -2695,12 +2678,9 @@ draw_flat_box (GtkStyle *style, GdkWindow *window, (!strncmp ("cell_even", detail, 9) || !strncmp ("cell_odd", detail, 8))) { GdkColor *gc = gtk_widget_has_focus (widget) ? &style->base[state_type] : &style->base[GTK_STATE_ACTIVE]; - cairo_t *cr = gdk_cairo_create (window); _cairo_draw_rectangle (cr, gc, TRUE, x, y, width, height); - cairo_destroy (cr); - return; } else if (!strcmp (detail, "checkbutton")) @@ -2712,19 +2692,19 @@ draw_flat_box (GtkStyle *style, GdkWindow *window, } } - parent_class->draw_flat_box (style, window, state_type, shadow_type, - area, widget, detail, x, y, width, height); + parent_class->draw_flat_box (style, cr, state_type, shadow_type, + widget, detail, x, y, width, height); } static gboolean -draw_menu_border (GdkWindow *win, GtkStyle *style, +draw_menu_border (cairo_t *cr, GtkStyle *style, gint x, gint y, gint width, gint height) { RECT rect; XpDCInfo dc_info; HDC dc; - dc = get_window_dc (style, win, GTK_STATE_NORMAL, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, GTK_STATE_NORMAL, &dc_info, x, y, width, height, &rect); if (!dc) return FALSE; @@ -2745,10 +2725,9 @@ draw_menu_border (GdkWindow *win, GtkStyle *style, static void draw_shadow (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -2764,7 +2743,7 @@ draw_shadow (GtkStyle *style, - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (is_combo_box_child (widget)) { FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW)); @@ -2811,14 +2790,14 @@ draw_shadow (GtkStyle *style, if (shadow_type != GTK_SHADOW_IN) return; - if (!xp_theme_draw (window, XP_THEME_ELEMENT_EDIT_TEXT, style, - x, y, width, height, state_type, area)) + if (!xp_theme_draw (cr, XP_THEME_ELEMENT_EDIT_TEXT, style, + x, y, width, height, state_type)) { HDC dc; RECT rect; XpDCInfo dc_info; - dc = get_window_dc (style, window, state_type, &dc_info, + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); DrawEdge (dc, &rect, EDGE_SUNKEN, BF_RECT); @@ -2829,8 +2808,8 @@ draw_shadow (GtkStyle *style, } if (detail && !strcmp (detail, "scrolled_window") && - xp_theme_draw (window, XP_THEME_ELEMENT_EDIT_TEXT, style, - x, y, width, height, state_type, area)) + xp_theme_draw (cr, XP_THEME_ELEMENT_EDIT_TEXT, style, + x, y, width, height, state_type)) { return; } @@ -2840,7 +2819,7 @@ draw_shadow (GtkStyle *style, if (detail && !strcmp (detail, "menu")) { - if (draw_menu_border (window, style, x, y, width, height)) + if (draw_menu_border (cr, style, x, y, width, height)) { return; } @@ -2869,8 +2848,6 @@ draw_shadow (GtkStyle *style, HGDIOBJ old_pen = NULL; GtkPositionType pos; - sanitize_size (window, &width, &height); - if (is_handlebox) { pos = gtk_handle_box_get_handle_position (GTK_HANDLE_BOX (widget)); @@ -2918,7 +2895,7 @@ draw_shadow (GtkStyle *style, } } - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (pos != GTK_POS_LEFT) { @@ -2957,22 +2934,17 @@ draw_shadow (GtkStyle *style, return; } - parent_class->draw_shadow (style, window, state_type, shadow_type, area, + parent_class->draw_shadow (style, cr, state_type, shadow_type, widget, detail, x, y, width, height); } static void draw_hline (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x1, gint x2, gint y) { - cairo_t *cr; - - cr = gdk_cairo_create (window); - if (xp_theme_is_active () && detail && !strcmp (detail, "menuitem")) { gint cx, cy; @@ -2984,24 +2956,18 @@ draw_hline (GtkStyle *style, &cx, &cy); /* Center the separator */ - y_offset = (area->height / 2) - (cy / 2); - new_y = y_offset >= 0 ? area->y + y_offset : area->y; + y_offset = (cy / 2) - 1; + new_y = (y - y_offset) >= 0 ? y - y_offset : y; new_height = cy; if (xp_theme_draw - (window, XP_THEME_ELEMENT_MENU_SEPARATOR, style, x1, new_y, x2, new_height, - state_type, area)) + (cr, XP_THEME_ELEMENT_MENU_SEPARATOR, style, x1, new_y, x2, new_height, + state_type)) { return; } else { - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); - } - _cairo_draw_line (cr, &style->dark[state_type], x1, y, x2, y); } @@ -3010,12 +2976,6 @@ draw_hline (GtkStyle *style, { if (style->ythickness == 2) { - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); - } - _cairo_draw_line (cr, &style->dark[state_type], x1, y, x2, y); ++y; _cairo_draw_line (cr, &style->light[state_type], x1, y, x2, y); @@ -3023,33 +2983,21 @@ draw_hline (GtkStyle *style, } else { - parent_class->draw_hline (style, window, state_type, area, widget, + parent_class->draw_hline (style, cr, state_type, widget, detail, x1, x2, y); } } - cairo_destroy (cr); } static void draw_vline (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint y1, gint y2, gint x) { - cairo_t *cr; - - cr = gdk_cairo_create (window); - if (style->xthickness == 2) { - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); - } - _cairo_draw_line (cr, &style->dark[state_type], x, y1, x, y2); ++x; _cairo_draw_line (cr, &style->light[state_type], x, y1, x, y2); @@ -3057,91 +3005,77 @@ draw_vline (GtkStyle *style, } else { - parent_class->draw_vline (style, window, state_type, area, widget, + parent_class->draw_vline (style, cr, state_type, widget, detail, y1, y2, x); } - - cairo_destroy (cr); } static void draw_slider (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height, GtkOrientation orientation) { if (GTK_IS_SCALE (widget) && - xp_theme_draw (window, ((orientation == GTK_ORIENTATION_VERTICAL) ? + xp_theme_draw (cr, ((orientation == GTK_ORIENTATION_VERTICAL) ? XP_THEME_ELEMENT_SCALE_SLIDER_V : XP_THEME_ELEMENT_SCALE_SLIDER_H), style, x, y, width, - height, state_type, area)) + height, state_type)) { return; } - parent_class->draw_slider (style, window, state_type, shadow_type, area, + parent_class->draw_slider (style, cr, state_type, shadow_type, widget, detail, x, y, width, height, orientation); } static void draw_resize_grip (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, GdkWindowEdge edge, gint x, gint y, gint width, gint height) { - cairo_t *cr; - - cr = gdk_cairo_create (window); - if (detail && !strcmp (detail, "statusbar")) { if (xp_theme_draw - (window, XP_THEME_ELEMENT_STATUS_GRIPPER, style, x, y, width, - height, state_type, area)) + (cr, XP_THEME_ELEMENT_STATUS_GRIPPER, style, x, y, width, + height, state_type)) { - cairo_destroy (cr); return; } else { RECT rect; XpDCInfo dc_info; - HDC dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + HDC dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); - if (area) - { - gdk_cairo_rectangle (cr, area); - cairo_clip (cr); +/* FIXME: wtf? gdk_cairo_set_source_color (cr, &style->dark[state_type]); - } + */ DrawFrameControl (dc, &rect, DFC_SCROLL, DFCS_SCROLLSIZEGRIP); release_window_dc (&dc_info); - cairo_destroy (cr); return; } } - parent_class->draw_resize_grip (style, window, state_type, area, + parent_class->draw_resize_grip (style, cr, state_type, widget, detail, edge, x, y, width, height); } static void draw_handle (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, GtkShadowType shadow_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, @@ -3150,16 +3084,11 @@ draw_handle (GtkStyle *style, HDC dc; RECT rect; XpDCInfo dc_info; - cairo_t *cr; - - cr = gdk_cairo_create (window); if (is_toolbar_child (widget)) { XpThemeElement hndl; - sanitize_size (window, &width, &height); - if (GTK_IS_HANDLE_BOX (widget)) { GtkPositionType pos; @@ -3180,13 +3109,13 @@ draw_handle (GtkStyle *style, else hndl = XP_THEME_ELEMENT_REBAR_GRIPPER_H; - if (xp_theme_draw (window, hndl, style, x, y, width, height, - state_type, area)) + if (xp_theme_draw (cr, hndl, style, x, y, width, height, + state_type)) { return; } - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); if (orientation == GTK_ORIENTATION_VERTICAL) { @@ -3214,9 +3143,7 @@ draw_handle (GtkStyle *style, GdkColor *light, *dark, *shadow; GdkRectangle dest; - sanitize_size (window, &width, &height); - - gtk_paint_box (style, window, state_type, shadow_type, area, + gtk_paint_box (style, cr, state_type, shadow_type, widget, detail, x, y, width, height); light = &style->light[state_type]; @@ -3236,9 +3163,6 @@ draw_handle (GtkStyle *style, else dest.y += 2; - gdk_cairo_rectangle (cr, &dest); - cairo_clip (cr); - if (dest.width < dest.height) { _cairo_draw_line (cr, light, dest.x, dest.y, dest.x, @@ -3259,16 +3183,13 @@ draw_handle (GtkStyle *style, dest.y + dest.height, dest.x + dest.width, dest.y + dest.height); } - - cairo_destroy (cr); } } static void draw_focus (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -3286,26 +3207,25 @@ draw_focus (GtkStyle *style, { return; } - if (GTK_IS_TREE_VIEW (widget->parent) /* list view bheader */) + if (GTK_IS_TREE_VIEW (gtk_widget_get_parent (widget)) /* list view bheader */) { return; } - dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect); + dc = get_window_dc (style, cr, state_type, &dc_info, x, y, width, height, &rect); DrawFocusRect (dc, &rect); release_window_dc (&dc_info); /* - parent_class->draw_focus (style, window, state_type, - area, widget, detail, x, y, width, height); + parent_class->draw_focus (style, cr, state_type, + widget, detail, x, y, width, height); */ } static void draw_layout (GtkStyle *style, - GdkWindow *window, + cairo_t *cr, GtkStateType state_type, gboolean use_text, - GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint old_x, gint old_y, PangoLayout *layout) @@ -3320,12 +3240,12 @@ draw_layout (GtkStyle *style, */ if (xp_theme_is_active () && detail && !strcmp (detail, "label")) { - if (widget->parent != NULL) + if (gtk_widget_get_parent (widget) != NULL) { - if (GTK_IS_NOTEBOOK (widget->parent)) + if (GTK_IS_NOTEBOOK (gtk_widget_get_parent (widget))) { int side; - notebook = GTK_NOTEBOOK (widget->parent); + notebook = GTK_NOTEBOOK (gtk_widget_get_parent (widget)); side = gtk_notebook_get_tab_pos (notebook); if (side == GTK_POS_TOP || side == GTK_POS_BOTTOM) @@ -3336,8 +3256,8 @@ draw_layout (GtkStyle *style, } } - parent_class->draw_layout (style, window, state_type, - use_text, area, widget, detail, x, y, layout); + parent_class->draw_layout (style, cr, state_type, + use_text, widget, detail, x, y, layout); } static void