[cairo-commit] goocanvas/src goocanvas.c, 1.12, 1.13 goocanvas.h,
1.9, 1.10 goocanvasgroup.c, 1.22, 1.23 goocanvasimage.c, 1.15,
1.16 goocanvasitem.c, 1.24, 1.25 goocanvasitem.h, 1.17,
1.18 goocanvasitemmodel.c, 1.11, 1.12 goocanvasitemmodel.h,
1.9, 1.10 goocanvasitemsimple.c, 1.27,
1.28 goocanvasitemsimple.h, 1.19, 1.20 goocanvaspolyline.c,
1.14, 1.15 goocanvastable.c, 1.11, 1.12 goocanvastext.c, 1.17,
1.18 goocanvasutils.c, 1.12, 1.13 goocanvasutils.h, 1.13,
1.14 goocanvaswidget.c, 1.7, 1.8
Damon Chaplin
commit at pdx.freedesktop.org
Tue Mar 6 05:21:33 PST 2007
Committed by: damon
Update of /cvs/cairo/goocanvas/src
In directory kemper:/tmp/cvs-serv32206/src
Modified Files:
goocanvas.c goocanvas.h goocanvasgroup.c goocanvasimage.c
goocanvasitem.c goocanvasitem.h goocanvasitemmodel.c
goocanvasitemmodel.h goocanvasitemsimple.c
goocanvasitemsimple.h goocanvaspolyline.c goocanvastable.c
goocanvastext.c goocanvasutils.c goocanvasutils.h
goocanvaswidget.c
Log Message:
2007-03-06 Damon Chaplin <damon at gnome.org>
* */*: added 'const' to a number of arguments taking a cairo_matrix_t*
or a GooCanvasBounds*.
Index: goocanvas.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvas.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- goocanvas.c 27 Feb 2007 14:45:08 -0000 1.12
+++ goocanvas.c 6 Mar 2007 13:21:26 -0000 1.13
@@ -888,13 +888,13 @@
static GList*
-goo_canvas_get_items_in_area_recurse (GooCanvas *canvas,
- GooCanvasItem *item,
- GooCanvasBounds *area,
- gboolean inside_area,
- gboolean allow_overlaps,
- gboolean include_containers,
- GList *found_items)
+goo_canvas_get_items_in_area_recurse (GooCanvas *canvas,
+ GooCanvasItem *item,
+ const GooCanvasBounds *area,
+ gboolean inside_area,
+ gboolean allow_overlaps,
+ gboolean include_containers,
+ GList *found_items)
{
GooCanvasBounds bounds;
gboolean completely_inside = FALSE, completely_outside = FALSE;
@@ -968,11 +968,11 @@
* The list should be freed with g_list_free().
**/
GList*
-goo_canvas_get_items_in_area (GooCanvas *canvas,
- GooCanvasBounds *area,
- gboolean inside_area,
- gboolean allow_overlaps,
- gboolean include_containers)
+goo_canvas_get_items_in_area (GooCanvas *canvas,
+ const GooCanvasBounds *area,
+ gboolean inside_area,
+ gboolean allow_overlaps,
+ gboolean include_containers)
{
g_return_val_if_fail (GOO_IS_CANVAS (canvas), NULL);
@@ -1924,8 +1924,8 @@
* Requests that the given bounds be redrawn.
**/
void
-goo_canvas_request_redraw (GooCanvas *canvas,
- GooCanvasBounds *bounds)
+goo_canvas_request_redraw (GooCanvas *canvas,
+ const GooCanvasBounds *bounds)
{
GdkRectangle rect;
@@ -2009,10 +2009,10 @@
* Renders all or part of a canvas to the given cairo context.
**/
void
-goo_canvas_render (GooCanvas *canvas,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale)
+goo_canvas_render (GooCanvas *canvas,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale)
{
/* Set the default line width based on the current units setting. */
cairo_set_line_width (cr, goo_canvas_get_default_line_width (canvas));
Index: goocanvas.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvas.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- goocanvas.h 27 Feb 2007 14:45:08 -0000 1.9
+++ goocanvas.h 6 Mar 2007 13:21:26 -0000 1.10
@@ -187,7 +187,7 @@
gdouble y,
gboolean is_pointer_event);
GList* goo_canvas_get_items_in_area(GooCanvas *canvas,
- GooCanvasBounds *area,
+ const GooCanvasBounds *area,
gboolean inside_area,
gboolean allow_overlaps,
gboolean include_containers);
@@ -214,10 +214,10 @@
void goo_canvas_grab_focus (GooCanvas *canvas,
GooCanvasItem *item);
-void goo_canvas_render (GooCanvas *canvas,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale);
+void goo_canvas_render (GooCanvas *canvas,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale);
/*
* Coordinate conversion.
@@ -269,7 +269,7 @@
void goo_canvas_update (GooCanvas *canvas);
void goo_canvas_request_update (GooCanvas *canvas);
void goo_canvas_request_redraw (GooCanvas *canvas,
- GooCanvasBounds *bounds);
+ const GooCanvasBounds *bounds);
gdouble goo_canvas_get_default_line_width (GooCanvas *canvas);
Index: goocanvasgroup.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasgroup.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- goocanvasgroup.c 27 Feb 2007 01:01:39 -0000 1.22
+++ goocanvasgroup.c 6 Mar 2007 13:21:26 -0000 1.23
@@ -477,10 +477,10 @@
static void
-goo_canvas_group_paint (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale)
+goo_canvas_group_paint (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale)
{
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
GooCanvasItemSimpleData *simple_data = simple->simple_data;
Index: goocanvasimage.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasimage.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- goocanvasimage.c 27 Feb 2007 01:01:39 -0000 1.15
+++ goocanvasimage.c 6 Mar 2007 13:21:26 -0000 1.16
@@ -361,9 +361,9 @@
static void
-goo_canvas_image_paint (GooCanvasItemSimple *simple,
- cairo_t *cr,
- GooCanvasBounds *bounds)
+goo_canvas_image_paint (GooCanvasItemSimple *simple,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds)
{
GooCanvasImage *image = (GooCanvasImage*) simple;
GooCanvasImageData *image_data = image->image_data;
Index: goocanvasitem.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitem.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- goocanvasitem.c 6 Mar 2007 12:08:15 -0000 1.24
+++ goocanvasitem.c 6 Mar 2007 13:21:26 -0000 1.25
@@ -809,8 +809,8 @@
* Sets the transformation matrix of an item.
**/
void
-goo_canvas_item_set_transform (GooCanvasItem *item,
- cairo_matrix_t *transform)
+goo_canvas_item_set_transform (GooCanvasItem *item,
+ const cairo_matrix_t *transform)
{
GOO_CANVAS_ITEM_GET_IFACE (item)->set_transform (item, transform);
}
@@ -1418,10 +1418,10 @@
* Updates the item, if needed, and any children.
**/
void
-goo_canvas_item_update (GooCanvasItem *item,
- gboolean entire_tree,
- cairo_t *cr,
- GooCanvasBounds *bounds)
+goo_canvas_item_update (GooCanvasItem *item,
+ gboolean entire_tree,
+ cairo_t *cr,
+ GooCanvasBounds *bounds)
{
GooCanvasItemIface *iface = GOO_CANVAS_ITEM_GET_IFACE (item);
@@ -1443,10 +1443,10 @@
* #GooCanvasItem, e.g. when the canvas is being printed.
**/
void
-goo_canvas_item_paint (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale)
+goo_canvas_item_paint (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale)
{
GooCanvasItemIface *iface = GOO_CANVAS_ITEM_GET_IFACE (item);
@@ -1529,12 +1529,12 @@
* all they need to do is add these to their bounds.
**/
void
-goo_canvas_item_allocate_area (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *requested_area,
- GooCanvasBounds *allocated_area,
- gdouble x_offset,
- gdouble y_offset)
+goo_canvas_item_allocate_area (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *requested_area,
+ const GooCanvasBounds *allocated_area,
+ gdouble x_offset,
+ gdouble y_offset)
{
GooCanvasItemIface *iface = GOO_CANVAS_ITEM_GET_IFACE (item);
Index: goocanvasitem.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitem.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- goocanvasitem.h 6 Mar 2007 12:08:15 -0000 1.17
+++ goocanvasitem.h 6 Mar 2007 13:21:26 -0000 1.18
@@ -202,7 +202,7 @@
GooCanvasBounds *bounds);
void (* paint) (GooCanvasItem *item,
cairo_t *cr,
- GooCanvasBounds *bounds,
+ const GooCanvasBounds *bounds,
gdouble scale);
gboolean (* get_requested_area) (GooCanvasItem *item,
@@ -210,8 +210,8 @@
GooCanvasBounds *requested_area);
void (* allocate_area) (GooCanvasItem *item,
cairo_t *cr,
- GooCanvasBounds *requested_area,
- GooCanvasBounds *allocated_area,
+ const GooCanvasBounds *requested_area,
+ const GooCanvasBounds *allocated_area,
gdouble x_offset,
gdouble y_offset);
@@ -219,7 +219,7 @@
gboolean (* get_transform) (GooCanvasItem *item,
cairo_matrix_t *transform);
void (* set_transform) (GooCanvasItem *item,
- cairo_matrix_t *transform);
+ const cairo_matrix_t *transform);
GooCanvasStyle* (* get_style) (GooCanvasItem *item);
void (* set_style) (GooCanvasItem *item,
GooCanvasStyle *style);
@@ -334,8 +334,8 @@
gboolean goo_canvas_item_get_transform (GooCanvasItem *item,
cairo_matrix_t *transform);
-void goo_canvas_item_set_transform (GooCanvasItem *item,
- cairo_matrix_t *transform);
+void goo_canvas_item_set_transform (GooCanvasItem *item,
+ const cairo_matrix_t *transform);
void goo_canvas_item_set_simple_transform (GooCanvasItem *item,
gdouble x,
gdouble y,
@@ -399,10 +399,10 @@
gboolean entire_tree,
cairo_t *cr,
GooCanvasBounds *bounds);
-void goo_canvas_item_paint (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale);
+void goo_canvas_item_paint (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale);
gboolean goo_canvas_item_get_requested_area (GooCanvasItem *item,
cairo_t *cr,
@@ -410,12 +410,12 @@
gdouble goo_canvas_item_get_requested_height (GooCanvasItem *item,
cairo_t *cr,
gdouble width);
-void goo_canvas_item_allocate_area (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *requested_area,
- GooCanvasBounds *allocated_area,
- gdouble x_offset,
- gdouble y_offset);
+void goo_canvas_item_allocate_area (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *requested_area,
+ const GooCanvasBounds *allocated_area,
+ gdouble x_offset,
+ gdouble y_offset);
Index: goocanvasitemmodel.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitemmodel.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- goocanvasitemmodel.c 27 Feb 2007 01:42:07 -0000 1.11
+++ goocanvasitemmodel.c 6 Mar 2007 13:21:26 -0000 1.12
@@ -544,8 +544,8 @@
* Sets the transformation matrix of an item model.
**/
void
-goo_canvas_item_model_set_transform (GooCanvasItemModel *model,
- cairo_matrix_t *transform)
+goo_canvas_item_model_set_transform (GooCanvasItemModel *model,
+ const cairo_matrix_t *transform)
{
GOO_CANVAS_ITEM_MODEL_GET_IFACE (model)->set_transform (model, transform);
}
Index: goocanvasitemmodel.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitemmodel.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- goocanvasitemmodel.h 27 Feb 2007 01:42:07 -0000 1.9
+++ goocanvasitemmodel.h 6 Mar 2007 13:21:26 -0000 1.10
@@ -117,7 +117,7 @@
gboolean (* get_transform) (GooCanvasItemModel *model,
cairo_matrix_t *transform);
void (* set_transform) (GooCanvasItemModel *model,
- cairo_matrix_t *transform);
+ const cairo_matrix_t *transform);
GooCanvasStyle* (* get_style) (GooCanvasItemModel *model);
void (* set_style) (GooCanvasItemModel *model,
GooCanvasStyle *style);
@@ -194,8 +194,8 @@
gboolean goo_canvas_item_model_get_transform (GooCanvasItemModel *model,
cairo_matrix_t *transform);
-void goo_canvas_item_model_set_transform (GooCanvasItemModel *model,
- cairo_matrix_t *transform);
+void goo_canvas_item_model_set_transform (GooCanvasItemModel *model,
+ const cairo_matrix_t *transform);
void goo_canvas_item_model_set_simple_transform (GooCanvasItemModel *model,
gdouble x,
gdouble y,
Index: goocanvasitemsimple.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitemsimple.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- goocanvasitemsimple.c 27 Feb 2007 01:28:38 -0000 1.27
+++ goocanvasitemsimple.c 6 Mar 2007 13:21:26 -0000 1.28
@@ -888,8 +888,8 @@
static void
-goo_canvas_item_simple_set_transform (GooCanvasItem *item,
- cairo_matrix_t *transform)
+goo_canvas_item_simple_set_transform (GooCanvasItem *item,
+ const cairo_matrix_t *transform)
{
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
GooCanvasItemSimpleData *simple_data = simple->simple_data;
@@ -1270,12 +1270,12 @@
static void
-goo_canvas_item_simple_allocate_area (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *requested_area,
- GooCanvasBounds *allocated_area,
- gdouble x_offset,
- gdouble y_offset)
+goo_canvas_item_simple_allocate_area (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *requested_area,
+ const GooCanvasBounds *allocated_area,
+ gdouble x_offset,
+ gdouble y_offset)
{
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
@@ -1289,10 +1289,10 @@
static void
-goo_canvas_item_simple_paint (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale)
+goo_canvas_item_simple_paint (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale)
{
GooCanvasItemSimpleClass *class = GOO_CANVAS_ITEM_SIMPLE_GET_CLASS (item);
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
@@ -1884,8 +1884,8 @@
static void
-goo_canvas_item_model_simple_set_transform (GooCanvasItemModel *model,
- cairo_matrix_t *transform)
+goo_canvas_item_model_simple_set_transform (GooCanvasItemModel *model,
+ const cairo_matrix_t *transform)
{
GooCanvasItemModelSimple *smodel = (GooCanvasItemModelSimple*) model;
GooCanvasItemSimpleData *simple_data = &smodel->simple_data;
Index: goocanvasitemsimple.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitemsimple.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- goocanvasitemsimple.h 27 Feb 2007 01:01:39 -0000 1.19
+++ goocanvasitemsimple.h 6 Mar 2007 13:21:26 -0000 1.20
@@ -116,19 +116,19 @@
GObjectClass parent_class;
/*< public >*/
- void (* simple_create_path) (GooCanvasItemSimple *simple,
- cairo_t *cr);
+ void (* simple_create_path) (GooCanvasItemSimple *simple,
+ cairo_t *cr);
- void (* simple_update) (GooCanvasItemSimple *simple,
- cairo_t *cr);
- void (* simple_paint) (GooCanvasItemSimple *simple,
- cairo_t *cr,
- GooCanvasBounds *bounds);
- gboolean (* simple_is_item_at) (GooCanvasItemSimple *simple,
- gdouble x,
- gdouble y,
- cairo_t *cr,
- gboolean is_pointer_event);
+ void (* simple_update) (GooCanvasItemSimple *simple,
+ cairo_t *cr);
+ void (* simple_paint) (GooCanvasItemSimple *simple,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds);
+ gboolean (* simple_is_item_at) (GooCanvasItemSimple *simple,
+ gdouble x,
+ gdouble y,
+ cairo_t *cr,
+ gboolean is_pointer_event);
/*< private >*/
@@ -140,31 +140,31 @@
};
-GType goo_canvas_item_simple_get_type (void) G_GNUC_CONST;
+GType goo_canvas_item_simple_get_type (void) G_GNUC_CONST;
-void goo_canvas_item_simple_get_path_bounds (GooCanvasItemSimple *item,
- cairo_t *cr,
- GooCanvasBounds *bounds);
-void goo_canvas_item_simple_user_bounds_to_device (GooCanvasItemSimple *item,
- cairo_t *cr,
- GooCanvasBounds *bounds);
-void goo_canvas_item_simple_user_bounds_to_parent (GooCanvasItemSimple *item,
- cairo_t *cr,
- GooCanvasBounds *bounds);
-gboolean goo_canvas_item_simple_check_in_path (GooCanvasItemSimple *item,
- gdouble x,
- gdouble y,
- cairo_t *cr,
- GooCanvasPointerEvents pointer_events);
-void goo_canvas_item_simple_paint_path (GooCanvasItemSimple *item,
- cairo_t *cr);
+void goo_canvas_item_simple_get_path_bounds (GooCanvasItemSimple *item,
+ cairo_t *cr,
+ GooCanvasBounds *bounds);
+void goo_canvas_item_simple_user_bounds_to_device (GooCanvasItemSimple *item,
+ cairo_t *cr,
+ GooCanvasBounds *bounds);
+void goo_canvas_item_simple_user_bounds_to_parent (GooCanvasItemSimple *item,
+ cairo_t *cr,
+ GooCanvasBounds *bounds);
+gboolean goo_canvas_item_simple_check_in_path (GooCanvasItemSimple *item,
+ gdouble x,
+ gdouble y,
+ cairo_t *cr,
+ GooCanvasPointerEvents pointer_events);
+void goo_canvas_item_simple_paint_path (GooCanvasItemSimple *item,
+ cairo_t *cr);
-void goo_canvas_item_simple_changed (GooCanvasItemSimple *item,
- gboolean recompute_bounds);
-void goo_canvas_item_simple_check_style (GooCanvasItemSimple *item);
-void goo_canvas_item_simple_set_model (GooCanvasItemSimple *item,
- GooCanvasItemModel *model);
+void goo_canvas_item_simple_changed (GooCanvasItemSimple *item,
+ gboolean recompute_bounds);
+void goo_canvas_item_simple_check_style (GooCanvasItemSimple *item);
+void goo_canvas_item_simple_set_model (GooCanvasItemSimple *item,
+ GooCanvasItemModel *model);
Index: goocanvaspolyline.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvaspolyline.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- goocanvaspolyline.c 27 Feb 2007 01:01:39 -0000 1.14
+++ goocanvaspolyline.c 6 Mar 2007 13:21:26 -0000 1.15
@@ -890,9 +890,9 @@
static void
-goo_canvas_polyline_paint (GooCanvasItemSimple *simple,
- cairo_t *cr,
- GooCanvasBounds *bounds)
+goo_canvas_polyline_paint (GooCanvasItemSimple *simple,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds)
{
GooCanvasItemSimpleData *simple_data = simple->simple_data;
GooCanvasPolyline *polyline = (GooCanvasPolyline*) simple;
Index: goocanvastable.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvastable.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- goocanvastable.c 6 Mar 2007 12:08:15 -0000 1.11
+++ goocanvastable.c 6 Mar 2007 13:21:26 -0000 1.12
@@ -1789,12 +1789,12 @@
static void
-goo_canvas_table_allocate_area (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *requested_area,
- GooCanvasBounds *allocated_area,
- gdouble x_offset,
- gdouble y_offset)
+goo_canvas_table_allocate_area (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *requested_area,
+ const GooCanvasBounds *allocated_area,
+ gdouble x_offset,
+ gdouble y_offset)
{
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
GooCanvasItemSimpleData *simple_data = simple->simple_data;
@@ -1898,10 +1898,10 @@
static void
-goo_canvas_table_paint (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *bounds,
- gdouble scale)
+goo_canvas_table_paint (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds,
+ gdouble scale)
{
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
GooCanvasItemSimpleData *simple_data = simple->simple_data;
Index: goocanvastext.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvastext.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- goocanvastext.c 6 Mar 2007 12:08:15 -0000 1.17
+++ goocanvastext.c 6 Mar 2007 13:21:26 -0000 1.18
@@ -602,9 +602,9 @@
static void
-goo_canvas_text_paint (GooCanvasItemSimple *simple,
- cairo_t *cr,
- GooCanvasBounds *bounds)
+goo_canvas_text_paint (GooCanvasItemSimple *simple,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds)
{
GooCanvasText *text = (GooCanvasText*) simple;
PangoLayout *layout;
Index: goocanvasutils.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasutils.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- goocanvasutils.c 25 Feb 2007 18:25:52 -0000 1.12
+++ goocanvasutils.c 6 Mar 2007 13:21:26 -0000 1.13
@@ -435,7 +435,7 @@
}
cairo_matrix_t*
-goo_cairo_matrix_copy (cairo_matrix_t *matrix)
+goo_cairo_matrix_copy (const cairo_matrix_t *matrix)
{
cairo_matrix_t *matrix_copy;
Index: goocanvasutils.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasutils.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- goocanvasutils.h 25 Feb 2007 18:25:52 -0000 1.13
+++ goocanvasutils.h 6 Mar 2007 13:21:26 -0000 1.14
@@ -217,8 +217,8 @@
#define GOO_TYPE_CAIRO_MATRIX (goo_cairo_matrix_get_type())
GType goo_cairo_matrix_get_type (void) G_GNUC_CONST;
-cairo_matrix_t* goo_cairo_matrix_copy (cairo_matrix_t *matrix);
-void goo_cairo_matrix_free (cairo_matrix_t *matrix);
+cairo_matrix_t* goo_cairo_matrix_copy (const cairo_matrix_t *matrix);
+void goo_cairo_matrix_free (cairo_matrix_t *matrix);
#define GOO_TYPE_CAIRO_PATTERN (goo_cairo_pattern_get_type ())
GType goo_cairo_pattern_get_type (void) G_GNUC_CONST;
Index: goocanvaswidget.c
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvaswidget.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- goocanvaswidget.c 27 Feb 2007 01:01:39 -0000 1.7
+++ goocanvaswidget.c 6 Mar 2007 13:21:26 -0000 1.8
@@ -401,12 +401,12 @@
static void
-goo_canvas_widget_allocate_area (GooCanvasItem *item,
- cairo_t *cr,
- GooCanvasBounds *requested_area,
- GooCanvasBounds *allocated_area,
- gdouble x_offset,
- gdouble y_offset)
+goo_canvas_widget_allocate_area (GooCanvasItem *item,
+ cairo_t *cr,
+ const GooCanvasBounds *requested_area,
+ const GooCanvasBounds *allocated_area,
+ gdouble x_offset,
+ gdouble y_offset)
{
GooCanvasItemSimple *simple = (GooCanvasItemSimple*) item;
GooCanvasWidget *witem = (GooCanvasWidget*) item;
@@ -441,9 +441,9 @@
static void
-goo_canvas_widget_paint (GooCanvasItemSimple *simple,
- cairo_t *cr,
- GooCanvasBounds *bounds)
+goo_canvas_widget_paint (GooCanvasItemSimple *simple,
+ cairo_t *cr,
+ const GooCanvasBounds *bounds)
{
/* Do nothing for now. Maybe render for printing in future. */
}
More information about the cairo-commit
mailing list