Merge GnomeCanvasShape into GnomeCanvasRect.

GnomeCanvasRect is the only subclass of GnomeCanvasShape,
and passing Cairo paths around doesn't seem to work well.

1 files changed, 33 insertions, 56 deletions

diff --git a/libgnomecanvas/gnome-canvas-rect.h b/libgnomecanvas/gnome-canvas-rect.h
index fd9946583f..683b7523fa 100644
--- a/libgnomecanvas/gnome-canvas-rect.h
+++ b/libgnomecanvas/gnome-canvas-rect.h
@@ -1,64 +1,45 @@
-/*
- * 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
+/* Generic bezier shape item for GnomeCanvas
  *
  * 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.
  *
+ * Copyright (C) 1998,1999 The Free Software Foundation
  *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
+ * Authors: Federico Mena <federico@nuclecu.unam.mx>
+ *          Raph Levien <raph@acm.org>
+ *          Lauris Kaplinski <lauris@ximian.com>
+ *          Rusty Conover <rconover@bangtail.net>
  */
 
-#ifndef GNOME_CANVAS_RECT_ELLIPSE_H
-#define GNOME_CANVAS_RECT_ELLIPSE_H
+#ifndef GNOME_CANVAS_RECT_H
+#define GNOME_CANVAS_RECT_H
 
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include <libgnomecanvas/gnome-canvas-shape.h>
-
 G_BEGIN_DECLS
 
-/* Rectangle item.  These are defined by their top-left and bottom-right corners.
- * Rectangles have the following arguments:
+/* Rect item for the canvas.
+ *
+ * The following object arguments are available:
  *
- * name			type		read/write	description
+ * 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.
+ * 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.
+ * cap_style		cairo_line_cap_t        RW		Cap ("endpoint") style for the bpath.
+ * join_style		cairo_line_join_t	RW		Join ("vertex") style for the bpath.
+ * wind                 cairo_fill_rule_t       RW              Winding rule for the bpath.
+ * dash			XXX: disabled           RW		Dashing pattern
+ * miterlimit		gdouble			RW		Minimum angle between segments, where miter join
+ *								rule is applied.
  */
 
 #define GNOME_TYPE_CANVAS_RECT            (gnome_canvas_rect_get_type ())
@@ -66,26 +47,22 @@ G_BEGIN_DECLS
 #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;
+typedef struct _GnomeCanvasRectPrivate GnomeCanvasRectPrivate;
 
 struct _GnomeCanvasRect {
-	GnomeCanvasShape parent;
-
-       gdouble x1, y1, x2, y2;         /* Corners of item */
-
-       guint path_dirty : 1;
+	GnomeCanvasItem item;
+	GnomeCanvasRectPrivate *priv;
 };
 
 struct _GnomeCanvasRectClass {
-	GnomeCanvasShapeClass parent_class;
+	GnomeCanvasItemClass parent_class;
 };
 
-/* Standard Gtk function */
 GType gnome_canvas_rect_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif
+#endif /* GNOME_CANVAS_RECT_H */