Updated

[~andy/gtk] / gtk / gtkstyle.h

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 14fcf3d2c60929f9c097597a085981eefb5c9fe5..cc6ac74aa7b6c06f2f7d00e55a9ee2a992a1a157 100644 (file)
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -43,6 +43,8 @@ extern "C" {
 #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.
  */
@@ -54,20 +56,16 @@ typedef struct _GtkRcStyle     GtkRcStyle;
 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
@@ -186,8 +184,8 @@ struct _GtkStyleClass
                                 GdkRectangle           *area,
                                 GtkWidget              *widget,
                                 const gchar            *detail,
-                                gint                    y1,
-                                gint                    y2,
+                                gint                    y1_,
+                                gint                    y2_,
                                 gint                    x);
   void (*draw_shadow)          (GtkStyle               *style,
                                 GdkWindow              *window,
@@ -340,6 +338,7 @@ struct _GtkStyleClass
                                 GtkPositionType         gap_side);
   void (*draw_focus)           (GtkStyle               *style,
                                 GdkWindow              *window,
+                                 GtkStateType            state_type,
                                 GdkRectangle           *area,
                                 GtkWidget              *widget,
                                 const gchar            *detail,
@@ -402,7 +401,20 @@ struct _GtkStyleClass
                                 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
@@ -451,6 +463,7 @@ GdkPixbuf*  gtk_style_render_icon     (GtkStyle            *style,
                                        GtkIconSize          size,
                                        GtkWidget           *widget,
                                        const gchar         *detail);
+#ifndef GTK_DISABLE_DEPRECATED
 void gtk_draw_hline      (GtkStyle        *style,
                          GdkWindow       *window,
                          GtkStateType     state_type,
@@ -460,8 +473,8 @@ void gtk_draw_hline      (GtkStyle        *style,
 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,
@@ -604,7 +617,6 @@ void gtk_draw_layout     (GtkStyle        *style,
                           gint             x,
                           gint             y,
                           PangoLayout     *layout);
-
 void gtk_draw_resize_grip (GtkStyle       *style,
                            GdkWindow      *window,
                            GtkStateType    state_type,
@@ -613,6 +625,7 @@ void gtk_draw_resize_grip (GtkStyle       *style,
                            gint            y,
                            gint            width,
                            gint            height);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 void gtk_paint_hline      (GtkStyle        *style,
                           GdkWindow       *window,
@@ -629,8 +642,8 @@ void gtk_paint_vline      (GtkStyle        *style,
                           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,
@@ -774,6 +787,7 @@ void gtk_paint_extension  (GtkStyle        *style,
                           GtkPositionType  gap_side);
 void gtk_paint_focus      (GtkStyle        *style,
                           GdkWindow       *window,
+                          GtkStateType     state_type,
                           GdkRectangle    *area,
                           GtkWidget       *widget,
                           const gchar     *detail,
@@ -838,8 +852,9 @@ void gtk_paint_resize_grip (GtkStyle                *style,
                             gint                height);
 
 
-GtkBorder *gtk_border_copy (const GtkBorder *border);
-void       gtk_border_free (GtkBorder       *border);
+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,
@@ -847,8 +862,10 @@ 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,
@@ -868,10 +885,14 @@ void gtk_paint_string     (GtkStyle        *style,
                           const gchar     *string);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-void _gtk_draw_insertion_cursor (GdkDrawable      *drawable,
-                                GdkGC            *gc,
-                                GdkRectangle     *location,
-                                GtkTextDirection  dir);
+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
 }