diff options
Diffstat (limited to 'gtk/gtkstyle.h')
-rw-r--r-- | gtk/gtkstyle.h | 271 |
1 files changed, 122 insertions, 149 deletions
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 296017f24b..556722475c 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -35,12 +35,12 @@ typedef struct _GtkStyleClass GtkStyleClass; */ typedef struct _GtkThemeEngine GtkThemeEngine; -typedef struct _GtkRcStyle GtkRcStyle; +typedef struct _GtkRcStyle GtkRcStyle; -#ifndef __TYPEDEFED_GTK_WIDGET__ -typedef struct _GtkWidget GtkWidget; -#define __TYPEDEFED_GTK_WIDGET__ -#endif +/* We make this forward declaration here, since we pass + * GtkWidgt's to the draw functions. + */ +typedef struct _GtkWidget GtkWidget; /* This is used for having dynamic style changing stuff */ /* fg, bg, light, dark, mid, text, base */ @@ -134,7 +134,7 @@ struct _GtkStyleClass gchar *detail, GdkPoint *point, gint npoints, - gint fill); + gboolean fill); void (*draw_arrow) (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -143,7 +143,7 @@ struct _GtkStyleClass GtkWidget *widget, gchar *detail, GtkArrowType arrow_type, - gint fill, + gboolean fill, gint x, gint y, gint width, @@ -257,46 +257,46 @@ struct _GtkStyleClass gint y, gint width, gint height); - void (*draw_shadow_gap) (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height, - gint gap_side, - gint gap_x, - gint gap_width); - void (*draw_box_gap) (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height, - gint gap_side, - gint gap_x, - gint gap_width); - void (*draw_extension) (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height, - gint gap_side); + void (*draw_shadow_gap) (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + GdkRectangle *area, + GtkWidget *widget, + gchar *detail, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width); + void (*draw_box_gap) (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + GdkRectangle *area, + GtkWidget *widget, + gchar *detail, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width); + void (*draw_extension) (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + GdkRectangle *area, + GtkWidget *widget, + gchar *detail, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side); void (*draw_focus) (GtkStyle *style, GdkWindow *window, GdkRectangle *area, @@ -318,16 +318,6 @@ struct _GtkStyleClass gint width, gint height, GtkOrientation orientation); - void (*draw_entry) (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height); void (*draw_handle) (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -387,13 +377,13 @@ void gtk_draw_polygon (GtkStyle *style, GtkShadowType shadow_type, GdkPoint *points, gint npoints, - gint fill); + gboolean fill); void gtk_draw_arrow (GtkStyle *style, GdkWindow *window, GtkStateType state_type, GtkShadowType shadow_type, GtkArrowType arrow_type, - gint fill, + gboolean fill, gint x, gint y, gint width, @@ -477,37 +467,37 @@ void gtk_draw_tab (GtkStyle *style, gint y, gint width, gint height); -void gtk_draw_shadow_gap (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - gint x, - gint y, - gint width, - gint height, - gint gap_side, - gint gap_x, - gint gap_width); -void gtk_draw_box_gap (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - gint x, - gint y, - gint width, - gint height, - gint gap_side, - gint gap_x, - gint gap_width); -void gtk_draw_extension (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - gint x, - gint y, - gint width, - gint height, - gint gap_side); +void gtk_draw_shadow_gap (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width); +void gtk_draw_box_gap (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width); +void gtk_draw_extension (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side); void gtk_draw_focus (GtkStyle *style, GdkWindow *window, gint x, @@ -523,13 +513,6 @@ void gtk_draw_slider (GtkStyle *style, gint width, gint height, GtkOrientation orientation); -void gtk_draw_entry (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - gint x, - gint y, - gint width, - gint height); void gtk_draw_handle (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -598,7 +581,7 @@ void gtk_paint_polygon (GtkStyle *style, gchar *detail, GdkPoint *points, gint npoints, - gint fill); + gboolean fill); void gtk_paint_arrow (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -607,7 +590,7 @@ void gtk_paint_arrow (GtkStyle *style, GtkWidget *widget, gchar *detail, GtkArrowType arrow_type, - gint fill, + gboolean fill, gint x, gint y, gint width, @@ -721,46 +704,46 @@ void gtk_paint_tab (GtkStyle *style, gint y, gint width, gint height); -void gtk_paint_shadow_gap (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height, - gint gap_side, - gint gap_x, - gint gap_width); -void gtk_paint_box_gap (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height, - gint gap_side, - gint gap_x, - gint gap_width); -void gtk_paint_extension (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height, - gint gap_side); +void gtk_paint_shadow_gap (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + GdkRectangle *area, + GtkWidget *widget, + gchar *detail, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width); +void gtk_paint_box_gap (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + GdkRectangle *area, + GtkWidget *widget, + gchar *detail, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width); +void gtk_paint_extension (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + GtkShadowType shadow_type, + GdkRectangle *area, + GtkWidget *widget, + gchar *detail, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side); void gtk_paint_focus (GtkStyle *style, GdkWindow *window, GdkRectangle *area, @@ -782,16 +765,6 @@ void gtk_paint_slider (GtkStyle *style, gint width, gint height, GtkOrientation orientation); -void gtk_paint_entry (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GdkRectangle *area, - GtkWidget *widget, - gchar *detail, - gint x, - gint y, - gint width, - gint height); void gtk_paint_handle (GtkStyle *style, GdkWindow *window, GtkStateType state_type, |