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.

12
gtk/gtkbutton.c
View File

@ -1217,12 +1217,12 @@ 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,
const gchar *default_detail) const gchar *default_detail)
{ {
GtkWidget *widget; GtkWidget *widget;
gint width, height; gint width, height;

16
gtk/gtkbutton.h
View File

@ -125,14 +125,14 @@ void gtk_button_set_image_position (GtkButton *button,
GtkPositionType position); GtkPositionType position);
GtkPositionType gtk_button_get_image_position (GtkButton *button); 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,
const gchar *default_detail); const gchar *default_detail);
G_END_DECLS G_END_DECLS

52
gtk/gtkcellrenderer.c
View File

@ -479,13 +479,13 @@ set_cell_bg_color (GtkCellRenderer *cell,
* in @x_offset and @y_offset are inclusive of the xpad and ypad properties. * in @x_offset and @y_offset are inclusive of the xpad and ypad properties.
**/ **/
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,
gint *height) gint *height)
{ {
gint *real_width = width; gint *real_width = width;
gint *real_height = height; gint *real_height = height;
@ -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,
@ -533,13 +533,13 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell,
* @window. @expose_area is a clip rectangle. * @window. @expose_area is a clip rectangle.
**/ **/
void 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;
GtkCellRendererPrivate *priv = GTK_CELL_RENDERER_GET_PRIVATE (cell); 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, 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,

6
gtk/gtkimcontext.c
View File

@ -361,8 +361,8 @@ gtk_im_context_reset (GtkIMContext *context)
* window. * window.
**/ **/
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);
} }
/** /**

50
gtk/gtkimcontext.h
View File

@ -94,31 +94,31 @@ struct _GtkIMContextClass
GType gtk_im_context_get_type (void) G_GNUC_CONST; GType gtk_im_context_get_type (void) G_GNUC_CONST;
void gtk_im_context_set_client_window (GtkIMContext *context, void gtk_im_context_set_client_window (GtkIMContext *context,
GdkWindow *window); GdkWindow *window);
void gtk_im_context_get_preedit_string (GtkIMContext *context, void gtk_im_context_get_preedit_string (GtkIMContext *context,
gchar **str, gchar **str,
PangoAttrList **attrs, PangoAttrList **attrs,
gint *cursor_pos); gint *cursor_pos);
gboolean gtk_im_context_filter_keypress (GtkIMContext *context, gboolean gtk_im_context_filter_keypress (GtkIMContext *context,
GdkEventKey *event); GdkEventKey *event);
void gtk_im_context_focus_in (GtkIMContext *context); 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,
const gchar *text, const gchar *text,
gint len, gint len,
gint cursor_index); gint cursor_index);
gboolean gtk_im_context_get_surrounding (GtkIMContext *context, gboolean gtk_im_context_get_surrounding (GtkIMContext *context,
gchar **text, gchar **text,
gint *cursor_index); gint *cursor_index);
gboolean gtk_im_context_delete_surrounding (GtkIMContext *context, gboolean gtk_im_context_delete_surrounding (GtkIMContext *context,
gint offset, gint offset,
gint n_chars); gint n_chars);
G_END_DECLS G_END_DECLS

614
gtk/gtkstyle.c
View File

@ -1993,15 +1993,15 @@ gtk_style_render_icon (GtkStyle *style,
/* Default functions */ /* Default functions */
void void
gtk_style_apply_default_background (GtkStyle *style, 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,
gint height) gint height)
{ {
GdkRectangle new_rect, old_rect; 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, scale_or_ref (GdkPixbuf *src,
gint width, gint width,
gint height) gint height)
{ {
if (width == gdk_pixbuf_get_width (src) && if (width == gdk_pixbuf_get_width (src) &&
height == gdk_pixbuf_get_height (src)) height == gdk_pixbuf_get_height (src))
@ -3383,10 +3383,10 @@ 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;
GdkColor shaded = *color; GdkColor shaded = *color;
@ -5404,9 +5404,9 @@ 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)
{ {
gdouble red; gdouble red;
gdouble green; gdouble green;
@ -5605,21 +5605,23 @@ hls_to_rgb (gdouble *h,
* using the given style and state. * using the given style and state.
**/ **/
void 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,
gint x2, gint x2,
gint y) gint y)
{ {
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_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);
} }
/** /**
@ -5639,21 +5641,23 @@ gtk_paint_hline (GtkStyle *style,
* using the given style and state. * using the given style and state.
*/ */
void 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_,
gint y2_, gint y2_,
gint x) gint x)
{ {
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_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);
} }
/** /**
@ -5675,23 +5679,25 @@ gtk_paint_vline (GtkStyle *style,
* using the given style and state and shadow type. * using the given style and state and shadow type.
*/ */
void void
gtk_paint_shadow (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -5711,22 +5717,24 @@ gtk_paint_shadow (GtkStyle *style,
* Draws a polygon on @window with the given parameters. * Draws a polygon on @window with the given parameters.
*/ */
void void
gtk_paint_polygon (GtkStyle *style, 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);
} }
/** /**
@ -5750,25 +5758,27 @@ gtk_paint_polygon (GtkStyle *style,
* parameters. @arrow_type determines the direction of the arrow. * parameters. @arrow_type determines the direction of the arrow.
*/ */
void void
gtk_paint_arrow (GtkStyle *style, 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,
gboolean fill, gboolean fill,
gint x, gint x,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -5790,23 +5800,25 @@ gtk_paint_arrow (GtkStyle *style,
* parameters. * parameters.
*/ */
void void
gtk_paint_diamond (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -5827,21 +5839,23 @@ gtk_paint_diamond (GtkStyle *style,
* Deprecated: Use gtk_paint_layout() instead. * Deprecated: Use gtk_paint_layout() instead.
*/ */
void 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,
gint y, gint y,
const gchar *string) const gchar *string)
{ {
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_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);
} }
/** /**
@ -5862,23 +5876,25 @@ gtk_paint_string (GtkStyle *style,
* Draws a box on @window with the given parameters. * Draws a box on @window with the given parameters.
*/ */
void void
gtk_paint_box (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -5899,23 +5915,25 @@ gtk_paint_box (GtkStyle *style,
* Draws a flat box on @window with the given parameters. * Draws a flat box on @window with the given parameters.
*/ */
void void
gtk_paint_flat_box (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -5937,23 +5955,25 @@ gtk_paint_flat_box (GtkStyle *style,
* the given parameters. * the given parameters.
*/ */
void void
gtk_paint_check (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -5975,23 +5995,25 @@ gtk_paint_check (GtkStyle *style,
* the given parameters. * the given parameters.
*/ */
void void
gtk_paint_option (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -6013,23 +6035,25 @@ gtk_paint_option (GtkStyle *style,
* in the given rectangle on @window using the given parameters. * in the given rectangle on @window using the given parameters.
*/ */
void void
gtk_paint_tab (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -6055,26 +6079,28 @@ gtk_paint_tab (GtkStyle *style,
* gap in one side. * gap in one side.
*/ */
void void
gtk_paint_shadow_gap (GtkStyle *style, 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,
gint height, gint height,
GtkPositionType gap_side, GtkPositionType gap_side,
gint gap_x, gint gap_x,
gint gap_width) gint gap_width)
{ {
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_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);
} }
@ -6100,26 +6126,28 @@ gtk_paint_shadow_gap (GtkStyle *style,
* leaving a gap in one side. * leaving a gap in one side.
*/ */
void void
gtk_paint_box_gap (GtkStyle *style, 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,
gint height, gint height,
GtkPositionType gap_side, GtkPositionType gap_side,
gint gap_x, gint gap_x,
gint gap_width) gint gap_width)
{ {
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_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);
} }
/** /**
@ -6141,24 +6169,26 @@ gtk_paint_box_gap (GtkStyle *style,
* Draws an extension, i.e. a notebook tab. * Draws an extension, i.e. a notebook tab.
**/ **/
void void
gtk_paint_extension (GtkStyle *style, 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,
gint height, gint height,
GtkPositionType gap_side) GtkPositionType gap_side)
{ {
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_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);
} }
/** /**
@ -6179,22 +6209,24 @@ gtk_paint_extension (GtkStyle *style,
* given style. * given style.
*/ */
void 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,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
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_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);
} }
/** /**
@ -6217,24 +6249,26 @@ gtk_paint_focus (GtkStyle *style,
* given style and orientation. * given style and orientation.
**/ **/
void void
gtk_paint_slider (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height, gint height,
GtkOrientation orientation) GtkOrientation orientation)
{ {
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_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);
} }
/** /**
@ -6256,24 +6290,26 @@ gtk_paint_slider (GtkStyle *style,
* Draws a handle as used in #GtkHandleBox and #GtkPaned. * Draws a handle as used in #GtkHandleBox and #GtkPaned.
**/ **/
void void
gtk_paint_handle (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height, gint height,
GtkOrientation orientation) GtkOrientation orientation)
{ {
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_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);
} }
/** /**
@ -6302,22 +6338,23 @@ gtk_paint_handle (GtkStyle *style,
* expanded position. * expanded position.
**/ **/
void 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,
gint y, gint y,
GtkExpanderStyle expander_style) GtkExpanderStyle expander_style)
{ {
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_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);
} }
/** /**
@ -6338,23 +6375,24 @@ gtk_paint_expander (GtkStyle *style,
* Draws a layout on @window using the given parameters. * Draws a layout on @window using the given parameters.
**/ **/
void void
gtk_paint_layout (GtkStyle *style, 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)
{ {
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_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);
} }
/** /**
@ -6376,17 +6414,17 @@ gtk_paint_layout (GtkStyle *style,
* parameters. * parameters.
*/ */
void 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,
gint x, gint x,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
g_return_if_fail (GTK_IS_STYLE (style)); 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)); 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);
} }
@ -6590,8 +6628,8 @@ style_unrealize_cursor_gcs (GtkStyle *style)
} }
static GdkGC * static GdkGC *
make_cursor_gc (GtkWidget *widget, make_cursor_gc (GtkWidget *widget,
const gchar *property_name, const gchar *property_name,
const GdkColor *fallback) const GdkColor *fallback)
{ {
GdkGCValues gc_values; GdkGCValues gc_values;
@ -6703,12 +6741,12 @@ _gtk_widget_get_cursor_color (GtkWidget *widget,
} }
static void 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)
{ {
gint stem_width; gint stem_width;
gint arrow_width; gint arrow_width;
@ -6787,13 +6825,13 @@ draw_insertion_cursor (GtkWidget *widget,
* Since: 2.4 * Since: 2.4
**/ **/
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)
{ {
GdkGC *gc; GdkGC *gc;

499
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,
@ -630,229 +630,228 @@ void gtk_draw_resize_grip (GtkStyle *style,
gint height); gint height);
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
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,
gint x2, gint x2,
gint y); gint y);
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_,
gint y2_, gint y2_,
gint x); gint x);
void gtk_paint_shadow (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_polygon (GtkStyle *style, 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,
gboolean fill, gboolean fill,
gint x, gint x,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_diamond (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_box (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_flat_box (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_check (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_option (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_tab (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_shadow_gap (GtkStyle *style, 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,
gint height, gint height,
GtkPositionType gap_side, GtkPositionType gap_side,
gint gap_x, gint gap_x,
gint gap_width); gint gap_width);
void gtk_paint_box_gap (GtkStyle *style, 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,
gint height, gint height,
GtkPositionType gap_side, GtkPositionType gap_side,
gint gap_x, gint gap_x,
gint gap_width); gint gap_width);
void gtk_paint_extension (GtkStyle *style, 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,
gint height, gint height,
GtkPositionType gap_side); GtkPositionType gap_side);
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,
gint y, gint y,
gint width, gint width,
gint height); gint height);
void gtk_paint_slider (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height, gint height,
GtkOrientation orientation); GtkOrientation orientation);
void gtk_paint_handle (GtkStyle *style, 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,
gint y, gint y,
gint width, gint width,
gint height, gint height,
GtkOrientation orientation); GtkOrientation orientation);
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,
gint y, gint y,
GtkExpanderStyle expander_style); GtkExpanderStyle expander_style);
void gtk_paint_layout (GtkStyle *style, 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, const GdkRectangle *area,
GdkRectangle *area, GtkWidget *widget,
GtkWidget *widget, const gchar *detail,
const gchar *detail, GdkWindowEdge edge,
GdkWindowEdge edge, gint x,
gint x, gint y,
gint y, gint width,
gint width, gint height);
gint height);
GType gtk_border_get_type (void) G_GNUC_CONST; 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, 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);
/* deprecated */ /* deprecated */
#ifndef GTK_DISABLE_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) #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, void gtk_draw_string (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,
gint x, gint x,
gint y, gint y,
const gchar *string); const gchar *string);
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,
gint y, gint y,
const gchar *string); const gchar *string);
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
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);
GdkGC *_gtk_widget_get_cursor_gc (GtkWidget *widget); GdkGC *_gtk_widget_get_cursor_gc (GtkWidget *widget);
void _gtk_widget_get_cursor_color (GtkWidget *widget, void _gtk_widget_get_cursor_color (GtkWidget *widget,
GdkColor *color); GdkColor *color);
G_END_DECLS G_END_DECLS

8
gtk/gtktoolbar.c
View File

@ -4840,10 +4840,10 @@ _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);

10
gtk/gtktoolbar.h
View File

@ -169,11 +169,11 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
gint index_); gint index_);
/* internal functions */ /* internal functions */
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);

4
gtk/gtktooltip.c
View File

@ -387,8 +387,8 @@ gtk_tooltip_set_custom (GtkTooltip *tooltip,
* Since: 2.12 * Since: 2.12
*/ */
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));

44
gtk/gtktooltip.h
View File

@ -33,32 +33,32 @@ G_BEGIN_DECLS
GType gtk_tooltip_get_type (void); GType gtk_tooltip_get_type (void);
void gtk_tooltip_set_markup (GtkTooltip *tooltip, void gtk_tooltip_set_markup (GtkTooltip *tooltip,
const gchar *markup); const gchar *markup);
void gtk_tooltip_set_text (GtkTooltip *tooltip, void gtk_tooltip_set_text (GtkTooltip *tooltip,
const gchar *text); const gchar *text);
void gtk_tooltip_set_icon (GtkTooltip *tooltip, void gtk_tooltip_set_icon (GtkTooltip *tooltip,
GdkPixbuf *pixbuf); GdkPixbuf *pixbuf);
void gtk_tooltip_set_icon_from_stock (GtkTooltip *tooltip, void gtk_tooltip_set_icon_from_stock (GtkTooltip *tooltip,
const gchar *stock_id, const gchar *stock_id,
GtkIconSize size); GtkIconSize size);
void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip,
const gchar *icon_name, const gchar *icon_name,
GtkIconSize size); GtkIconSize size);
void gtk_tooltip_set_custom (GtkTooltip *tooltip, 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);
void _gtk_tooltip_focus_in (GtkWidget *widget); void _gtk_tooltip_focus_in (GtkWidget *widget);
void _gtk_tooltip_focus_out (GtkWidget *widget); void _gtk_tooltip_focus_out (GtkWidget *widget);
void _gtk_tooltip_toggle_keyboard_mode (GtkWidget *widget); void _gtk_tooltip_toggle_keyboard_mode (GtkWidget *widget);
void _gtk_tooltip_handle_event (GdkEvent *event); void _gtk_tooltip_handle_event (GdkEvent *event);
void _gtk_tooltip_hide (GtkWidget *widget); void _gtk_tooltip_hide (GtkWidget *widget);
G_END_DECLS G_END_DECLS

50
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);
@ -407,28 +407,28 @@ gboolean _gtk_tree_selection_row_is_selectable (GtkTreeSelection *sele
GtkRBNode *node, GtkRBNode *node,
GtkTreePath *path); GtkTreePath *path);
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,
gboolean left, gboolean left,
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);
void _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column, void _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
GtkCellRenderer *cell, GtkCellRenderer *cell,
gint *left, gint *left,

190
gtk/gtktreeview.c
View File

@ -309,90 +309,90 @@ static void gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view);
static void invalidate_empty_focus (GtkTreeView *tree_view); static void invalidate_empty_focus (GtkTreeView *tree_view);
/* Internal functions */ /* Internal functions */
static gboolean gtk_tree_view_is_expander_column (GtkTreeView *tree_view, static gboolean gtk_tree_view_is_expander_column (GtkTreeView *tree_view,
GtkTreeViewColumn *column); GtkTreeViewColumn *column);
static void gtk_tree_view_add_move_binding (GtkBindingSet *binding_set, static void gtk_tree_view_add_move_binding (GtkBindingSet *binding_set,
guint keyval, guint keyval,
guint modmask, guint modmask,
gboolean add_shifted_binding, gboolean add_shifted_binding,
GtkMovementStep step, GtkMovementStep step,
gint count); gint count);
static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view, static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view,
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,
gint x, gint x,
gint y); gint y);
static void gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view, static void gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
gint *x1, gint *x1,
gint *x2); gint *x2);
static gint gtk_tree_view_new_column_width (GtkTreeView *tree_view, static gint gtk_tree_view_new_column_width (GtkTreeView *tree_view,
gint i, gint i,
gint *x); gint *x);
static void gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment, static void gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
GtkTreeView *tree_view); GtkTreeView *tree_view);
static void gtk_tree_view_build_tree (GtkTreeView *tree_view, static void gtk_tree_view_build_tree (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkTreeIter *iter, GtkTreeIter *iter,
gint depth, gint depth,
gboolean recurse); gboolean recurse);
static gboolean gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view, static gboolean gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view,
GtkTreeIter *iter, GtkTreeIter *iter,
gint depth, gint depth,
gint *height, gint *height,
GtkRBNode *node); GtkRBNode *node);
static void gtk_tree_view_discover_dirty (GtkTreeView *tree_view, static void gtk_tree_view_discover_dirty (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkTreeIter *iter, GtkTreeIter *iter,
gint depth); gint depth);
static void gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view, static void gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node); GtkRBNode *node);
static void gtk_tree_view_clamp_column_visible (GtkTreeView *tree_view, static void gtk_tree_view_clamp_column_visible (GtkTreeView *tree_view,
GtkTreeViewColumn *column, GtkTreeViewColumn *column,
gboolean focus_to_cell); gboolean focus_to_cell);
static gboolean gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view, static gboolean gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view,
GdkEventMotion *event); GdkEventMotion *event);
static void gtk_tree_view_focus_to_cursor (GtkTreeView *tree_view); static void gtk_tree_view_focus_to_cursor (GtkTreeView *tree_view);
static void gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view, static void gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
gint count); gint count);
static void gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view, static void gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
gint count); gint count);
static void gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view, static void gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
gint count); gint count);
static void gtk_tree_view_move_cursor_start_end (GtkTreeView *tree_view, static void gtk_tree_view_move_cursor_start_end (GtkTreeView *tree_view,
gint count); gint count);
static gboolean gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, static gboolean gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
gboolean animate); gboolean animate);
static gboolean gtk_tree_view_real_expand_row (GtkTreeView *tree_view, static gboolean gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
gboolean open_all, gboolean open_all,
gboolean animate); gboolean animate);
static void gtk_tree_view_real_set_cursor (GtkTreeView *tree_view, static void gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
gboolean clear_and_select, gboolean clear_and_select,
gboolean clamp_node); gboolean clamp_node);
static gboolean gtk_tree_view_has_special_cell (GtkTreeView *tree_view); static gboolean gtk_tree_view_has_special_cell (GtkTreeView *tree_view);
static void column_sizing_notify (GObject *object, static void column_sizing_notify (GObject *object,
GParamSpec *pspec, GParamSpec *pspec,
gpointer data); gpointer data);
static gboolean expand_collapse_timeout (gpointer data); static gboolean expand_collapse_timeout (gpointer data);
static gboolean do_expand_collapse (GtkTreeView *tree_view); static gboolean do_expand_collapse (GtkTreeView *tree_view);
static void gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view); static void gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view);
/* interactive search */ /* interactive search */
static void gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view); 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 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;
@ -9454,10 +9454,10 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
} }
void 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;
@ -9485,9 +9485,9 @@ _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;

54
gtk/gtktreeviewcolumn.c
View File

@ -2568,12 +2568,12 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
* primarily by the #GtkTreeView. * primarily by the #GtkTreeView.
**/ **/
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,
gint *height) gint *height)
{ {
GList *list; GList *list;
gboolean first_cell = TRUE; gboolean first_cell = TRUE;
@ -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 */
@ -3113,12 +3113,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
* #GtkTreeView. * #GtkTreeView.
**/ **/
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));
g_return_if_fail (background_area != NULL); g_return_if_fail (background_area != NULL);
@ -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);
@ -3159,10 +3159,10 @@ _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,
NULL, NULL,
@ -3425,12 +3425,12 @@ _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;
GtkStateType cell_state; GtkStateType cell_state;

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,

14
gtk/gtkwidget.c
View File

@ -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. * a better choice if you want to draw a region of a 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));
@ -4877,9 +4877,9 @@ gtk_widget_reparent (GtkWidget *widget,
* Return value: %TRUE if there was an intersection * Return value: %TRUE if there was an intersection
**/ **/
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;
GdkRectangle tmp; GdkRectangle tmp;
@ -4922,8 +4922,8 @@ gtk_widget_intersect (GtkWidget *widget,
* check. * check.
**/ **/
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,