Commit 1bca6349 authored by Tristan Van Berkom's avatar Tristan Van Berkom

Mass rename GtkCellAreaIter --> GtkCellAreaContext

parent bef95590
...@@ -170,8 +170,8 @@ gtk_public_h_sources = \ ...@@ -170,8 +170,8 @@ gtk_public_h_sources = \
gtkcalendar.h \ gtkcalendar.h \
gtkcellarea.h \ gtkcellarea.h \
gtkcellareabox.h \ gtkcellareabox.h \
gtkcellareaboxiter.h \ gtkcellareaboxcontext.h \
gtkcellareaiter.h \ gtkcellareacontext.h \
gtkcelleditable.h \ gtkcelleditable.h \
gtkcelllayout.h \ gtkcelllayout.h \
gtkcellrenderer.h \ gtkcellrenderer.h \
...@@ -436,8 +436,8 @@ gtk_base_c_sources = \ ...@@ -436,8 +436,8 @@ gtk_base_c_sources = \
gtkcalendar.c \ gtkcalendar.c \
gtkcellarea.c \ gtkcellarea.c \
gtkcellareabox.c \ gtkcellareabox.c \
gtkcellareaboxiter.c \ gtkcellareaboxcontext.c \
gtkcellareaiter.c \ gtkcellareacontext.c \
gtkcelleditable.c \ gtkcelleditable.c \
gtkcelllayout.c \ gtkcelllayout.c \
gtkcellrenderer.c \ gtkcellrenderer.c \
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include <gtk/gtkcalendar.h> #include <gtk/gtkcalendar.h>
#include <gtk/gtkcellarea.h> #include <gtk/gtkcellarea.h>
#include <gtk/gtkcellareabox.h> #include <gtk/gtkcellareabox.h>
#include <gtk/gtkcellareaiter.h> #include <gtk/gtkcellareacontext.h>
#include <gtk/gtkcelleditable.h> #include <gtk/gtkcelleditable.h>
#include <gtk/gtkcelllayout.h> #include <gtk/gtkcelllayout.h>
#include <gtk/gtkcellrenderer.h> #include <gtk/gtkcellrenderer.h>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkcellarea.h" #include "gtkcellarea.h"
#include "gtkcellareaiter.h" #include "gtkcellareacontext.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"
...@@ -51,26 +51,26 @@ static void gtk_cell_area_get_property (GObject ...@@ -51,26 +51,26 @@ static void gtk_cell_area_get_property (GObject
/* GtkCellAreaClass */ /* GtkCellAreaClass */
static gint gtk_cell_area_real_event (GtkCellArea *area, static gint gtk_cell_area_real_event (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
static void gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea *area, static void gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint width, gint width,
gint *minimum_height, gint *minimum_height,
gint *natural_height); gint *natural_height);
static void gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea *area, static void gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint height, gint height,
gint *minimum_width, gint *minimum_width,
gint *natural_width); gint *natural_width);
static gboolean gtk_cell_area_real_can_focus (GtkCellArea *area); static gboolean gtk_cell_area_real_can_focus (GtkCellArea *area);
static gboolean gtk_cell_area_real_activate (GtkCellArea *area, static gboolean gtk_cell_area_real_activate (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
...@@ -274,7 +274,7 @@ gtk_cell_area_class_init (GtkCellAreaClass *class) ...@@ -274,7 +274,7 @@ gtk_cell_area_class_init (GtkCellAreaClass *class)
class->render = NULL; class->render = NULL;
/* geometry */ /* geometry */
class->create_iter = NULL; class->create_context = NULL;
class->get_request_mode = NULL; class->get_request_mode = NULL;
class->get_preferred_width = NULL; class->get_preferred_width = NULL;
class->get_preferred_height = NULL; class->get_preferred_height = NULL;
...@@ -610,7 +610,7 @@ gtk_cell_area_get_property (GObject *object, ...@@ -610,7 +610,7 @@ gtk_cell_area_get_property (GObject *object,
*************************************************************/ *************************************************************/
static gint static gint
gtk_cell_area_real_event (GtkCellArea *area, gtk_cell_area_real_event (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
...@@ -635,26 +635,26 @@ gtk_cell_area_real_event (GtkCellArea *area, ...@@ -635,26 +635,26 @@ gtk_cell_area_real_event (GtkCellArea *area,
static void static void
gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea *area, gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint width, gint width,
gint *minimum_height, gint *minimum_height,
gint *natural_height) gint *natural_height)
{ {
/* If the area doesnt do height-for-width, fallback on base preferred height */ /* If the area doesnt do height-for-width, fallback on base preferred height */
GTK_CELL_AREA_GET_CLASS (area)->get_preferred_width (area, iter, widget, minimum_height, natural_height); GTK_CELL_AREA_GET_CLASS (area)->get_preferred_width (area, context, widget, minimum_height, natural_height);
} }
static void static void
gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea *area, gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint height, gint height,
gint *minimum_width, gint *minimum_width,
gint *natural_width) gint *natural_width)
{ {
/* If the area doesnt do width-for-height, fallback on base preferred width */ /* If the area doesnt do width-for-height, fallback on base preferred width */
GTK_CELL_AREA_GET_CLASS (area)->get_preferred_width (area, iter, widget, minimum_width, natural_width); GTK_CELL_AREA_GET_CLASS (area)->get_preferred_width (area, context, widget, minimum_width, natural_width);
} }
static void static void
...@@ -684,7 +684,7 @@ gtk_cell_area_real_can_focus (GtkCellArea *area) ...@@ -684,7 +684,7 @@ gtk_cell_area_real_can_focus (GtkCellArea *area)
static gboolean static gboolean
gtk_cell_area_real_activate (GtkCellArea *area, gtk_cell_area_real_activate (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
...@@ -696,7 +696,7 @@ gtk_cell_area_real_activate (GtkCellArea *area, ...@@ -696,7 +696,7 @@ gtk_cell_area_real_activate (GtkCellArea *area,
{ {
/* Get the allocation of the focused cell. /* Get the allocation of the focused cell.
*/ */
gtk_cell_area_get_cell_allocation (area, iter, widget, priv->focus_cell, gtk_cell_area_get_cell_allocation (area, context, widget, priv->focus_cell,
cell_area, &background_area); cell_area, &background_area);
/* Activate or Edit the currently focused cell /* Activate or Edit the currently focused cell
...@@ -980,7 +980,7 @@ gtk_cell_area_forall (GtkCellArea *area, ...@@ -980,7 +980,7 @@ gtk_cell_area_forall (GtkCellArea *area,
/** /**
* gtk_cell_area_get_cell_allocation: * gtk_cell_area_get_cell_allocation:
* @area: a #GtkCellArea * @area: a #GtkCellArea
* @iter: the #GtkCellAreaIter used to hold sizes for @area. * @context: the #GtkCellAreaContext used to hold sizes for @area.
* @widget: the #GtkWidget that @area is rendering on * @widget: the #GtkWidget that @area is rendering on
* @renderer: the #GtkCellRenderer to get the allocation for * @renderer: the #GtkCellRenderer to get the allocation for
* @cell_area: the whole allocated area for @area in @widget * @cell_area: the whole allocated area for @area in @widget
...@@ -992,7 +992,7 @@ gtk_cell_area_forall (GtkCellArea *area, ...@@ -992,7 +992,7 @@ gtk_cell_area_forall (GtkCellArea *area,
*/ */
void void
gtk_cell_area_get_cell_allocation (GtkCellArea *area, gtk_cell_area_get_cell_allocation (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GtkCellRenderer *renderer, GtkCellRenderer *renderer,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
...@@ -1001,7 +1001,7 @@ gtk_cell_area_get_cell_allocation (GtkCellArea *area, ...@@ -1001,7 +1001,7 @@ gtk_cell_area_get_cell_allocation (GtkCellArea *area,
GtkCellAreaClass *class; GtkCellAreaClass *class;
g_return_if_fail (GTK_IS_CELL_AREA (area)); g_return_if_fail (GTK_IS_CELL_AREA (area));
g_return_if_fail (GTK_IS_CELL_AREA_ITER (iter)); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (cell_area != NULL); g_return_if_fail (cell_area != NULL);
...@@ -1010,7 +1010,7 @@ gtk_cell_area_get_cell_allocation (GtkCellArea *area, ...@@ -1010,7 +1010,7 @@ gtk_cell_area_get_cell_allocation (GtkCellArea *area,
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
if (class->get_cell_allocation) if (class->get_cell_allocation)
class->get_cell_allocation (area, iter, widget, renderer, cell_area, allocation); class->get_cell_allocation (area, context, widget, renderer, cell_area, allocation);
else else
g_warning ("GtkCellAreaClass::get_cell_allocation not implemented for `%s'", g_warning ("GtkCellAreaClass::get_cell_allocation not implemented for `%s'",
g_type_name (G_TYPE_FROM_INSTANCE (area))); g_type_name (G_TYPE_FROM_INSTANCE (area)));
...@@ -1018,7 +1018,7 @@ gtk_cell_area_get_cell_allocation (GtkCellArea *area, ...@@ -1018,7 +1018,7 @@ gtk_cell_area_get_cell_allocation (GtkCellArea *area,
gint gint
gtk_cell_area_event (GtkCellArea *area, gtk_cell_area_event (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
...@@ -1027,7 +1027,7 @@ gtk_cell_area_event (GtkCellArea *area, ...@@ -1027,7 +1027,7 @@ gtk_cell_area_event (GtkCellArea *area,
GtkCellAreaClass *class; GtkCellAreaClass *class;
g_return_val_if_fail (GTK_IS_CELL_AREA (area), 0); g_return_val_if_fail (GTK_IS_CELL_AREA (area), 0);
g_return_val_if_fail (GTK_IS_CELL_AREA_ITER (iter), 0); g_return_val_if_fail (GTK_IS_CELL_AREA_CONTEXT (context), 0);
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0); g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
g_return_val_if_fail (event != NULL, 0); g_return_val_if_fail (event != NULL, 0);
g_return_val_if_fail (cell_area != NULL, 0); g_return_val_if_fail (cell_area != NULL, 0);
...@@ -1035,7 +1035,7 @@ gtk_cell_area_event (GtkCellArea *area, ...@@ -1035,7 +1035,7 @@ gtk_cell_area_event (GtkCellArea *area,
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
if (class->event) if (class->event)
return class->event (area, iter, widget, event, cell_area, flags); return class->event (area, context, widget, event, cell_area, flags);
g_warning ("GtkCellAreaClass::event not implemented for `%s'", g_warning ("GtkCellAreaClass::event not implemented for `%s'",
g_type_name (G_TYPE_FROM_INSTANCE (area))); g_type_name (G_TYPE_FROM_INSTANCE (area)));
...@@ -1044,7 +1044,7 @@ gtk_cell_area_event (GtkCellArea *area, ...@@ -1044,7 +1044,7 @@ gtk_cell_area_event (GtkCellArea *area,
void void
gtk_cell_area_render (GtkCellArea *area, gtk_cell_area_render (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *background_area, const GdkRectangle *background_area,
...@@ -1055,7 +1055,7 @@ gtk_cell_area_render (GtkCellArea *area, ...@@ -1055,7 +1055,7 @@ gtk_cell_area_render (GtkCellArea *area,
GtkCellAreaClass *class; GtkCellAreaClass *class;
g_return_if_fail (GTK_IS_CELL_AREA (area)); g_return_if_fail (GTK_IS_CELL_AREA (area));
g_return_if_fail (GTK_IS_CELL_AREA_ITER (iter)); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (cr != NULL); g_return_if_fail (cr != NULL);
g_return_if_fail (background_area != NULL); g_return_if_fail (background_area != NULL);
...@@ -1064,7 +1064,7 @@ gtk_cell_area_render (GtkCellArea *area, ...@@ -1064,7 +1064,7 @@ gtk_cell_area_render (GtkCellArea *area,
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
if (class->render) if (class->render)
class->render (area, iter, widget, cr, background_area, cell_area, flags, paint_focus); class->render (area, context, widget, cr, background_area, cell_area, flags, paint_focus);
else else
g_warning ("GtkCellAreaClass::render not implemented for `%s'", g_warning ("GtkCellAreaClass::render not implemented for `%s'",
g_type_name (G_TYPE_FROM_INSTANCE (area))); g_type_name (G_TYPE_FROM_INSTANCE (area)));
...@@ -1102,8 +1102,8 @@ gtk_cell_area_get_style_detail (GtkCellArea *area) ...@@ -1102,8 +1102,8 @@ gtk_cell_area_get_style_detail (GtkCellArea *area)
/************************************************************* /*************************************************************
* API: Geometry * * API: Geometry *
*************************************************************/ *************************************************************/
GtkCellAreaIter * GtkCellAreaContext *
gtk_cell_area_create_iter (GtkCellArea *area) gtk_cell_area_create_context (GtkCellArea *area)
{ {
GtkCellAreaClass *class; GtkCellAreaClass *class;
...@@ -1111,10 +1111,10 @@ gtk_cell_area_create_iter (GtkCellArea *area) ...@@ -1111,10 +1111,10 @@ gtk_cell_area_create_iter (GtkCellArea *area)
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
if (class->create_iter) if (class->create_context)
return class->create_iter (area); return class->create_context (area);
g_warning ("GtkCellAreaClass::create_iter not implemented for `%s'", g_warning ("GtkCellAreaClass::create_context not implemented for `%s'",
g_type_name (G_TYPE_FROM_INSTANCE (area))); g_type_name (G_TYPE_FROM_INSTANCE (area)));
return NULL; return NULL;
...@@ -1142,7 +1142,7 @@ gtk_cell_area_get_request_mode (GtkCellArea *area) ...@@ -1142,7 +1142,7 @@ gtk_cell_area_get_request_mode (GtkCellArea *area)
void void
gtk_cell_area_get_preferred_width (GtkCellArea *area, gtk_cell_area_get_preferred_width (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
gint *natural_size) gint *natural_size)
...@@ -1155,7 +1155,7 @@ gtk_cell_area_get_preferred_width (GtkCellArea *area, ...@@ -1155,7 +1155,7 @@ gtk_cell_area_get_preferred_width (GtkCellArea *area,
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
if (class->get_preferred_width) if (class->get_preferred_width)
class->get_preferred_width (area, iter, widget, minimum_size, natural_size); class->get_preferred_width (area, context, widget, minimum_size, natural_size);
else else
g_warning ("GtkCellAreaClass::get_preferred_width not implemented for `%s'", g_warning ("GtkCellAreaClass::get_preferred_width not implemented for `%s'",
g_type_name (G_TYPE_FROM_INSTANCE (area))); g_type_name (G_TYPE_FROM_INSTANCE (area)));
...@@ -1163,7 +1163,7 @@ gtk_cell_area_get_preferred_width (GtkCellArea *area, ...@@ -1163,7 +1163,7 @@ gtk_cell_area_get_preferred_width (GtkCellArea *area,
void void
gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area, gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint width, gint width,
gint *minimum_height, gint *minimum_height,
...@@ -1175,12 +1175,12 @@ gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area, ...@@ -1175,12 +1175,12 @@ gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area,
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
class->get_preferred_height_for_width (area, iter, widget, width, minimum_height, natural_height); class->get_preferred_height_for_width (area, context, widget, width, minimum_height, natural_height);
} }
void void
gtk_cell_area_get_preferred_height (GtkCellArea *area, gtk_cell_area_get_preferred_height (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
gint *natural_size) gint *natural_size)
...@@ -1193,7 +1193,7 @@ gtk_cell_area_get_preferred_height (GtkCellArea *area, ...@@ -1193,7 +1193,7 @@ gtk_cell_area_get_preferred_height (GtkCellArea *area,
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
if (class->get_preferred_height) if (class->get_preferred_height)
class->get_preferred_height (area, iter, widget, minimum_size, natural_size); class->get_preferred_height (area, context, widget, minimum_size, natural_size);
else else
g_warning ("GtkCellAreaClass::get_preferred_height not implemented for `%s'", g_warning ("GtkCellAreaClass::get_preferred_height not implemented for `%s'",
g_type_name (G_TYPE_FROM_INSTANCE (area))); g_type_name (G_TYPE_FROM_INSTANCE (area)));
...@@ -1201,7 +1201,7 @@ gtk_cell_area_get_preferred_height (GtkCellArea *area, ...@@ -1201,7 +1201,7 @@ gtk_cell_area_get_preferred_height (GtkCellArea *area,
void void
gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area, gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint height, gint height,
gint *minimum_width, gint *minimum_width,
...@@ -1213,7 +1213,7 @@ gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area, ...@@ -1213,7 +1213,7 @@ gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area,
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
class = GTK_CELL_AREA_GET_CLASS (area); class = GTK_CELL_AREA_GET_CLASS (area);
class->get_preferred_width_for_height (area, iter, widget, height, minimum_width, natural_width); class->get_preferred_width_for_height (area, context, widget, height, minimum_width, natural_width);
} }
/************************************************************* /*************************************************************
...@@ -1849,7 +1849,7 @@ gtk_cell_area_focus (GtkCellArea *area, ...@@ -1849,7 +1849,7 @@ gtk_cell_area_focus (GtkCellArea *area,
/** /**
* gtk_cell_area_activate: * gtk_cell_area_activate:
* @area: a #GtkCellArea * @area: a #GtkCellArea
* @iter: the #GtkCellAreaIter in context with the current row data * @context: the #GtkCellAreaContext in context with the current row data
* @widget: the #GtkWidget that @area is rendering on * @widget: the #GtkWidget that @area is rendering on
* @cell_area: the size and location of @area relative to @widget's allocation * @cell_area: the size and location of @area relative to @widget's allocation
* @flags: the #GtkCellRendererState flags for @area for this row of data. * @flags: the #GtkCellRendererState flags for @area for this row of data.
...@@ -1862,14 +1862,14 @@ gtk_cell_area_focus (GtkCellArea *area, ...@@ -1862,14 +1862,14 @@ gtk_cell_area_focus (GtkCellArea *area,
*/ */
gboolean gboolean
gtk_cell_area_activate (GtkCellArea *area, gtk_cell_area_activate (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
g_return_val_if_fail (GTK_IS_CELL_AREA (area), FALSE); g_return_val_if_fail (GTK_IS_CELL_AREA (area), FALSE);
return GTK_CELL_AREA_GET_CLASS (area)->activate (area, iter, widget, cell_area, flags); return GTK_CELL_AREA_GET_CLASS (area)->activate (area, context, widget, cell_area, flags);
} }
......
...@@ -44,7 +44,7 @@ G_BEGIN_DECLS ...@@ -44,7 +44,7 @@ G_BEGIN_DECLS
typedef struct _GtkCellArea GtkCellArea; typedef struct _GtkCellArea GtkCellArea;
typedef struct _GtkCellAreaClass GtkCellAreaClass; typedef struct _GtkCellAreaClass GtkCellAreaClass;
typedef struct _GtkCellAreaPrivate GtkCellAreaPrivate; typedef struct _GtkCellAreaPrivate GtkCellAreaPrivate;
typedef struct _GtkCellAreaIter GtkCellAreaIter; typedef struct _GtkCellAreaContext GtkCellAreaContext;
/** /**
* GtkCellCallback: * GtkCellCallback:
...@@ -80,19 +80,19 @@ struct _GtkCellAreaClass ...@@ -80,19 +80,19 @@ struct _GtkCellAreaClass
GtkCellCallback callback, GtkCellCallback callback,
gpointer callback_data); gpointer callback_data);
void (* get_cell_allocation) (GtkCellArea *area, void (* get_cell_allocation) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GtkCellRenderer *renderer, GtkCellRenderer *renderer,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *allocation); GdkRectangle *allocation);
gint (* event) (GtkCellArea *area, gint (* event) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
void (* render) (GtkCellArea *area, void (* render) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *background_area, const GdkRectangle *background_area,
...@@ -101,26 +101,26 @@ struct _GtkCellAreaClass ...@@ -101,26 +101,26 @@ struct _GtkCellAreaClass
gboolean paint_focus); gboolean paint_focus);
/* Geometry */ /* Geometry */
GtkCellAreaIter *(* create_iter) (GtkCellArea *area); GtkCellAreaContext *(* create_context) (GtkCellArea *area);
GtkSizeRequestMode (* get_request_mode) (GtkCellArea *area); GtkSizeRequestMode (* get_request_mode) (GtkCellArea *area);
void (* get_preferred_width) (GtkCellArea *area, void (* get_preferred_width) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
gint *natural_size); gint *natural_size);
void (* get_preferred_height_for_width) (GtkCellArea *area, void (* get_preferred_height_for_width) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint width, gint width,
gint *minimum_height, gint *minimum_height,
gint *natural_height); gint *natural_height);
void (* get_preferred_height) (GtkCellArea *area, void (* get_preferred_height) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
gint *natural_size); gint *natural_size);
void (* get_preferred_width_for_height) (GtkCellArea *area, void (* get_preferred_width_for_height) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint height, gint height,
gint *minimum_width, gint *minimum_width,
...@@ -143,7 +143,7 @@ struct _GtkCellAreaClass ...@@ -143,7 +143,7 @@ struct _GtkCellAreaClass
gboolean (* focus) (GtkCellArea *area, gboolean (* focus) (GtkCellArea *area,
GtkDirectionType direction); GtkDirectionType direction);
gboolean (* activate) (GtkCellArea *area, gboolean (* activate) (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
...@@ -173,19 +173,19 @@ void gtk_cell_area_forall (GtkCellArea ...@@ -173,19 +173,19 @@ void gtk_cell_area_forall (GtkCellArea
GtkCellCallback callback, GtkCellCallback callback,
gpointer callback_data); gpointer callback_data);
void gtk_cell_area_get_cell_allocation (GtkCellArea *area, void gtk_cell_area_get_cell_allocation (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GtkCellRenderer *renderer, GtkCellRenderer *renderer,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GdkRectangle *allocation); GdkRectangle *allocation);
gint gtk_cell_area_event (GtkCellArea *area, gint gtk_cell_area_event (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
void gtk_cell_area_render (GtkCellArea *area, void gtk_cell_area_render (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *background_area, const GdkRectangle *background_area,
...@@ -197,26 +197,26 @@ void gtk_cell_area_set_style_detail (GtkCellArea ...@@ -197,26 +197,26 @@ void gtk_cell_area_set_style_detail (GtkCellArea
G_CONST_RETURN gchar *gtk_cell_area_get_style_detail (GtkCellArea *area); G_CONST_RETURN gchar *gtk_cell_area_get_style_detail (GtkCellArea *area);
/* Geometry */ /* Geometry */
GtkCellAreaIter *gtk_cell_area_create_iter (GtkCellArea *area); GtkCellAreaContext *gtk_cell_area_create_context (GtkCellArea *area);
GtkSizeRequestMode gtk_cell_area_get_request_mode (GtkCellArea *area); GtkSizeRequestMode gtk_cell_area_get_request_mode (GtkCellArea *area);
void gtk_cell_area_get_preferred_width (GtkCellArea *area, void gtk_cell_area_get_preferred_width (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
gint *natural_size); gint *natural_size);
void gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area, void gtk_cell_area_get_preferred_height_for_width (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint width, gint width,
gint *minimum_height, gint *minimum_height,
gint *natural_height); gint *natural_height);
void gtk_cell_area_get_preferred_height (GtkCellArea *area, void gtk_cell_area_get_preferred_height (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
gint *natural_size); gint *natural_size);
void gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area, void gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
gint height, gint height,
gint *minimum_width, gint *minimum_width,
...@@ -284,7 +284,7 @@ gboolean gtk_cell_area_can_focus (GtkCellArea ...@@ -284,7 +284,7 @@ gboolean gtk_cell_area_can_focus (GtkCellArea
gboolean gtk_cell_area_focus (GtkCellArea *area, gboolean gtk_cell_area_focus (GtkCellArea *area,
GtkDirectionType direction); GtkDirectionType direction);
gboolean gtk_cell_area_activate (GtkCellArea *area, gboolean gtk_cell_area_activate (GtkCellArea *area,
GtkCellAreaIter *iter, GtkCellAreaContext *context,
GtkWidget *widget, GtkWidget *widget,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
......
This diff is collapsed.
/* gtkcellareaboxcontext.h
*
* Copyright (C) 2010 Openismus GmbH
*
* Authors:
* Tristan Van Berkom <tristanvb@openismus.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.