#define GTK_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STYLE))
#define GTK_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STYLE, GtkStyleClass))
+#define GTK_TYPE_BORDER (gtk_border_get_type ())
+
/* Some forward declarations needed to rationalize the header
* files.
*/
+typedef struct _GtkBorder GtkBorder;
typedef struct _GtkStyle GtkStyle;
typedef struct _GtkStyleClass GtkStyleClass;
typedef struct _GtkThemeEngine GtkThemeEngine;
typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkRcProperty GtkRcProperty;
+typedef struct _GtkSettings GtkSettings;
typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
const GString *rc_string,
GValue *property_value);
/* We make this forward declaration here, since we pass
- * GtkWidgt's to the draw functions.
+ * GtkWidget'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
- */
-#define GTK_STYLE_NUM_STYLECOLORS() (7 * 5)
-
#define GTK_STYLE_ATTACHED(style) (GTK_STYLE (style)->attach_count > 0)
struct _GtkStyle
GdkColor mid[5];
GdkColor text[5];
GdkColor base[5];
+ GdkColor text_aa[5]; /* Halfway between text/base */
GdkColor black;
GdkColor white;
- GdkFont *font;
PangoFontDescription *font_desc;
gint xthickness;
GdkGC *mid_gc[5];
GdkGC *text_gc[5];
GdkGC *base_gc[5];
+ GdkGC *text_aa_gc[5];
GdkGC *black_gc;
GdkGC *white_gc;
gint depth;
GdkColormap *colormap;
+ GdkFont *private_font;
+ PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
/* the RcStyle from which this style was created */
GtkRcStyle *rc_style;
GSList *styles; /* of type GtkStyle* */
- GBSearchArray *property_cache;
+ GArray *property_cache;
GSList *icon_factories; /* of type GtkIconFactory* */
};
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
- gint y1,
- gint y2,
+ gint y1_,
+ gint y2_,
gint x);
void (*draw_shadow) (GtkStyle *style,
GdkWindow *window,
GtkPositionType gap_side);
void (*draw_focus) (GtkStyle *style,
GdkWindow *window,
+ GtkStateType state_type,
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
const gchar *detail,
gint x,
gint y,
- gboolean is_open);
+ GtkExpanderStyle expander_style);
void (*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);
-
+ void (*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);
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
+ void (*_gtk_reserved5) (void);
+ void (*_gtk_reserved6) (void);
+ void (*_gtk_reserved7) (void);
+ void (*_gtk_reserved8) (void);
+ void (*_gtk_reserved9) (void);
+ void (*_gtk_reserved10) (void);
+ void (*_gtk_reserved11) (void);
+ void (*_gtk_reserved12) (void);
+};
+
+struct _GtkBorder
+{
+ gint left;
+ gint right;
+ gint top;
+ gint bottom;
};
GType gtk_style_get_type (void) G_GNUC_CONST;
GtkStyle* gtk_style_new (void);
-GtkStyle* gtk_style_copy (GtkStyle *style);
-GtkStyle* gtk_style_attach (GtkStyle *style,
- GdkWindow *window);
+GtkStyle* gtk_style_copy (GtkStyle *style);
+GtkStyle* gtk_style_attach (GtkStyle *style,
+ GdkWindow *window);
void gtk_style_detach (GtkStyle *style);
+
+#ifndef GTK_DISABLE_DEPRECATED
GtkStyle* gtk_style_ref (GtkStyle *style);
void gtk_style_unref (GtkStyle *style);
+
+GdkFont * gtk_style_get_font (GtkStyle *style);
+void gtk_style_set_font (GtkStyle *style,
+ GdkFont *font);
+#endif /* GTK_DISABLE_DEPRECATED */
+
void gtk_style_set_background (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type);
GtkIconSize size,
GtkWidget *widget,
const gchar *detail);
+#ifndef GTK_DISABLE_DEPRECATED
void gtk_draw_hline (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
void gtk_draw_vline (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
- gint y1,
- gint y2,
+ gint y1_,
+ gint y2_,
gint x);
void gtk_draw_shadow (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
gint x,
gint y,
- gboolean is_open);
+ GtkExpanderStyle expander_style);
void gtk_draw_layout (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
+ gboolean use_text,
gint x,
gint y,
PangoLayout *layout);
+void gtk_draw_resize_grip (GtkStyle *style,
+ GdkWindow *window,
+ GtkStateType state_type,
+ GdkWindowEdge edge,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+#endif /* GTK_DISABLE_DEPRECATED */
void gtk_paint_hline (GtkStyle *style,
GdkWindow *window,
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
- gint y1,
- gint y2,
+ gint y1_,
+ gint y2_,
gint x);
void gtk_paint_shadow (GtkStyle *style,
GdkWindow *window,
GtkPositionType gap_side);
void gtk_paint_focus (GtkStyle *style,
GdkWindow *window,
+ GtkStateType state_type,
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
const gchar *detail,
gint x,
gint y,
- gboolean is_open);
+ GtkExpanderStyle expander_style);
void gtk_paint_layout (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
+ gboolean use_text,
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
gint y,
PangoLayout *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);
+
+
+GType gtk_border_get_type (void);
+GtkBorder *gtk_border_copy (const GtkBorder *border_);
+void gtk_border_free ( GtkBorder *border_);
/* --- private API --- */
const GValue* _gtk_style_peek_property_value (GtkStyle *style,
GParamSpec *pspec,
GtkRcPropertyParser parser);
+void _gtk_style_init_for_settings (GtkStyle *style,
+ GtkSettings *settings);
-/* depprecated */
+/* deprecated */
#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
void gtk_draw_string (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
const gchar *string);
#endif /* GTK_DISABLE_DEPRECATED */
+GdkGC *_gtk_get_insertion_cursor_gc (GtkWidget *widget,
+ gboolean is_primary);
+void _gtk_draw_insertion_cursor (GtkWidget *widget,
+ GdkDrawable *drawable,
+ GdkGC *gc,
+ GdkRectangle *location,
+ GtkTextDirection direction,
+ gboolean draw_arrow);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
projects / ~andy / gtk / blobdiff