From 8106873666ddb27067ca289d2cb3968d657ba11e Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 13 Oct 2010 18:40:37 +0200 Subject: gnome-canvas: gnome-canvas-rect-ellipse.[ch] => gnome-canvas-rect.[ch] Rename to reflect change of scope --- libgnomecanvas/Makefile.am | 4 +- libgnomecanvas/gnome-canvas-rect-ellipse.c | 228 ----------------------------- libgnomecanvas/gnome-canvas-rect-ellipse.h | 93 ------------ libgnomecanvas/gnome-canvas-rect.c | 228 +++++++++++++++++++++++++++++ libgnomecanvas/gnome-canvas-rect.h | 93 ++++++++++++ libgnomecanvas/libgnomecanvas.h | 2 +- 6 files changed, 324 insertions(+), 324 deletions(-) delete mode 100644 libgnomecanvas/gnome-canvas-rect-ellipse.c delete mode 100644 libgnomecanvas/gnome-canvas-rect-ellipse.h create mode 100644 libgnomecanvas/gnome-canvas-rect.c create mode 100644 libgnomecanvas/gnome-canvas-rect.h (limited to 'libgnomecanvas') diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am index c8fbf1e836..3962898114 100644 --- a/libgnomecanvas/Makefile.am +++ b/libgnomecanvas/Makefile.am @@ -27,7 +27,7 @@ libgnomecanvasinclude_HEADERS = \ gnome-canvas-i18n.h \ gnome-canvas-path-def.h \ gnome-canvas-pixbuf.h \ - gnome-canvas-rect-ellipse.h \ + gnome-canvas-rect.h \ gnome-canvas-rich-text.h \ gnome-canvas-shape.h \ gnome-canvas-text.h \ @@ -49,7 +49,7 @@ libgnomecanvas_la_SOURCES = \ gnome-canvas-clipgroup.c \ gnome-canvas-path-def.c \ gnome-canvas-pixbuf.c \ - gnome-canvas-rect-ellipse.c \ + gnome-canvas-rect.c \ gnome-canvas-rich-text.c \ gnome-canvas-shape-private.h \ gnome-canvas-shape.c \ diff --git a/libgnomecanvas/gnome-canvas-rect-ellipse.c b/libgnomecanvas/gnome-canvas-rect-ellipse.c deleted file mode 100644 index b82a94e865..0000000000 --- a/libgnomecanvas/gnome-canvas-rect-ellipse.c +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation - * All rights reserved. - * - * This file is part of the Gnome Library. - * - * The Gnome 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. - * - * The Gnome 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 the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -/* - @NOTATION@ - */ -/* Rectangle and ellipse item types for GnomeCanvas widget - * - * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is - * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. - * - * - * Authors: Federico Mena - * Rusty Conover - */ - -#include -#include -#include "gnome-canvas-rect-ellipse.h" -#include "gnome-canvas-util.h" -#include "gnome-canvas-shape.h" - -#include -#include -#include -#include - -/* Base class for rectangle and ellipse item types */ - -#define noVERBOSE - -enum { - PROP_0, - PROP_X1, - PROP_Y1, - PROP_X2, - PROP_Y2 -}; - -static void gnome_canvas_rect_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec); -static void gnome_canvas_rect_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec); - -static void gnome_canvas_rect_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags); - -G_DEFINE_TYPE(GnomeCanvasRect, gnome_canvas_rect, GNOME_TYPE_CANVAS_SHAPE) - -static void -gnome_canvas_rect_class_init (GnomeCanvasRectClass *class) -{ - GObjectClass *gobject_class; - GnomeCanvasItemClass *item_class; - - gobject_class = (GObjectClass *) class; - - gobject_class->set_property = gnome_canvas_rect_set_property; - gobject_class->get_property = gnome_canvas_rect_get_property; - - g_object_class_install_property - (gobject_class, - PROP_X1, - g_param_spec_double ("x1", NULL, NULL, - -G_MAXDOUBLE, G_MAXDOUBLE, 0, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_Y1, - g_param_spec_double ("y1", NULL, NULL, - -G_MAXDOUBLE, G_MAXDOUBLE, 0, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_X2, - g_param_spec_double ("x2", NULL, NULL, - -G_MAXDOUBLE, G_MAXDOUBLE, 0, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_Y2, - g_param_spec_double ("y2", NULL, NULL, - -G_MAXDOUBLE, G_MAXDOUBLE, 0, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); - - item_class = (GnomeCanvasItemClass *) class; - - item_class->update = gnome_canvas_rect_update; -} - -static void -gnome_canvas_rect_init (GnomeCanvasRect *rect) -{ - rect->x1 = 0.0; - rect->y1 = 0.0; - rect->x2 = 0.0; - rect->y2 = 0.0; - rect->path_dirty = 0; -} - -static void -gnome_canvas_rect_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - GnomeCanvasItem *item; - GnomeCanvasRect *rect; - - g_return_if_fail (object != NULL); - g_return_if_fail (GNOME_IS_CANVAS_RECT (object)); - - item = GNOME_CANVAS_ITEM (object); - rect = GNOME_CANVAS_RECT (object); - - switch (param_id) { - case PROP_X1: - rect->x1 = g_value_get_double (value); - rect->path_dirty = 1; - gnome_canvas_item_request_update (item); - break; - - case PROP_Y1: - rect->y1 = g_value_get_double (value); - rect->path_dirty = 1; - gnome_canvas_item_request_update (item); - break; - - case PROP_X2: - rect->x2 = g_value_get_double (value); - rect->path_dirty = 1; - gnome_canvas_item_request_update (item); - break; - - case PROP_Y2: - rect->y2 = g_value_get_double (value); - rect->path_dirty = 1; - gnome_canvas_item_request_update (item); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gnome_canvas_rect_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - GnomeCanvasRect *rect; - - g_return_if_fail (object != NULL); - g_return_if_fail (GNOME_IS_CANVAS_RECT (object)); - - rect = GNOME_CANVAS_RECT (object); - - switch (param_id) { - case PROP_X1: - g_value_set_double (value, rect->x1); - break; - - case PROP_Y1: - g_value_set_double (value, rect->y1); - break; - - case PROP_X2: - g_value_set_double (value, rect->x2); - break; - - case PROP_Y2: - g_value_set_double (value, rect->y2); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gnome_canvas_rect_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gint flags) -{ - GnomeCanvasRect *rect; - GnomeCanvasPathDef *path_def; - - rect = GNOME_CANVAS_RECT (item); - - if (rect->path_dirty) { - path_def = gnome_canvas_path_def_new (); - - gnome_canvas_path_def_moveto (path_def, rect->x1, rect->y1); - gnome_canvas_path_def_lineto (path_def, rect->x2, rect->y1); - gnome_canvas_path_def_lineto (path_def, rect->x2, rect->y2); - gnome_canvas_path_def_lineto (path_def, rect->x1, rect->y2); - gnome_canvas_path_def_lineto (path_def, rect->x1, rect->y1); - gnome_canvas_path_def_closepath_current (path_def); - gnome_canvas_shape_set_path_def (GNOME_CANVAS_SHAPE (item), path_def); - gnome_canvas_path_def_unref (path_def); - rect->path_dirty = 0; - } - - if (GNOME_CANVAS_ITEM_CLASS (gnome_canvas_rect_parent_class)->update) - GNOME_CANVAS_ITEM_CLASS (gnome_canvas_rect_parent_class)->update (item, affine, clip_path, flags); -} diff --git a/libgnomecanvas/gnome-canvas-rect-ellipse.h b/libgnomecanvas/gnome-canvas-rect-ellipse.h deleted file mode 100644 index 1a161ee3e3..0000000000 --- a/libgnomecanvas/gnome-canvas-rect-ellipse.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation - * All rights reserved. - * - * This file is part of the Gnome Library. - * - * The Gnome 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. - * - * The Gnome 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 the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -/* - @NOTATION@ - */ -/* Rectangle and ellipse item types for GnomeCanvas widget - * - * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is - * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. - * - * - * Author: Federico Mena - */ - -#ifndef GNOME_CANVAS_RECT_ELLIPSE_H -#define GNOME_CANVAS_RECT_ELLIPSE_H - -#include - -#include - -#include - -G_BEGIN_DECLS - -/* Rectangle item. These are defined by their top-left and bottom-right corners. - * Rectangles have the following arguments: - * - * name type read/write description - * ------------------------------------------------------------------------------------------ - * x1 gdouble RW Leftmost coordinate of rectangle or ellipse - * y1 gdouble RW Topmost coordinate of rectangle or ellipse - * x2 gdouble RW Rightmost coordinate of rectangle or ellipse - * y2 gdouble RW Bottommost coordinate of rectangle or ellipse - * fill_color string W X color specification for fill color, - * or NULL pointer for no color (transparent) - * fill_color_gdk GdkColor* RW Allocated GdkColor for fill - * outline_color string W X color specification for outline color, - * or NULL pointer for no color (transparent) - * outline_color_gdk GdkColor* RW Allocated GdkColor for outline - * width_pixels uint RW Width of the outline in pixels. The outline will - * not be scaled when the canvas zoom factor is changed. - * width_units gdouble RW Width of the outline in canvas units. The outline - * will be scaled when the canvas zoom factor is changed. - */ - -#define GNOME_TYPE_CANVAS_RECT (gnome_canvas_rect_get_type ()) -#define GNOME_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRect)) -#define GNOME_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectClass)) -#define GNOME_IS_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_CANVAS_RECT)) -#define GNOME_IS_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CANVAS_RECT)) -#define GNOME_CANVAS_RECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectClass)) - -typedef struct _GnomeCanvasRect GnomeCanvasRect; -typedef struct _GnomeCanvasRectClass GnomeCanvasRectClass; - -struct _GnomeCanvasRect { - GnomeCanvasShape parent; - - gdouble x1, y1, x2, y2; /* Corners of item */ - - guint path_dirty : 1; -}; - -struct _GnomeCanvasRectClass { - GnomeCanvasShapeClass parent_class; -}; - -/* Standard Gtk function */ -GType gnome_canvas_rect_get_type (void) G_GNUC_CONST; - -G_END_DECLS - -#endif diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c new file mode 100644 index 0000000000..6e347e36e5 --- /dev/null +++ b/libgnomecanvas/gnome-canvas-rect.c @@ -0,0 +1,228 @@ +/* + * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation + * All rights reserved. + * + * This file is part of the Gnome Library. + * + * The Gnome 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. + * + * The Gnome 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 the Gnome Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +/* + @NOTATION@ + */ +/* Rectangle and ellipse item types for GnomeCanvas widget + * + * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is + * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. + * + * + * Authors: Federico Mena + * Rusty Conover + */ + +#include +#include +#include "gnome-canvas-rect.h" +#include "gnome-canvas-util.h" +#include "gnome-canvas-shape.h" + +#include +#include +#include +#include + +/* Base class for rectangle and ellipse item types */ + +#define noVERBOSE + +enum { + PROP_0, + PROP_X1, + PROP_Y1, + PROP_X2, + PROP_Y2 +}; + +static void gnome_canvas_rect_set_property (GObject *object, + guint param_id, + const GValue *value, + GParamSpec *pspec); +static void gnome_canvas_rect_get_property (GObject *object, + guint param_id, + GValue *value, + GParamSpec *pspec); + +static void gnome_canvas_rect_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags); + +G_DEFINE_TYPE(GnomeCanvasRect, gnome_canvas_rect, GNOME_TYPE_CANVAS_SHAPE) + +static void +gnome_canvas_rect_class_init (GnomeCanvasRectClass *class) +{ + GObjectClass *gobject_class; + GnomeCanvasItemClass *item_class; + + gobject_class = (GObjectClass *) class; + + gobject_class->set_property = gnome_canvas_rect_set_property; + gobject_class->get_property = gnome_canvas_rect_get_property; + + g_object_class_install_property + (gobject_class, + PROP_X1, + g_param_spec_double ("x1", NULL, NULL, + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); + g_object_class_install_property + (gobject_class, + PROP_Y1, + g_param_spec_double ("y1", NULL, NULL, + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); + g_object_class_install_property + (gobject_class, + PROP_X2, + g_param_spec_double ("x2", NULL, NULL, + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); + g_object_class_install_property + (gobject_class, + PROP_Y2, + g_param_spec_double ("y2", NULL, NULL, + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); + + item_class = (GnomeCanvasItemClass *) class; + + item_class->update = gnome_canvas_rect_update; +} + +static void +gnome_canvas_rect_init (GnomeCanvasRect *rect) +{ + rect->x1 = 0.0; + rect->y1 = 0.0; + rect->x2 = 0.0; + rect->y2 = 0.0; + rect->path_dirty = 0; +} + +static void +gnome_canvas_rect_set_property (GObject *object, + guint param_id, + const GValue *value, + GParamSpec *pspec) +{ + GnomeCanvasItem *item; + GnomeCanvasRect *rect; + + g_return_if_fail (object != NULL); + g_return_if_fail (GNOME_IS_CANVAS_RECT (object)); + + item = GNOME_CANVAS_ITEM (object); + rect = GNOME_CANVAS_RECT (object); + + switch (param_id) { + case PROP_X1: + rect->x1 = g_value_get_double (value); + rect->path_dirty = 1; + gnome_canvas_item_request_update (item); + break; + + case PROP_Y1: + rect->y1 = g_value_get_double (value); + rect->path_dirty = 1; + gnome_canvas_item_request_update (item); + break; + + case PROP_X2: + rect->x2 = g_value_get_double (value); + rect->path_dirty = 1; + gnome_canvas_item_request_update (item); + break; + + case PROP_Y2: + rect->y2 = g_value_get_double (value); + rect->path_dirty = 1; + gnome_canvas_item_request_update (item); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + break; + } +} + +static void +gnome_canvas_rect_get_property (GObject *object, + guint param_id, + GValue *value, + GParamSpec *pspec) +{ + GnomeCanvasRect *rect; + + g_return_if_fail (object != NULL); + g_return_if_fail (GNOME_IS_CANVAS_RECT (object)); + + rect = GNOME_CANVAS_RECT (object); + + switch (param_id) { + case PROP_X1: + g_value_set_double (value, rect->x1); + break; + + case PROP_Y1: + g_value_set_double (value, rect->y1); + break; + + case PROP_X2: + g_value_set_double (value, rect->x2); + break; + + case PROP_Y2: + g_value_set_double (value, rect->y2); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + break; + } +} + +static void +gnome_canvas_rect_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gint flags) +{ + GnomeCanvasRect *rect; + GnomeCanvasPathDef *path_def; + + rect = GNOME_CANVAS_RECT (item); + + if (rect->path_dirty) { + path_def = gnome_canvas_path_def_new (); + + gnome_canvas_path_def_moveto (path_def, rect->x1, rect->y1); + gnome_canvas_path_def_lineto (path_def, rect->x2, rect->y1); + gnome_canvas_path_def_lineto (path_def, rect->x2, rect->y2); + gnome_canvas_path_def_lineto (path_def, rect->x1, rect->y2); + gnome_canvas_path_def_lineto (path_def, rect->x1, rect->y1); + gnome_canvas_path_def_closepath_current (path_def); + gnome_canvas_shape_set_path_def (GNOME_CANVAS_SHAPE (item), path_def); + gnome_canvas_path_def_unref (path_def); + rect->path_dirty = 0; + } + + if (GNOME_CANVAS_ITEM_CLASS (gnome_canvas_rect_parent_class)->update) + GNOME_CANVAS_ITEM_CLASS (gnome_canvas_rect_parent_class)->update (item, affine, clip_path, flags); +} diff --git a/libgnomecanvas/gnome-canvas-rect.h b/libgnomecanvas/gnome-canvas-rect.h new file mode 100644 index 0000000000..1a161ee3e3 --- /dev/null +++ b/libgnomecanvas/gnome-canvas-rect.h @@ -0,0 +1,93 @@ +/* + * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation + * All rights reserved. + * + * This file is part of the Gnome Library. + * + * The Gnome 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. + * + * The Gnome 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 the Gnome Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +/* + @NOTATION@ + */ +/* Rectangle and ellipse item types for GnomeCanvas widget + * + * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is + * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. + * + * + * Author: Federico Mena + */ + +#ifndef GNOME_CANVAS_RECT_ELLIPSE_H +#define GNOME_CANVAS_RECT_ELLIPSE_H + +#include + +#include + +#include + +G_BEGIN_DECLS + +/* Rectangle item. These are defined by their top-left and bottom-right corners. + * Rectangles have the following arguments: + * + * name type read/write description + * ------------------------------------------------------------------------------------------ + * x1 gdouble RW Leftmost coordinate of rectangle or ellipse + * y1 gdouble RW Topmost coordinate of rectangle or ellipse + * x2 gdouble RW Rightmost coordinate of rectangle or ellipse + * y2 gdouble RW Bottommost coordinate of rectangle or ellipse + * fill_color string W X color specification for fill color, + * or NULL pointer for no color (transparent) + * fill_color_gdk GdkColor* RW Allocated GdkColor for fill + * outline_color string W X color specification for outline color, + * or NULL pointer for no color (transparent) + * outline_color_gdk GdkColor* RW Allocated GdkColor for outline + * width_pixels uint RW Width of the outline in pixels. The outline will + * not be scaled when the canvas zoom factor is changed. + * width_units gdouble RW Width of the outline in canvas units. The outline + * will be scaled when the canvas zoom factor is changed. + */ + +#define GNOME_TYPE_CANVAS_RECT (gnome_canvas_rect_get_type ()) +#define GNOME_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRect)) +#define GNOME_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectClass)) +#define GNOME_IS_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_CANVAS_RECT)) +#define GNOME_IS_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CANVAS_RECT)) +#define GNOME_CANVAS_RECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectClass)) + +typedef struct _GnomeCanvasRect GnomeCanvasRect; +typedef struct _GnomeCanvasRectClass GnomeCanvasRectClass; + +struct _GnomeCanvasRect { + GnomeCanvasShape parent; + + gdouble x1, y1, x2, y2; /* Corners of item */ + + guint path_dirty : 1; +}; + +struct _GnomeCanvasRectClass { + GnomeCanvasShapeClass parent_class; +}; + +/* Standard Gtk function */ +GType gnome_canvas_rect_get_type (void) G_GNUC_CONST; + +G_END_DECLS + +#endif diff --git a/libgnomecanvas/libgnomecanvas.h b/libgnomecanvas/libgnomecanvas.h index 8cb0c3f37a..f92644c045 100644 --- a/libgnomecanvas/libgnomecanvas.h +++ b/libgnomecanvas/libgnomecanvas.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.3