diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | gtk/gtkbutton.c | 12 | ||||
| -rw-r--r-- | gtk/gtkbutton.h | 16 | ||||
| -rw-r--r-- | gtk/gtkcellrenderer.c | 52 | ||||
| -rw-r--r-- | gtk/gtkcellrenderer.h | 16 | ||||
| -rw-r--r-- | gtk/gtkimcontext.c | 6 | ||||
| -rw-r--r-- | gtk/gtkimcontext.h | 50 | ||||
| -rw-r--r-- | gtk/gtkstyle.c | 654 | ||||
| -rw-r--r-- | gtk/gtkstyle.h | 499 | ||||
| -rw-r--r-- | gtk/gtktoolbar.c | 8 | ||||
| -rw-r--r-- | gtk/gtktoolbar.h | 10 | ||||
| -rw-r--r-- | gtk/gtktooltip.c | 4 | ||||
| -rw-r--r-- | gtk/gtktooltip.h | 44 | ||||
| -rw-r--r-- | gtk/gtktreeprivate.h | 50 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 190 | ||||
| -rw-r--r-- | gtk/gtktreeviewcolumn.c | 54 | ||||
| -rw-r--r-- | gtk/gtktreeviewcolumn.h | 2 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 14 | ||||
| -rw-r--r-- | gtk/gtkwidget.h | 6 |
19 files changed, 885 insertions, 825 deletions
@@ -1,3 +1,26 @@ +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. + 2008-01-25 Sven Herzberg <sven@imendio.com> Reviewed by Johan Dahlin. diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 00216899cc..f444addb85 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1217,12 +1217,12 @@ gtk_button_size_allocate (GtkWidget *widget, } void -_gtk_button_paint (GtkButton *button, - GdkRectangle *area, - GtkStateType state_type, - GtkShadowType shadow_type, - const gchar *main_detail, - const gchar *default_detail) +_gtk_button_paint (GtkButton *button, + const GdkRectangle *area, + GtkStateType state_type, + GtkShadowType shadow_type, + const gchar *main_detail, + const gchar *default_detail) { GtkWidget *widget; gint width, height; diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index c9fe63bcff..3d66e01252 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -125,14 +125,14 @@ void gtk_button_set_image_position (GtkButton *button, GtkPositionType position); GtkPositionType gtk_button_get_image_position (GtkButton *button); -void _gtk_button_set_depressed (GtkButton *button, - gboolean depressed); -void _gtk_button_paint (GtkButton *button, - GdkRectangle *area, - GtkStateType state_type, - GtkShadowType shadow_type, - const gchar *main_detail, - const gchar *default_detail); +void _gtk_button_set_depressed (GtkButton *button, + gboolean depressed); +void _gtk_button_paint (GtkButton *button, + const GdkRectangle *area, + GtkStateType state_type, + GtkShadowType shadow_type, + const gchar *main_detail, + const gchar *default_detail); G_END_DECLS diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 71dba709b7..fa719830a8 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -479,13 +479,13 @@ set_cell_bg_color (GtkCellRenderer *cell, * in @x_offset and @y_offset are inclusive of the xpad and ypad properties. **/ void -gtk_cell_renderer_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) +gtk_cell_renderer_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + const GdkRectangle *cell_area, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height) { gint *real_width = width; gint *real_height = height; @@ -506,7 +506,7 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell, GTK_CELL_RENDERER_GET_CLASS (cell)->get_size (cell, widget, - cell_area, + (GdkRectangle *) cell_area, x_offset, y_offset, real_width, @@ -533,13 +533,13 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell, * @window. @expose_area is a clip rectangle. **/ void -gtk_cell_renderer_render (GtkCellRenderer *cell, - GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - GtkCellRendererState flags) +gtk_cell_renderer_render (GtkCellRenderer *cell, + GdkWindow *window, + GtkWidget *widget, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + const GdkRectangle *expose_area, + GtkCellRendererState flags) { gboolean selected = FALSE; GtkCellRendererPrivate *priv = GTK_CELL_RENDERER_GET_PRIVATE (cell); @@ -563,9 +563,9 @@ gtk_cell_renderer_render (GtkCellRenderer *cell, GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, window, widget, - background_area, - cell_area, - expose_area, + (GdkRectangle *) background_area, + (GdkRectangle *) cell_area, + (GdkRectangle *) expose_area, flags); } @@ -591,8 +591,8 @@ gtk_cell_renderer_activate (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags) { g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE); @@ -607,8 +607,8 @@ gtk_cell_renderer_activate (GtkCellRenderer *cell, event, widget, path, - background_area, - cell_area, + (GdkRectangle *) background_area, + (GdkRectangle *) cell_area, flags); } @@ -632,8 +632,8 @@ gtk_cell_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags) { @@ -651,8 +651,8 @@ gtk_cell_renderer_start_editing (GtkCellRenderer *cell, event, widget, path, - background_area, - cell_area, + (GdkRectangle *) background_area, + (GdkRectangle *) cell_area, flags); g_signal_emit (cell, diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h index 375106acf4..d8428623d6 100644 --- a/gtk/gtkcellrenderer.h +++ b/gtk/gtkcellrenderer.h @@ -124,7 +124,7 @@ GType gtk_cell_renderer_get_type (void) G_GNUC_CONST; void gtk_cell_renderer_get_size (GtkCellRenderer *cell, GtkWidget *widget, - GdkRectangle *cell_area, + const GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, @@ -132,23 +132,23 @@ void gtk_cell_renderer_get_size (GtkCellRenderer *cell, void gtk_cell_renderer_render (GtkCellRenderer *cell, GdkWindow *window, GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + const GdkRectangle *expose_area, GtkCellRendererState flags); gboolean gtk_cell_renderer_activate (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags); GtkCellEditable *gtk_cell_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags); void gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell, gint width, diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 6b45160491..b8e9978ed3 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -361,8 +361,8 @@ gtk_im_context_reset (GtkIMContext *context) * window. **/ void -gtk_im_context_set_cursor_location (GtkIMContext *context, - GdkRectangle *area) +gtk_im_context_set_cursor_location (GtkIMContext *context, + const GdkRectangle *area) { GtkIMContextClass *klass; @@ -370,7 +370,7 @@ gtk_im_context_set_cursor_location (GtkIMContext *context, klass = GTK_IM_CONTEXT_GET_CLASS (context); if (klass->set_cursor_location) - klass->set_cursor_location (context, area); + klass->set_cursor_location (context, (GdkRectangle *) area); } /** diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h index ae4a71072a..47063c03ea 100644 --- a/gtk/gtkimcontext.h +++ b/gtk/gtkimcontext.h @@ -94,31 +94,31 @@ struct _GtkIMContextClass GType gtk_im_context_get_type (void) G_GNUC_CONST; -void gtk_im_context_set_client_window (GtkIMContext *context, - GdkWindow *window); -void gtk_im_context_get_preedit_string (GtkIMContext *context, - gchar **str, - PangoAttrList **attrs, - gint *cursor_pos); -gboolean gtk_im_context_filter_keypress (GtkIMContext *context, - GdkEventKey *event); -void gtk_im_context_focus_in (GtkIMContext *context); -void gtk_im_context_focus_out (GtkIMContext *context); -void gtk_im_context_reset (GtkIMContext *context); -void gtk_im_context_set_cursor_location (GtkIMContext *context, - GdkRectangle *area); -void gtk_im_context_set_use_preedit (GtkIMContext *context, - gboolean use_preedit); -void gtk_im_context_set_surrounding (GtkIMContext *context, - const gchar *text, - gint len, - gint cursor_index); -gboolean gtk_im_context_get_surrounding (GtkIMContext *context, - gchar **text, - gint *cursor_index); -gboolean gtk_im_context_delete_surrounding (GtkIMContext *context, - gint offset, - gint n_chars); +void gtk_im_context_set_client_window (GtkIMContext *context, + GdkWindow *window); +void gtk_im_context_get_preedit_string (GtkIMContext *context, + gchar **str, + PangoAttrList **attrs, + gint *cursor_pos); +gboolean gtk_im_context_filter_keypress (GtkIMContext *context, + GdkEventKey *event); +void gtk_im_context_focus_in (GtkIMContext *context); +void gtk_im_context_focus_out (GtkIMContext *context); +void gtk_im_context_reset (GtkIMContext *context); +void gtk_im_context_set_cursor_location (GtkIMContext *context, + const GdkRectangle *area); +void gtk_im_context_set_use_preedit (GtkIMContext *context, + gboolean use_preedit); +void gtk_im_context_set_surrounding (GtkIMContext *context, + const gchar *text, + gint len, + gint cursor_index); +gboolean gtk_im_context_get_surrounding (GtkIMContext *context, + gchar **text, + gint *cursor_index); +gboolean gtk_im_context_delete_surrounding (GtkIMContext *context, + gint offset, + gint n_chars); G_END_DECLS diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 5f63f8ff0d..fe122208d8 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -1993,15 +1993,15 @@ gtk_style_render_icon (GtkStyle *style, /* Default functions */ void -gtk_style_apply_default_background (GtkStyle *style, - GdkWindow *window, - gboolean set_bg, - GtkStateType state_type, - GdkRectangle *area, - gint x, - gint y, - gint width, - gint height) +gtk_style_apply_default_background (GtkStyle *style, + GdkWindow *window, + gboolean set_bg, + GtkStateType state_type, + const GdkRectangle *area, + gint x, + gint y, + gint width, + gint height) { GdkRectangle new_rect, old_rect; @@ -2056,10 +2056,10 @@ gtk_style_apply_default_background (GtkStyle *style, } } -static GdkPixbuf* +static GdkPixbuf * scale_or_ref (GdkPixbuf *src, - gint width, - gint height) + gint width, + gint height) { if (width == gdk_pixbuf_get_width (src) && height == gdk_pixbuf_get_height (src)) @@ -3383,10 +3383,10 @@ gtk_default_draw_box (GtkStyle *style, } } -static GdkGC* -get_darkened_gc (GdkWindow *window, - GdkColor *color, - gint darken_count) +static GdkGC * +get_darkened_gc (GdkWindow *window, + const GdkColor *color, + gint darken_count) { GdkColor src = *color; GdkColor shaded = *color; @@ -5404,9 +5404,9 @@ gtk_default_draw_resize_grip (GtkStyle *style, } void -_gtk_style_shade (GdkColor *a, - GdkColor *b, - gdouble k) +_gtk_style_shade (const GdkColor *a, + GdkColor *b, + gdouble k) { gdouble red; gdouble green; @@ -5605,21 +5605,23 @@ hls_to_rgb (gdouble *h, * using the given style and state. **/ void -gtk_paint_hline (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GdkRectangle *area, - GtkWidget *widget, - const gchar *detail, - gint x1, - gint x2, - gint y) +gtk_paint_hline (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + const GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint x1, + gint x2, + gint y) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_hline (style, window, state_type, area, widget, detail, x1, x2, y); + + GTK_STYLE_GET_CLASS (style)->draw_hline (style, window, state_type, + (GdkRectangle *) area, widget, detail, + x1, x2, y); } /** @@ -5639,21 +5641,23 @@ gtk_paint_hline (GtkStyle *style, * using the given style and state. */ void -gtk_paint_vline (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GdkRectangle *area, - GtkWidget *widget, - const gchar *detail, - gint y1_, - gint y2_, - gint x) +gtk_paint_vline (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + const GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint y1_, + gint y2_, + gint x) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, area, widget, detail, y1_, y2_, x); + + GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, + (GdkRectangle *) area, widget, detail, + y1_, y2_, x); } /** @@ -5675,23 +5679,25 @@ gtk_paint_vline (GtkStyle *style, * using the given style and state and shadow type. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_shadow (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -5711,22 +5717,24 @@ gtk_paint_shadow (GtkStyle *style, * Draws a polygon on @window with the given parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_polygon != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_polygon (style, window, state_type, shadow_type, area, widget, detail, points, npoints, fill); + + GTK_STYLE_GET_CLASS (style)->draw_polygon (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + (GdkPoint *) points, n_points, fill); } /** @@ -5750,25 +5758,27 @@ gtk_paint_polygon (GtkStyle *style, * parameters. @arrow_type determines the direction of the arrow. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_arrow (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + arrow_type, fill, x, y, width, height); } /** @@ -5790,23 +5800,25 @@ gtk_paint_arrow (GtkStyle *style, * parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_diamond (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_diamond (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -5827,21 +5839,23 @@ gtk_paint_diamond (GtkStyle *style, * Deprecated: Use gtk_paint_layout() instead. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_string (style, window, state_type, area, widget, detail, x, y, string); + + GTK_STYLE_GET_CLASS (style)->draw_string (style, window, state_type, + (GdkRectangle *) area, widget, detail, + x, y, string); } /** @@ -5862,23 +5876,25 @@ gtk_paint_string (GtkStyle *style, * Draws a box on @window with the given parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_box (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -5899,23 +5915,25 @@ gtk_paint_box (GtkStyle *style, * Draws a flat box on @window with the given parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_flat_box (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -5937,23 +5955,25 @@ gtk_paint_flat_box (GtkStyle *style, * the given parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_check (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -5975,23 +5995,25 @@ gtk_paint_check (GtkStyle *style, * the given parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_option (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -6013,23 +6035,25 @@ gtk_paint_option (GtkStyle *style, * in the given rectangle on @window using the given parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -6055,26 +6079,28 @@ gtk_paint_tab (GtkStyle *style, * gap in one 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); + + GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height, gap_side, gap_x, gap_width); } @@ -6100,26 +6126,28 @@ gtk_paint_shadow_gap (GtkStyle *style, * leaving a gap in one side. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); + + GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height, gap_side, gap_x, gap_width); } /** @@ -6141,24 +6169,26 @@ gtk_paint_box_gap (GtkStyle *style, * Draws an extension, i.e. a notebook tab. **/ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side); + + GTK_STYLE_GET_CLASS (style)->draw_extension (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height, gap_side); } /** @@ -6179,22 +6209,24 @@ gtk_paint_extension (GtkStyle *style, * given style. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height); + + GTK_STYLE_GET_CLASS (style)->draw_focus (style, window, state_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height); } /** @@ -6217,24 +6249,26 @@ gtk_paint_focus (GtkStyle *style, * given style and orientation. **/ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); + + GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height, orientation); } /** @@ -6256,24 +6290,26 @@ gtk_paint_slider (GtkStyle *style, * Draws a handle as used in #GtkHandleBox and #GtkPaned. **/ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); + + GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, + (GdkRectangle *) area, widget, detail, + x, y, width, height, orientation); } /** @@ -6302,22 +6338,23 @@ gtk_paint_handle (GtkStyle *style, * expanded position. **/ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_expander != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type, area, - widget, detail, x, y, expander_style); + + GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type, + (GdkRectangle *) area, widget, detail, + x, y, expander_style); } /** @@ -6338,23 +6375,24 @@ gtk_paint_expander (GtkStyle *style, * Draws a layout on @window using the given parameters. **/ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL); g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); - - GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, area, - widget, detail, x, y, layout); + + GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, + (GdkRectangle *) area, widget, detail, + x, y, layout); } /** @@ -6376,17 +6414,17 @@ gtk_paint_layout (GtkStyle *style, * parameters. */ 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) +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) { g_return_if_fail (GTK_IS_STYLE (style)); @@ -6394,7 +6432,7 @@ gtk_paint_resize_grip (GtkStyle *style, g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type, - area, widget, detail, + (GdkRectangle *) area, widget, detail, edge, x, y, width, height); } @@ -6590,8 +6628,8 @@ style_unrealize_cursor_gcs (GtkStyle *style) } static GdkGC * -make_cursor_gc (GtkWidget *widget, - const gchar *property_name, +make_cursor_gc (GtkWidget *widget, + const gchar *property_name, const GdkColor *fallback) { GdkGCValues gc_values; @@ -6703,12 +6741,12 @@ _gtk_widget_get_cursor_color (GtkWidget *widget, } static void -draw_insertion_cursor (GtkWidget *widget, - GdkDrawable *drawable, - GdkGC *gc, - GdkRectangle *location, - GtkTextDirection direction, - gboolean draw_arrow) +draw_insertion_cursor (GtkWidget *widget, + GdkDrawable *drawable, + GdkGC *gc, + const GdkRectangle *location, + GtkTextDirection direction, + gboolean draw_arrow) { gint stem_width; gint arrow_width; @@ -6787,13 +6825,13 @@ draw_insertion_cursor (GtkWidget *widget, * Since: 2.4 **/ void -gtk_draw_insertion_cursor (GtkWidget *widget, - GdkDrawable *drawable, - GdkRectangle *area, - GdkRectangle *location, - gboolean is_primary, - GtkTextDirection direction, - gboolean draw_arrow) +gtk_draw_insertion_cursor (GtkWidget *widget, + GdkDrawable *drawable, + const GdkRectangle *area, + const GdkRectangle *location, + gboolean is_primary, + GtkTextDirection direction, + gboolean draw_arrow) { GdkGC *gc; 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 diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 70fc3171dd..66e41a3e00 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -4840,10 +4840,10 @@ _gtk_toolbar_get_default_space_size (void) } void -_gtk_toolbar_paint_space_line (GtkWidget *widget, - GtkToolbar *toolbar, - GdkRectangle *area, - GtkAllocation *allocation) +_gtk_toolbar_paint_space_line (GtkWidget *widget, + GtkToolbar *toolbar, + const GdkRectangle *area, + const GtkAllocation *allocation) { const double start_fraction = (SPACE_LINE_START / SPACE_LINE_DIVISION); const double end_fraction = (SPACE_LINE_END / SPACE_LINE_DIVISION); diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 0a4652c746..a1172f8dd0 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -169,11 +169,11 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar, gint index_); /* internal functions */ -gchar * _gtk_toolbar_elide_underscores (const gchar *original); -void _gtk_toolbar_paint_space_line (GtkWidget *widget, - GtkToolbar *toolbar, - GdkRectangle *area, - GtkAllocation *allocation); +gchar * _gtk_toolbar_elide_underscores (const gchar *original); +void _gtk_toolbar_paint_space_line (GtkWidget *widget, + GtkToolbar *toolbar, + const GdkRectangle *area, + const GtkAllocation *allocation); gint _gtk_toolbar_get_default_space_size (void); diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 53de9cfa73..63f9cc55cd 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -387,8 +387,8 @@ gtk_tooltip_set_custom (GtkTooltip *tooltip, * Since: 2.12 */ void -gtk_tooltip_set_tip_area (GtkTooltip *tooltip, - GdkRectangle *rect) +gtk_tooltip_set_tip_area (GtkTooltip *tooltip, + const GdkRectangle *rect) { g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h index 5c29a9a5a5..d91cdbaf9f 100644 --- a/gtk/gtktooltip.h +++ b/gtk/gtktooltip.h @@ -33,32 +33,32 @@ G_BEGIN_DECLS GType gtk_tooltip_get_type (void); -void gtk_tooltip_set_markup (GtkTooltip *tooltip, - const gchar *markup); -void gtk_tooltip_set_text (GtkTooltip *tooltip, - const gchar *text); -void gtk_tooltip_set_icon (GtkTooltip *tooltip, - GdkPixbuf *pixbuf); -void gtk_tooltip_set_icon_from_stock (GtkTooltip *tooltip, - const gchar *stock_id, - GtkIconSize size); -void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, - const gchar *icon_name, - GtkIconSize size); -void gtk_tooltip_set_custom (GtkTooltip *tooltip, - GtkWidget *custom_widget); +void gtk_tooltip_set_markup (GtkTooltip *tooltip, + const gchar *markup); +void gtk_tooltip_set_text (GtkTooltip *tooltip, + const gchar *text); +void gtk_tooltip_set_icon (GtkTooltip *tooltip, + GdkPixbuf *pixbuf); +void gtk_tooltip_set_icon_from_stock (GtkTooltip *tooltip, + const gchar *stock_id, + GtkIconSize size); +void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, + const gchar *icon_name, + GtkIconSize size); +void gtk_tooltip_set_custom (GtkTooltip *tooltip, + GtkWidget *custom_widget); -void gtk_tooltip_set_tip_area (GtkTooltip *tooltip, - GdkRectangle *rect); +void gtk_tooltip_set_tip_area (GtkTooltip *tooltip, + const GdkRectangle *rect); -void gtk_tooltip_trigger_tooltip_query (GdkDisplay *display); +void gtk_tooltip_trigger_tooltip_query (GdkDisplay *display); -void _gtk_tooltip_focus_in (GtkWidget *widget); -void _gtk_tooltip_focus_out (GtkWidget *widget); -void _gtk_tooltip_toggle_keyboard_mode (GtkWidget *widget); -void _gtk_tooltip_handle_event (GdkEvent *event); -void _gtk_tooltip_hide (GtkWidget *widget); +void _gtk_tooltip_focus_in (GtkWidget *widget); +void _gtk_tooltip_focus_out (GtkWidget *widget); +void _gtk_tooltip_toggle_keyboard_mode (GtkWidget *widget); +void _gtk_tooltip_handle_event (GdkEvent *event); +void _gtk_tooltip_hide (GtkWidget *widget); G_END_DECLS diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h index 3d643f9e38..7fe4d0ced9 100644 --- a/gtk/gtktreeprivate.h +++ b/gtk/gtktreeprivate.h @@ -366,7 +366,7 @@ void _gtk_tree_view_child_move_resize (GtkTreeView *tree_v void _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, GtkRBTree *tree, GtkRBNode *node, - GdkRectangle *clip_rect); + const GdkRectangle *clip_rect); void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column); void _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column); @@ -383,8 +383,8 @@ gboolean _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column, GtkCellEditable **editable_widget, GdkEvent *event, gchar *path_string, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, guint flags); void _gtk_tree_view_column_start_editing (GtkTreeViewColumn *tree_column, GtkCellEditable *editable_widget); @@ -407,28 +407,28 @@ gboolean _gtk_tree_selection_row_is_selectable (GtkTreeSelection *sele GtkRBNode *node, GtkTreePath *path); -void _gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column, - GdkWindow *window, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - guint flags); -void _gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *focus_area); -gboolean _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column, - gint direction, - gboolean left, - gboolean right); -void _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column, - GdkWindow *window, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - guint flags); -void _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column, - gboolean install_handler); +void _gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column, + GdkWindow *window, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + const GdkRectangle *expose_area, + guint flags); +void _gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + GdkRectangle *focus_area); +gboolean _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column, + gint direction, + gboolean left, + gboolean right); +void _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column, + GdkWindow *window, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + const GdkRectangle *expose_area, + guint flags); +void _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column, + gboolean install_handler); void _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column, GtkCellRenderer *cell, gint *left, diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index bba0f6243e..070d5fc2b1 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -309,90 +309,90 @@ static void gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view); static void invalidate_empty_focus (GtkTreeView *tree_view); /* Internal functions */ -static gboolean gtk_tree_view_is_expander_column (GtkTreeView *tree_view, - GtkTreeViewColumn *column); -static void gtk_tree_view_add_move_binding (GtkBindingSet *binding_set, - guint keyval, - guint modmask, - gboolean add_shifted_binding, - GtkMovementStep step, - gint count); -static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view, - GtkRBTree *tree); -static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, - GtkTreePath *path, - GdkRectangle *clip_rect); -static void gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkRBNode *node, - GdkRectangle *clip_rect); -static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkRBNode *node, - gint x, - gint y); -static void gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view, - GtkRBTree *tree, - gint *x1, - gint *x2); -static gint gtk_tree_view_new_column_width (GtkTreeView *tree_view, - gint i, - gint *x); -static void gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment, - GtkTreeView *tree_view); -static void gtk_tree_view_build_tree (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkTreeIter *iter, - gint depth, - gboolean recurse); -static gboolean gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view, - GtkTreeIter *iter, - gint depth, - gint *height, - GtkRBNode *node); -static void gtk_tree_view_discover_dirty (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkTreeIter *iter, - gint depth); -static void gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkRBNode *node); -static void gtk_tree_view_clamp_column_visible (GtkTreeView *tree_view, - GtkTreeViewColumn *column, - gboolean focus_to_cell); -static gboolean gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view, - GdkEventMotion *event); -static void gtk_tree_view_focus_to_cursor (GtkTreeView *tree_view); -static void gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view, - gint count); -static void gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view, - gint count); -static void gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view, - gint count); -static void gtk_tree_view_move_cursor_start_end (GtkTreeView *tree_view, - gint count); -static gboolean gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, - GtkTreePath *path, - GtkRBTree *tree, - GtkRBNode *node, - gboolean animate); -static gboolean gtk_tree_view_real_expand_row (GtkTreeView *tree_view, - GtkTreePath *path, - GtkRBTree *tree, - GtkRBNode *node, - gboolean open_all, - gboolean animate); -static void gtk_tree_view_real_set_cursor (GtkTreeView *tree_view, - GtkTreePath *path, - gboolean clear_and_select, - gboolean clamp_node); -static gboolean gtk_tree_view_has_special_cell (GtkTreeView *tree_view); -static void column_sizing_notify (GObject *object, - GParamSpec *pspec, - gpointer data); -static gboolean expand_collapse_timeout (gpointer data); -static gboolean do_expand_collapse (GtkTreeView *tree_view); -static void gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view); +static gboolean gtk_tree_view_is_expander_column (GtkTreeView *tree_view, + GtkTreeViewColumn *column); +static void gtk_tree_view_add_move_binding (GtkBindingSet *binding_set, + guint keyval, + guint modmask, + gboolean add_shifted_binding, + GtkMovementStep step, + gint count); +static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view, + GtkRBTree *tree); +static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, + GtkTreePath *path, + const GdkRectangle *clip_rect); +static void gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkRBNode *node, + const GdkRectangle *clip_rect); +static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkRBNode *node, + gint x, + gint y); +static void gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view, + GtkRBTree *tree, + gint *x1, + gint *x2); +static gint gtk_tree_view_new_column_width (GtkTreeView *tree_view, + gint i, + gint *x); +static void gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment, + GtkTreeView *tree_view); +static void gtk_tree_view_build_tree (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkTreeIter *iter, + gint depth, + gboolean recurse); +static gboolean gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view, + GtkTreeIter *iter, + gint depth, + gint *height, + GtkRBNode *node); +static void gtk_tree_view_discover_dirty (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkTreeIter *iter, + gint depth); +static void gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkRBNode *node); +static void gtk_tree_view_clamp_column_visible (GtkTreeView *tree_view, + GtkTreeViewColumn *column, + gboolean focus_to_cell); +static gboolean gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view, + GdkEventMotion *event); +static void gtk_tree_view_focus_to_cursor (GtkTreeView *tree_view); +static void gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view, + gint count); +static void gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view, + gint count); +static void gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view, + gint count); +static void gtk_tree_view_move_cursor_start_end (GtkTreeView *tree_view, + gint count); +static gboolean gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, + GtkTreePath *path, + GtkRBTree *tree, + GtkRBNode *node, + gboolean animate); +static gboolean gtk_tree_view_real_expand_row (GtkTreeView *tree_view, + GtkTreePath *path, + GtkRBTree *tree, + GtkRBNode *node, + gboolean open_all, + gboolean animate); +static void gtk_tree_view_real_set_cursor (GtkTreeView *tree_view, + GtkTreePath *path, + gboolean clear_and_select, + gboolean clamp_node); +static gboolean gtk_tree_view_has_special_cell (GtkTreeView *tree_view); +static void column_sizing_notify (GObject *object, + GParamSpec *pspec, + gpointer data); +static gboolean expand_collapse_timeout (gpointer data); +static gboolean do_expand_collapse (GtkTreeView *tree_view); +static void gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view); /* interactive search */ static void gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view); @@ -9423,10 +9423,10 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view, } static void -gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkRBNode *node, - GdkRectangle *clip_rect) +gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkRBNode *node, + const GdkRectangle *clip_rect) { GdkRectangle rect; @@ -9454,10 +9454,10 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, } void -_gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, - GtkRBTree *tree, - GtkRBNode *node, - GdkRectangle *clip_rect) +_gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, + GtkRBTree *tree, + GtkRBNode *node, + const GdkRectangle *clip_rect) { GdkRectangle rect; @@ -9485,9 +9485,9 @@ _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, } static void -gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, - GtkTreePath *path, - GdkRectangle *clip_rect) +gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, + GtkTreePath *path, + const GdkRectangle *clip_rect) { GtkRBTree *tree = NULL; GtkRBNode *node = NULL; diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 70dfd24258..bd781066db 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -2568,12 +2568,12 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column, * primarily by the #GtkTreeView. **/ void -gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) +gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column, + const GdkRectangle *cell_area, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height) { GList *list; gboolean first_cell = TRUE; @@ -2635,11 +2635,11 @@ enum { static gboolean gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, GdkWindow *window, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, guint flags, gint action, - GdkRectangle *expose_area, /* RENDER */ + const GdkRectangle *expose_area, /* RENDER */ GdkRectangle *focus_rectangle, /* FOCUS */ GtkCellEditable **editable_widget, /* EVENT */ GdkEvent *event, /* EVENT */ @@ -3113,12 +3113,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, * #GtkTreeView. **/ void -_gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column, - GdkWindow *window, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - guint flags) +_gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column, + GdkWindow *window, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + const GdkRectangle *expose_area, + guint flags) { g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column)); g_return_if_fail (background_area != NULL); @@ -3140,8 +3140,8 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column, GtkCellEditable **editable_widget, GdkEvent *event, gchar *path_string, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, guint flags) { g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE); @@ -3159,10 +3159,10 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column, } void -_gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *focus_area) +_gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + GdkRectangle *focus_area) { gtk_tree_view_column_cell_process_action (tree_column, NULL, @@ -3425,12 +3425,12 @@ _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column, } void -_gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column, - GdkWindow *window, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - guint flags) +_gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column, + GdkWindow *window, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + const GdkRectangle *expose_area, + guint flags) { gint focus_line_width; GtkStateType cell_state; diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index d7f14cb41f..89073858b2 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -218,7 +218,7 @@ void gtk_tree_view_column_cell_set_cell_data (GtkTreeViewCol gboolean is_expander, gboolean is_expanded); void gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column, - GdkRectangle *cell_area, + const GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 06a090094b..e3d824e823 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3578,8 +3578,8 @@ gtk_widget_queue_resize_no_redraw (GtkWidget *widget) * a better choice if you want to draw a region of a widget. **/ void -gtk_widget_draw (GtkWidget *widget, - GdkRectangle *area) +gtk_widget_draw (GtkWidget *widget, + const GdkRectangle *area) { g_return_if_fail (GTK_IS_WIDGET (widget)); @@ -4877,9 +4877,9 @@ gtk_widget_reparent (GtkWidget *widget, * Return value: %TRUE if there was an intersection **/ gboolean -gtk_widget_intersect (GtkWidget *widget, - GdkRectangle *area, - GdkRectangle *intersection) +gtk_widget_intersect (GtkWidget *widget, + const GdkRectangle *area, + GdkRectangle *intersection) { GdkRectangle *dest; GdkRectangle tmp; @@ -4922,8 +4922,8 @@ gtk_widget_intersect (GtkWidget *widget, * check. **/ GdkRegion * -gtk_widget_region_intersect (GtkWidget *widget, - GdkRegion *region) +gtk_widget_region_intersect (GtkWidget *widget, + const GdkRegion *region) { GdkRectangle rect; GdkRegion *dest; diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index b7f889abaf..d991a7182e 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -489,7 +489,7 @@ void gtk_widget_queue_resize (GtkWidget *widget); void gtk_widget_queue_resize_no_redraw (GtkWidget *widget); #ifndef GTK_DISABLE_DEPRECATED void gtk_widget_draw (GtkWidget *widget, - GdkRectangle *area); + const GdkRectangle *area); #endif /* GTK_DISABLE_DEPRECATED */ void gtk_widget_size_request (GtkWidget *widget, GtkRequisition *requisition); @@ -530,10 +530,10 @@ gboolean gtk_widget_set_scroll_adjustments (GtkWidget *widget, void gtk_widget_reparent (GtkWidget *widget, GtkWidget *new_parent); gboolean gtk_widget_intersect (GtkWidget *widget, - GdkRectangle *area, + const GdkRectangle *area, GdkRectangle *intersection); GdkRegion *gtk_widget_region_intersect (GtkWidget *widget, - GdkRegion *region); + const GdkRegion *region); void gtk_widget_freeze_child_notify (GtkWidget *widget); void gtk_widget_child_notify (GtkWidget *widget, |