gtk/gtkbutton.h gtk/gtkcellrenderer.h gtk/gtkimcontext.h gtk/gtkstyle.h

2008-01-25  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkbutton.h
	* gtk/gtkcellrenderer.h
	* gtk/gtkimcontext.h
	* gtk/gtkstyle.h
	* gtk/gtktoolbar.h
	* gtk/gtktooltip.h
	* gtk/gtktreeprivate.h
	* gtk/gtktreeviewcolumn.h
	* gtk/gtkwidget.h: add const to constant structs which are passed
	into GTK+. Also add some forgotten const for const strings.

	* gtk/gtkbutton.c
	* gtk/gtkcellrenderer.c
	* gtk/gtkimcontext.c
	* gtk/gtkstyle.c
	* gtk/gtktoolbar.c
	* gtk/gtktooltip.c
	* gtk/gtktreeview.c
	* gtk/gtktreeviewcolumn.c
	* gtk/gtkwidget.c: changed accordingly.


svn path=/trunk/; revision=19399

1 files changed, 249 insertions, 250 deletions

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 3d5afc1443..0b95f8c0f6 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -446,7 +446,7 @@ void	  gtk_style_apply_default_background (GtkStyle	   *style,
 					      GdkWindow	   *window,
 					      gboolean	    set_bg,
 					      GtkStateType  state_type, 
-					      GdkRectangle *area, 
+					      const GdkRectangle *area,
 					      gint	    x, 
 					      gint	    y, 
 					      gint	    width, 
@@ -630,229 +630,228 @@ void gtk_draw_resize_grip (GtkStyle       *style,
                            gint            height);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-void gtk_paint_hline      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x1,
-			   gint             x2,
-			   gint             y);
-void gtk_paint_vline      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             y1_,
-			   gint             y2_,
-			   gint             x);
-void gtk_paint_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);
-void gtk_paint_polygon    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   GdkPoint        *points,
-			   gint             npoints,
-			   gboolean         fill);
-void gtk_paint_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);
-void gtk_paint_diamond    (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);
-void gtk_paint_box        (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);
-void gtk_paint_flat_box   (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);
-void gtk_paint_check      (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);
-void gtk_paint_option     (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);
-void gtk_paint_tab        (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);
-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,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_slider     (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,
-			   GtkOrientation   orientation);
-void gtk_paint_handle     (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,
-			   GtkOrientation   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);
-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);
-
-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);
+void gtk_paint_hline       (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x1,
+			    gint                x2,
+			    gint                y);
+void gtk_paint_vline       (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                y1_,
+			    gint                y2_,
+			    gint                x);
+void gtk_paint_shadow      (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_polygon     (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    const GdkPoint     *points,
+			    gint                n_points,
+			    gboolean            fill);
+void gtk_paint_arrow       (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    GtkArrowType        arrow_type,
+			    gboolean            fill,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_diamond     (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_box         (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_flat_box    (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_check       (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_option      (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_tab         (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_shadow_gap  (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const 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,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const 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,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height,
+			    GtkPositionType     gap_side);
+void gtk_paint_focus       (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height);
+void gtk_paint_slider      (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height,
+			    GtkOrientation      orientation);
+void gtk_paint_handle      (GtkStyle           *style,
+			    GdkWindow          *window,
+			    GtkStateType        state_type,
+			    GtkShadowType       shadow_type,
+			    const GdkRectangle *area,
+			    GtkWidget          *widget,
+			    const gchar        *detail,
+			    gint                x,
+			    gint                y,
+			    gint                width,
+			    gint                height,
+			    GtkOrientation      orientation);
+void gtk_paint_expander    (GtkStyle           *style,
+                            GdkWindow          *window,
+                            GtkStateType        state_type,
+                            const GdkRectangle *area,
+                            GtkWidget          *widget,
+                            const gchar        *detail,
+                            gint                x,
+                            gint                y,
+			    GtkExpanderStyle    expander_style);
+void gtk_paint_layout      (GtkStyle           *style,
+                            GdkWindow          *window,
+                            GtkStateType        state_type,
+			    gboolean            use_text,
+                            const GdkRectangle *area,
+                            GtkWidget          *widget,
+                            const gchar        *detail,
+                            gint                x,
+                            gint                y,
+                            PangoLayout        *layout);
+void gtk_paint_resize_grip (GtkStyle           *style,
+                            GdkWindow          *window,
+                            GtkStateType        state_type,
+                            const GdkRectangle *area,
+                            GtkWidget          *widget,
+                            const gchar        *detail,
+                            GdkWindowEdge       edge,
+                            gint                x,
+                            gint                y,
+                            gint                width,
+                            gint                height);
 
 
 GType      gtk_border_get_type (void) G_GNUC_CONST;
@@ -869,40 +868,40 @@ const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
 void          _gtk_style_init_for_settings   (GtkStyle           *style,
                                               GtkSettings        *settings);
 
-void          _gtk_style_shade               (GdkColor           *a,
+void          _gtk_style_shade               (const GdkColor     *a,
                                               GdkColor           *b,
                                               gdouble             k);
 
 /* 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,
-			  gint             x,
-			  gint             y,
-			  const gchar     *string);
-void gtk_paint_string     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   const gchar     *string);
+void gtk_draw_string      (GtkStyle           *style,
+			   GdkWindow          *window,
+                           GtkStateType        state_type,
+                           gint                x,
+                           gint                y,
+                           const gchar        *string);
+void gtk_paint_string     (GtkStyle           *style,
+			   GdkWindow          *window,
+			   GtkStateType        state_type,
+			   const GdkRectangle *area,
+			   GtkWidget          *widget,
+			   const gchar        *detail,
+			   gint                x,
+			   gint                y,
+			   const gchar        *string);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-void   gtk_draw_insertion_cursor (GtkWidget        *widget,
-				  GdkDrawable      *drawable,
-				  GdkRectangle     *area,
-				  GdkRectangle     *location,
-				  gboolean          is_primary,
-				  GtkTextDirection  direction,
-				  gboolean          draw_arrow);
-GdkGC *_gtk_widget_get_cursor_gc    (GtkWidget *widget);
-void   _gtk_widget_get_cursor_color (GtkWidget *widget,
-				     GdkColor  *color);
+void   gtk_draw_insertion_cursor    (GtkWidget          *widget,
+                                     GdkDrawable        *drawable,
+                                     const GdkRectangle *area,
+                                     const GdkRectangle *location,
+                                     gboolean            is_primary,
+                                     GtkTextDirection    direction,
+                                     gboolean            draw_arrow);
+GdkGC *_gtk_widget_get_cursor_gc    (GtkWidget          *widget);
+void   _gtk_widget_get_cursor_color (GtkWidget          *widget,
+				     GdkColor           *color);
 
 G_END_DECLS