callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michael Natterer 2008-01-25 09:30:40 +00:00 committed by Michael Natterer
parent 594b710214
commit a362eecc4a
19 changed files with 885 additions and 825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -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> 2008-01-25 Sven Herzberg <sven@imendio.com>
Reviewed by Johan Dahlin. Reviewed by Johan Dahlin.

2
gtk/gtkbutton.c
View File

@ -1218,7 +1218,7 @@ gtk_button_size_allocate (GtkWidget *widget,
void void
_gtk_button_paint (GtkButton *button, _gtk_button_paint (GtkButton *button,
GdkRectangle *area, const GdkRectangle *area,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
const gchar *main_detail, const gchar *main_detail,

2
gtk/gtkbutton.h
View File

@ -128,7 +128,7 @@ GtkPositionType gtk_button_get_image_position (GtkButton *button);
void _gtk_button_set_depressed (GtkButton *button, void _gtk_button_set_depressed (GtkButton *button,
gboolean depressed); gboolean depressed);
void _gtk_button_paint (GtkButton *button, void _gtk_button_paint (GtkButton *button,
GdkRectangle *area, const GdkRectangle *area,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
const gchar *main_detail, const gchar *main_detail,

32
gtk/gtkcellrenderer.c
View File

@ -481,7 +481,7 @@ set_cell_bg_color (GtkCellRenderer *cell,
void void
gtk_cell_renderer_get_size (GtkCellRenderer *cell, gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget, GtkWidget *widget,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
gint *x_offset, gint *x_offset,
gint *y_offset, gint *y_offset,
gint *width, gint *width,
@ -506,7 +506,7 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GTK_CELL_RENDERER_GET_CLASS (cell)->get_size (cell, GTK_CELL_RENDERER_GET_CLASS (cell)->get_size (cell,
widget, widget,
cell_area, (GdkRectangle *) cell_area,
x_offset, x_offset,
y_offset, y_offset,
real_width, real_width,
@ -536,9 +536,9 @@ void
gtk_cell_renderer_render (GtkCellRenderer *cell, gtk_cell_renderer_render (GtkCellRenderer *cell,
GdkWindow *window, GdkWindow *window,
GtkWidget *widget, GtkWidget *widget,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *expose_area, const GdkRectangle *expose_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
gboolean selected = FALSE; gboolean selected = FALSE;
@ -563,9 +563,9 @@ gtk_cell_renderer_render (GtkCellRenderer *cell,
GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
window, window,
widget, widget,
background_area, (GdkRectangle *) background_area,
cell_area, (GdkRectangle *) cell_area,
expose_area, (GdkRectangle *) expose_area,
flags); flags);
} }
@ -591,8 +591,8 @@ gtk_cell_renderer_activate (GtkCellRenderer *cell,
GdkEvent *event, GdkEvent *event,
GtkWidget *widget, GtkWidget *widget,
const gchar *path, const gchar *path,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE); g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE);
@ -607,8 +607,8 @@ gtk_cell_renderer_activate (GtkCellRenderer *cell,
event, event,
widget, widget,
path, path,
background_area, (GdkRectangle *) background_area,
cell_area, (GdkRectangle *) cell_area,
flags); flags);
} }
@ -632,8 +632,8 @@ gtk_cell_renderer_start_editing (GtkCellRenderer *cell,
GdkEvent *event, GdkEvent *event,
GtkWidget *widget, GtkWidget *widget,
const gchar *path, const gchar *path,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
@ -651,8 +651,8 @@ gtk_cell_renderer_start_editing (GtkCellRenderer *cell,
event, event,
widget, widget,
path, path,
background_area, (GdkRectangle *) background_area,
cell_area, (GdkRectangle *) cell_area,
flags); flags);
g_signal_emit (cell, g_signal_emit (cell,

16
gtk/gtkcellrenderer.h
View File

@ -124,7 +124,7 @@ GType gtk_cell_renderer_get_type (void) G_GNUC_CONST;
void gtk_cell_renderer_get_size (GtkCellRenderer *cell, void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget, GtkWidget *widget,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
gint *x_offset, gint *x_offset,
gint *y_offset, gint *y_offset,
gint *width, gint *width,
@ -132,23 +132,23 @@ void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
void gtk_cell_renderer_render (GtkCellRenderer *cell, void gtk_cell_renderer_render (GtkCellRenderer *cell,
GdkWindow *window, GdkWindow *window,
GtkWidget *widget, GtkWidget *widget,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *expose_area, const GdkRectangle *expose_area,
GtkCellRendererState flags); GtkCellRendererState flags);
gboolean gtk_cell_renderer_activate (GtkCellRenderer *cell, gboolean gtk_cell_renderer_activate (GtkCellRenderer *cell,
GdkEvent *event, GdkEvent *event,
GtkWidget *widget, GtkWidget *widget,
const gchar *path, const gchar *path,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
GtkCellEditable *gtk_cell_renderer_start_editing (GtkCellRenderer *cell, GtkCellEditable *gtk_cell_renderer_start_editing (GtkCellRenderer *cell,
GdkEvent *event, GdkEvent *event,
GtkWidget *widget, GtkWidget *widget,
const gchar *path, const gchar *path,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
void gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell, void gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell,
gint width, gint width,

4
gtk/gtkimcontext.c
View File

@ -362,7 +362,7 @@ gtk_im_context_reset (GtkIMContext *context)
**/ **/
void void
gtk_im_context_set_cursor_location (GtkIMContext *context, gtk_im_context_set_cursor_location (GtkIMContext *context,
GdkRectangle *area) const GdkRectangle *area)
{ {
GtkIMContextClass *klass; GtkIMContextClass *klass;
@ -370,7 +370,7 @@ gtk_im_context_set_cursor_location (GtkIMContext *context,
klass = GTK_IM_CONTEXT_GET_CLASS (context); klass = GTK_IM_CONTEXT_GET_CLASS (context);
if (klass->set_cursor_location) if (klass->set_cursor_location)
klass->set_cursor_location (context, area); klass->set_cursor_location (context, (GdkRectangle *) area);
} }
/** /**

2
gtk/gtkimcontext.h
View File

@ -106,7 +106,7 @@ void gtk_im_context_focus_in (GtkIMContext *context);
void gtk_im_context_focus_out (GtkIMContext *context); void gtk_im_context_focus_out (GtkIMContext *context);
void gtk_im_context_reset (GtkIMContext *context); void gtk_im_context_reset (GtkIMContext *context);
void gtk_im_context_set_cursor_location (GtkIMContext *context, void gtk_im_context_set_cursor_location (GtkIMContext *context,
GdkRectangle *area); const GdkRectangle *area);
void gtk_im_context_set_use_preedit (GtkIMContext *context, void gtk_im_context_set_use_preedit (GtkIMContext *context,
gboolean use_preedit); gboolean use_preedit);
void gtk_im_context_set_surrounding (GtkIMContext *context, void gtk_im_context_set_surrounding (GtkIMContext *context,

148
gtk/gtkstyle.c
View File

@ -1997,7 +1997,7 @@ gtk_style_apply_default_background (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
gboolean set_bg, gboolean set_bg,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -3385,7 +3385,7 @@ gtk_default_draw_box (GtkStyle *style,
static GdkGC * static GdkGC *
get_darkened_gc (GdkWindow *window, get_darkened_gc (GdkWindow *window,
GdkColor *color, const GdkColor *color,
gint darken_count) gint darken_count)
{ {
GdkColor src = *color; GdkColor src = *color;
@ -5404,7 +5404,7 @@ gtk_default_draw_resize_grip (GtkStyle *style,
} }
void void
_gtk_style_shade (GdkColor *a, _gtk_style_shade (const GdkColor *a,
GdkColor *b, GdkColor *b,
gdouble k) gdouble k)
{ {
@ -5608,7 +5608,7 @@ void
gtk_paint_hline (GtkStyle *style, gtk_paint_hline (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x1, gint x1,
@ -5619,7 +5619,9 @@ gtk_paint_hline (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5642,7 +5644,7 @@ void
gtk_paint_vline (GtkStyle *style, gtk_paint_vline (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint y1_, gint y1_,
@ -5653,7 +5655,9 @@ gtk_paint_vline (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5679,7 +5683,7 @@ gtk_paint_shadow (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5691,7 +5695,9 @@ gtk_paint_shadow (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5715,18 +5721,20 @@ gtk_paint_polygon (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
GdkPoint *points, const GdkPoint *points,
gint npoints, gint n_points,
gboolean fill) gboolean fill)
{ {
g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_polygon != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_polygon != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5754,7 +5762,7 @@ gtk_paint_arrow (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
GtkArrowType arrow_type, GtkArrowType arrow_type,
@ -5768,7 +5776,9 @@ gtk_paint_arrow (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5794,7 +5804,7 @@ gtk_paint_diamond (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5806,7 +5816,9 @@ gtk_paint_diamond (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5830,7 +5842,7 @@ void
gtk_paint_string (GtkStyle *style, gtk_paint_string (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5841,7 +5853,9 @@ gtk_paint_string (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5866,7 +5880,7 @@ gtk_paint_box (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5878,7 +5892,9 @@ gtk_paint_box (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5903,7 +5919,7 @@ gtk_paint_flat_box (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5915,7 +5931,9 @@ gtk_paint_flat_box (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5941,7 +5959,7 @@ gtk_paint_check (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5953,7 +5971,9 @@ gtk_paint_check (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -5979,7 +5999,7 @@ gtk_paint_option (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -5991,7 +6011,9 @@ gtk_paint_option (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6017,7 +6039,7 @@ gtk_paint_tab (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -6029,7 +6051,9 @@ gtk_paint_tab (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6059,9 +6083,9 @@ gtk_paint_shadow_gap (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -6074,7 +6098,9 @@ gtk_paint_shadow_gap (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
@ -6104,9 +6130,9 @@ gtk_paint_box_gap (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -6119,7 +6145,9 @@ gtk_paint_box_gap (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6145,9 +6173,9 @@ gtk_paint_extension (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -6158,7 +6186,9 @@ gtk_paint_extension (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6182,7 +6212,7 @@ void
gtk_paint_focus (GtkStyle *style, gtk_paint_focus (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -6194,7 +6224,9 @@ gtk_paint_focus (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6221,7 +6253,7 @@ gtk_paint_slider (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -6234,7 +6266,9 @@ gtk_paint_slider (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6260,7 +6294,7 @@ gtk_paint_handle (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -6273,7 +6307,9 @@ gtk_paint_handle (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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);
} }
/** /**
@ -6305,7 +6341,7 @@ void
gtk_paint_expander (GtkStyle *style, gtk_paint_expander (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -6316,8 +6352,9 @@ gtk_paint_expander (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_expander != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_expander != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type, area, GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type,
widget, detail, x, y, expander_style); (GdkRectangle *) area, widget, detail,
x, y, expander_style);
} }
/** /**
@ -6342,7 +6379,7 @@ gtk_paint_layout (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
gboolean use_text, gboolean use_text,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -6353,8 +6390,9 @@ gtk_paint_layout (GtkStyle *style,
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); 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, GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text,
widget, detail, x, y, layout); (GdkRectangle *) area, widget, detail,
x, y, layout);
} }
/** /**
@ -6379,7 +6417,7 @@ void
gtk_paint_resize_grip (GtkStyle *style, gtk_paint_resize_grip (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
GdkWindowEdge edge, GdkWindowEdge edge,
@ -6394,7 +6432,7 @@ gtk_paint_resize_grip (GtkStyle *style,
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type, GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type,
area, widget, detail, (GdkRectangle *) area, widget, detail,
edge, x, y, width, height); edge, x, y, width, height);
} }
@ -6706,7 +6744,7 @@ static void
draw_insertion_cursor (GtkWidget *widget, draw_insertion_cursor (GtkWidget *widget,
GdkDrawable *drawable, GdkDrawable *drawable,
GdkGC *gc, GdkGC *gc,
GdkRectangle *location, const GdkRectangle *location,
GtkTextDirection direction, GtkTextDirection direction,
gboolean draw_arrow) gboolean draw_arrow)
{ {
@ -6789,8 +6827,8 @@ draw_insertion_cursor (GtkWidget *widget,
void void
gtk_draw_insertion_cursor (GtkWidget *widget, gtk_draw_insertion_cursor (GtkWidget *widget,
GdkDrawable *drawable, GdkDrawable *drawable,
GdkRectangle *area, const GdkRectangle *area,
GdkRectangle *location, const GdkRectangle *location,
gboolean is_primary, gboolean is_primary,
GtkTextDirection direction, GtkTextDirection direction,
gboolean draw_arrow) gboolean draw_arrow)

61
gtk/gtkstyle.h
View File

@ -446,7 +446,7 @@ void gtk_style_apply_default_background (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
gboolean set_bg, gboolean set_bg,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -633,7 +633,7 @@ void gtk_draw_resize_grip (GtkStyle *style,
void gtk_paint_hline (GtkStyle *style, void gtk_paint_hline (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x1, gint x1,
@ -642,7 +642,7 @@ void gtk_paint_hline (GtkStyle *style,
void gtk_paint_vline (GtkStyle *style, void gtk_paint_vline (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint y1_, gint y1_,
@ -652,7 +652,7 @@ void gtk_paint_shadow (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -663,17 +663,17 @@ void gtk_paint_polygon (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
GdkPoint *points, const GdkPoint *points,
gint npoints, gint n_points,
gboolean fill); gboolean fill);
void gtk_paint_arrow (GtkStyle *style, void gtk_paint_arrow (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
GtkArrowType arrow_type, GtkArrowType arrow_type,
@ -686,7 +686,7 @@ void gtk_paint_diamond (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -697,7 +697,7 @@ void gtk_paint_box (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -708,7 +708,7 @@ void gtk_paint_flat_box (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -719,7 +719,7 @@ void gtk_paint_check (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -730,7 +730,7 @@ void gtk_paint_option (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -741,7 +741,7 @@ void gtk_paint_tab (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -752,9 +752,9 @@ void gtk_paint_shadow_gap (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -766,9 +766,9 @@ void gtk_paint_box_gap (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -780,9 +780,9 @@ void gtk_paint_extension (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
gint width, gint width,
@ -791,7 +791,7 @@ void gtk_paint_extension (GtkStyle *style,
void gtk_paint_focus (GtkStyle *style, void gtk_paint_focus (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -802,7 +802,7 @@ void gtk_paint_slider (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -814,7 +814,7 @@ void gtk_paint_handle (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GtkShadowType shadow_type, GtkShadowType shadow_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -825,7 +825,7 @@ void gtk_paint_handle (GtkStyle *style,
void gtk_paint_expander (GtkStyle *style, void gtk_paint_expander (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -835,17 +835,16 @@ void gtk_paint_layout (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
gboolean use_text, gboolean use_text,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
PangoLayout *layout); PangoLayout *layout);
void gtk_paint_resize_grip (GtkStyle *style, void gtk_paint_resize_grip (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
GdkWindowEdge edge, GdkWindowEdge edge,
@ -869,7 +868,7 @@ const GValue* _gtk_style_peek_property_value (GtkStyle *style,
void _gtk_style_init_for_settings (GtkStyle *style, void _gtk_style_init_for_settings (GtkStyle *style,
GtkSettings *settings); GtkSettings *settings);
void _gtk_style_shade (GdkColor *a, void _gtk_style_shade (const GdkColor *a,
GdkColor *b, GdkColor *b,
gdouble k); gdouble k);
@ -885,7 +884,7 @@ void gtk_draw_string (GtkStyle *style,
void gtk_paint_string (GtkStyle *style, void gtk_paint_string (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
GdkRectangle *area, const GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -895,8 +894,8 @@ void gtk_paint_string (GtkStyle *style,
void gtk_draw_insertion_cursor (GtkWidget *widget, void gtk_draw_insertion_cursor (GtkWidget *widget,
GdkDrawable *drawable, GdkDrawable *drawable,
GdkRectangle *area, const GdkRectangle *area,
GdkRectangle *location, const GdkRectangle *location,
gboolean is_primary, gboolean is_primary,
GtkTextDirection direction, GtkTextDirection direction,
gboolean draw_arrow); gboolean draw_arrow);

4
gtk/gtktoolbar.c
View File

@ -4842,8 +4842,8 @@ _gtk_toolbar_get_default_space_size (void)
void void
_gtk_toolbar_paint_space_line (GtkWidget *widget, _gtk_toolbar_paint_space_line (GtkWidget *widget,
GtkToolbar *toolbar, GtkToolbar *toolbar,
GdkRectangle *area, const GdkRectangle *area,
GtkAllocation *allocation) const GtkAllocation *allocation)
{ {
const double start_fraction = (SPACE_LINE_START / SPACE_LINE_DIVISION); const double start_fraction = (SPACE_LINE_START / SPACE_LINE_DIVISION);
const double end_fraction = (SPACE_LINE_END / SPACE_LINE_DIVISION); const double end_fraction = (SPACE_LINE_END / SPACE_LINE_DIVISION);

4
gtk/gtktoolbar.h
View File

@ -172,8 +172,8 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
gchar * _gtk_toolbar_elide_underscores (const gchar *original); gchar * _gtk_toolbar_elide_underscores (const gchar *original);
void _gtk_toolbar_paint_space_line (GtkWidget *widget, void _gtk_toolbar_paint_space_line (GtkWidget *widget,
GtkToolbar *toolbar, GtkToolbar *toolbar,
GdkRectangle *area, const GdkRectangle *area,
GtkAllocation *allocation); const GtkAllocation *allocation);
gint _gtk_toolbar_get_default_space_size (void); gint _gtk_toolbar_get_default_space_size (void);

2
gtk/gtktooltip.c
View File

@ -388,7 +388,7 @@ gtk_tooltip_set_custom (GtkTooltip *tooltip,
*/ */
void void
gtk_tooltip_set_tip_area (GtkTooltip *tooltip, gtk_tooltip_set_tip_area (GtkTooltip *tooltip,
GdkRectangle *rect) const GdkRectangle *rect)
{ {
g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); g_return_if_fail (GTK_IS_TOOLTIP (tooltip));

2
gtk/gtktooltip.h
View File

@ -49,7 +49,7 @@ void gtk_tooltip_set_custom (GtkTooltip *tooltip,
GtkWidget *custom_widget); GtkWidget *custom_widget);
void gtk_tooltip_set_tip_area (GtkTooltip *tooltip, void gtk_tooltip_set_tip_area (GtkTooltip *tooltip,
GdkRectangle *rect); const GdkRectangle *rect);
void gtk_tooltip_trigger_tooltip_query (GdkDisplay *display); void gtk_tooltip_trigger_tooltip_query (GdkDisplay *display);

22
gtk/gtktreeprivate.h
View File

@ -366,7 +366,7 @@ void _gtk_tree_view_child_move_resize (GtkTreeView *tree_v
void _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, void _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
GdkRectangle *clip_rect); const GdkRectangle *clip_rect);
void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column); void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column);
void _gtk_tree_view_column_unrealize_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, GtkCellEditable **editable_widget,
GdkEvent *event, GdkEvent *event,
gchar *path_string, gchar *path_string,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
guint flags); guint flags);
void _gtk_tree_view_column_start_editing (GtkTreeViewColumn *tree_column, void _gtk_tree_view_column_start_editing (GtkTreeViewColumn *tree_column,
GtkCellEditable *editable_widget); GtkCellEditable *editable_widget);
@ -409,13 +409,13 @@ gboolean _gtk_tree_selection_row_is_selectable (GtkTreeSelection *sele
void _gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column, void _gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column,
GdkWindow *window, GdkWindow *window,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *expose_area, const GdkRectangle *expose_area,
guint flags); guint flags);
void _gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column, void _gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *focus_area); GdkRectangle *focus_area);
gboolean _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column, gboolean _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column,
gint direction, gint direction,
@ -423,9 +423,9 @@ gboolean _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_colum
gboolean right); gboolean right);
void _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column, void _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column,
GdkWindow *window, GdkWindow *window,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *expose_area, const GdkRectangle *expose_area,
guint flags); guint flags);
void _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column, void _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
gboolean install_handler); gboolean install_handler);

10
gtk/gtktreeview.c
View File

@ -321,11 +321,11 @@ static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView
GtkRBTree *tree); GtkRBTree *tree);
static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GdkRectangle *clip_rect); const GdkRectangle *clip_rect);
static void gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, static void gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
GdkRectangle *clip_rect); const GdkRectangle *clip_rect);
static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view, static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
@ -9426,7 +9426,7 @@ static void
gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
GdkRectangle *clip_rect) const GdkRectangle *clip_rect)
{ {
GdkRectangle rect; GdkRectangle rect;
@ -9457,7 +9457,7 @@ void
_gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
GdkRectangle *clip_rect) const GdkRectangle *clip_rect)
{ {
GdkRectangle rect; GdkRectangle rect;
@ -9487,7 +9487,7 @@ _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
static void static void
gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GdkRectangle *clip_rect) const GdkRectangle *clip_rect)
{ {
GtkRBTree *tree = NULL; GtkRBTree *tree = NULL;
GtkRBNode *node = NULL; GtkRBNode *node = NULL;

28
gtk/gtktreeviewcolumn.c
View File

@ -2569,7 +2569,7 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
**/ **/
void void
gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column, gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
gint *x_offset, gint *x_offset,
gint *y_offset, gint *y_offset,
gint *width, gint *width,
@ -2635,11 +2635,11 @@ enum {
static gboolean static gboolean
gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
GdkWindow *window, GdkWindow *window,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
guint flags, guint flags,
gint action, gint action,
GdkRectangle *expose_area, /* RENDER */ const GdkRectangle *expose_area, /* RENDER */
GdkRectangle *focus_rectangle, /* FOCUS */ GdkRectangle *focus_rectangle, /* FOCUS */
GtkCellEditable **editable_widget, /* EVENT */ GtkCellEditable **editable_widget, /* EVENT */
GdkEvent *event, /* EVENT */ GdkEvent *event, /* EVENT */
@ -3115,9 +3115,9 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
void void
_gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column, _gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column,
GdkWindow *window, GdkWindow *window,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *expose_area, const GdkRectangle *expose_area,
guint flags) guint flags)
{ {
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column)); g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
@ -3140,8 +3140,8 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column,
GtkCellEditable **editable_widget, GtkCellEditable **editable_widget,
GdkEvent *event, GdkEvent *event,
gchar *path_string, gchar *path_string,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
guint flags) guint flags)
{ {
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE); g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
@ -3160,8 +3160,8 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column,
void void
_gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column, _gtk_tree_view_column_get_focus_area (GtkTreeViewColumn *tree_column,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *focus_area) GdkRectangle *focus_area)
{ {
gtk_tree_view_column_cell_process_action (tree_column, gtk_tree_view_column_cell_process_action (tree_column,
@ -3427,9 +3427,9 @@ _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column,
void void
_gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column, _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column,
GdkWindow *window, GdkWindow *window,
GdkRectangle *background_area, const GdkRectangle *background_area,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *expose_area, const GdkRectangle *expose_area,
guint flags) guint flags)
{ {
gint focus_line_width; gint focus_line_width;

2
gtk/gtktreeviewcolumn.h
View File

@ -218,7 +218,7 @@ void gtk_tree_view_column_cell_set_cell_data (GtkTreeViewCol
gboolean is_expander, gboolean is_expander,
gboolean is_expanded); gboolean is_expanded);
void gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
GdkRectangle *cell_area, const GdkRectangle *cell_area,
gint *x_offset, gint *x_offset,
gint *y_offset, gint *y_offset,
gint *width, gint *width,

6
gtk/gtkwidget.c
View File

@ -3579,7 +3579,7 @@ gtk_widget_queue_resize_no_redraw (GtkWidget *widget)
**/ **/
void void
gtk_widget_draw (GtkWidget *widget, gtk_widget_draw (GtkWidget *widget,
GdkRectangle *area) const GdkRectangle *area)
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
@ -4878,7 +4878,7 @@ gtk_widget_reparent (GtkWidget *widget,
**/ **/
gboolean gboolean
gtk_widget_intersect (GtkWidget *widget, gtk_widget_intersect (GtkWidget *widget,
GdkRectangle *area, const GdkRectangle *area,
GdkRectangle *intersection) GdkRectangle *intersection)
{ {
GdkRectangle *dest; GdkRectangle *dest;
@ -4923,7 +4923,7 @@ gtk_widget_intersect (GtkWidget *widget,
**/ **/
GdkRegion * GdkRegion *
gtk_widget_region_intersect (GtkWidget *widget, gtk_widget_region_intersect (GtkWidget *widget,
GdkRegion *region) const GdkRegion *region)
{ {
GdkRectangle rect; GdkRectangle rect;
GdkRegion *dest; GdkRegion *dest;

6
gtk/gtkwidget.h
View File

@ -489,7 +489,7 @@ void gtk_widget_queue_resize (GtkWidget *widget);
void gtk_widget_queue_resize_no_redraw (GtkWidget *widget); void gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
void gtk_widget_draw (GtkWidget *widget, void gtk_widget_draw (GtkWidget *widget,
GdkRectangle *area); const GdkRectangle *area);
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
void gtk_widget_size_request (GtkWidget *widget, void gtk_widget_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
@ -530,10 +530,10 @@ gboolean gtk_widget_set_scroll_adjustments (GtkWidget *widget,
void gtk_widget_reparent (GtkWidget *widget, void gtk_widget_reparent (GtkWidget *widget,
GtkWidget *new_parent); GtkWidget *new_parent);
gboolean gtk_widget_intersect (GtkWidget *widget, gboolean gtk_widget_intersect (GtkWidget *widget,
GdkRectangle *area, const GdkRectangle *area,
GdkRectangle *intersection); GdkRectangle *intersection);
GdkRegion *gtk_widget_region_intersect (GtkWidget *widget, GdkRegion *gtk_widget_region_intersect (GtkWidget *widget,
GdkRegion *region); const GdkRegion *region);
void gtk_widget_freeze_child_notify (GtkWidget *widget); void gtk_widget_freeze_child_notify (GtkWidget *widget);
void gtk_widget_child_notify (GtkWidget *widget, void gtk_widget_child_notify (GtkWidget *widget,