[gtk+/rendering-cleanup-next: 152/153] API: gtk_cell_renderer_render_cairo() => gtk_cell_renderer_render()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup-next: 152/153] API: gtk_cell_renderer_render_cairo() => gtk_cell_renderer_render()
- Date: Sat, 11 Sep 2010 05:04:13 +0000 (UTC)
commit ee70c42ee78788a1ecf35ba29cdca13f524edd63
Author: Benjamin Otte <otte redhat com>
Date: Sat Sep 11 03:50:47 2010 +0200
API: gtk_cell_renderer_render_cairo() => gtk_cell_renderer_render()
gtk/gtkcellrenderer.c | 14 +++++++-------
gtk/gtkcellrenderer.h | 2 +-
gtk/gtkcellview.c | 10 +++++-----
gtk/gtkiconview.c | 8 ++++----
gtk/gtktreeviewcolumn.c | 24 ++++++++++++------------
5 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 5a85c38..ca0e157 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -612,7 +612,7 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell,
}
/**
- * gtk_cell_renderer_render_cairo:
+ * gtk_cell_renderer_render:
* @cell: a #GtkCellRenderer
* @cr: a cairo context to draw to
* @widget: the widget owning @window
@@ -630,12 +630,12 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell,
* @window.
**/
void
-gtk_cell_renderer_render_cairo (GtkCellRenderer *cell,
- cairo_t *cr,
- GtkWidget *widget,
- const GdkRectangle *background_area,
- const GdkRectangle *cell_area,
- GtkCellRendererState flags)
+gtk_cell_renderer_render (GtkCellRenderer *cell,
+ cairo_t *cr,
+ GtkWidget *widget,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags)
{
gboolean selected = FALSE;
GtkCellRendererPrivate *priv = cell->priv;
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 2f99dd5..808517f 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -117,7 +117,7 @@ void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
gint *y_offset,
gint *width,
gint *height);
-void gtk_cell_renderer_render_cairo (GtkCellRenderer *cell,
+void gtk_cell_renderer_render (GtkCellRenderer *cell,
cairo_t *cr,
GtkWidget *widget,
const GdkRectangle *background_area,
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 9b55608..2c81c18 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -495,11 +495,11 @@ gtk_cell_view_draw (GtkWidget *widget,
(packing == GTK_PACK_END && !rtl))
area.x -= area.width;
- gtk_cell_renderer_render_cairo (info->cell,
- cr,
- widget,
- /* FIXME! */
- &area, &area, state);
+ gtk_cell_renderer_render (info->cell,
+ cr,
+ widget,
+ /* FIXME! */
+ &area, &area, state);
if ((packing == GTK_PACK_START && !rtl) ||
(packing == GTK_PACK_END && rtl))
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 0b72b99..66d3051 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3244,10 +3244,10 @@ gtk_icon_view_paint_item (GtkIconView *icon_view,
cell_area.x = x - item->x + cell_area.x;
cell_area.y = y - item->y + cell_area.y;
- gtk_cell_renderer_render_cairo (info->cell,
- cr,
- widget,
- &cell_area, &cell_area, flags);
+ gtk_cell_renderer_render (info->cell,
+ cr,
+ widget,
+ &cell_area, &cell_area, flags);
}
if (draw_focus &&
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 341f5ad..f655c06 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2825,12 +2825,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
/* RENDER */
if (action == CELL_ACTION_RENDER)
{
- gtk_cell_renderer_render_cairo (info->cell,
- cr,
- tree_column->tree_view,
- &rtl_background_area,
- &rtl_cell_area,
- flags);
+ gtk_cell_renderer_render (info->cell,
+ cr,
+ tree_column->tree_view,
+ &rtl_background_area,
+ &rtl_cell_area,
+ flags);
}
/* FOCUS */
else if (action == CELL_ACTION_FOCUS)
@@ -2989,12 +2989,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
/* RENDER */
if (action == CELL_ACTION_RENDER)
{
- gtk_cell_renderer_render_cairo (info->cell,
- cr,
- tree_column->tree_view,
- &rtl_background_area,
- &rtl_cell_area,
- flags);
+ gtk_cell_renderer_render (info->cell,
+ cr,
+ tree_column->tree_view,
+ &rtl_background_area,
+ &rtl_cell_area,
+ flags);
}
/* FOCUS */
else if (action == CELL_ACTION_FOCUS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]