Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / canvas-simpleline.h

diff --git a/gtk2_ardour/canvas-simpleline.h b/gtk2_ardour/canvas-simpleline.h
index 4d9bb1a335fcd46243c359d941f0364f97118dc5..66a4b906826f1bf6eb5e6410437f79b8ec5c7951 100644 (file)
--- a/gtk2_ardour/canvas-simpleline.h
+++ b/gtk2_ardour/canvas-simpleline.h
@@ -31,11 +31,12 @@ G_BEGIN_DECLS
 /* Wave viewer item for canvas.
  */
 
-#define GNOME_CANVAS_TYPE_CANVAS_SIMPLELINE            (gnome_canvas_simpleline_get_type ())
-#define GNOME_CANVAS_SIMPLELINE(obj)                   (GTK_CHECK_CAST ((obj), GNOME_CANVAS_TYPE_CANVAS_SIMPLELINE, GnomeCanvasSimpleLine))
-#define GNOME_CANVAS_SIMPLELINE_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GNOME_CANVAS_TYPE_CANVAS_SIMPLELINE, GnomeCanvasSimpleLineClass))
-#define GNOME_CANVAS_IS_CANVAS_SIMPLELINE(obj)         (GTK_CHECK_TYPE ((obj), GNOME_CANVAS_TYPE_CANVAS_SIMPLELINE))
-#define GNOME_CANVAS_IS_CANVAS_SIMPLELINE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_CANVAS_TYPE_CANVAS_SIMPLELINE))
+#define GNOME_TYPE_CANVAS_SIMPLELINE                   (gnome_canvas_simpleline_get_type ())
+#define GNOME_CANVAS_SIMPLELINE(obj)                   (GTK_CHECK_CAST ((obj), GNOME_TYPE_CANVAS_SIMPLELINE, GnomeCanvasSimpleLine))
+#define GNOME_CANVAS_SIMPLELINE_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_SIMPLELINE, GnomeCanvasSimpleLineClass))
+#define GNOME_IS_CANVAS_SIMPLELINE(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_SIMPLELINE))
+#define GNOME_IS_CANVAS_SIMPLELINE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CANVAS_SIMPLELINE))
+#define GNOME_CANVAS_SIMPLELINE_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_CANVAS_SIMPLELINE, GnomeCanvasSimpleLineClass))
 
 typedef struct _GnomeCanvasSimpleLine            GnomeCanvasSimpleLine;
 typedef struct _GnomeCanvasSimpleLineClass       GnomeCanvasSimpleLineClass;
@@ -43,22 +44,20 @@ typedef struct _GnomeCanvasSimpleLineClass       GnomeCanvasSimpleLineClass;
 struct _GnomeCanvasSimpleLine
 {
     GnomeCanvasItem item;
-    double x1, y1, x2, y2;
+    double x1, y1, x2, y2;  /* parent-relative, world coordinates */
+    gint32 cx1, cy1, cx2, cy2;  /* global, canvas coordinates */
     uint32_t color;
-    gboolean horizontal;
 
     /* cached values set during update/used during render */
 
     unsigned char r, b, g, a;
-    guint32 bbox_ulx, bbox_uly;
-    guint32 bbox_lrx, bbox_lry;
 };
 
 struct _GnomeCanvasSimpleLineClass {
        GnomeCanvasItemClass parent_class;
 };
 
-GtkType gnome_canvas_simpleline_get_type (void);
+GType gnome_canvas_simpleline_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS