X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simpleline.h;h=66a4b906826f1bf6eb5e6410437f79b8ec5c7951;hb=5d509146c815bee46e8d1ede78c7e4445f346db8;hp=f46f54d82804d29a5b02a49ded14a32b459ad65e;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/canvas-simpleline.h b/gtk2_ardour/canvas-simpleline.h
index f46f54d828..66a4b90682 100644
--- a/gtk2_ardour/canvas-simpleline.h
+++ b/gtk2_ardour/canvas-simpleline.h
@@ -1,4 +1,4 @@
-/* gtk-canvas-simpleline.h: GtkCanvas item for simple rects
+/* libgnomecanvas/gnome-canvas-simpleline.h: GnomeCanvas item for simple rects
  *
  * Copyright (C) 2001 Paul Davis <pbd@op.net>
  *
@@ -19,48 +19,46 @@
  *
  */
 
-#ifndef __GTK_CANVAS_SIMPLELINE_H__
-#define __GTK_CANVAS_SIMPLELINE_H__
+#ifndef __GNOME_CANVAS_SIMPLELINE_H__
+#define __GNOME_CANVAS_SIMPLELINE_H__
 
 #include <stdint.h>
 
-#include <gtk-canvas/gtk-canvas-defs.h>
-#include "gtk-canvas/gtk-canvas.h"
+#include <libgnomecanvas/libgnomecanvas.h>
 
-BEGIN_GTK_CANVAS_DECLS
+G_BEGIN_DECLS
 
 /* Wave viewer item for canvas.
  */
 
-#define GTK_CANVAS_TYPE_CANVAS_SIMPLELINE            (gtk_canvas_simpleline_get_type ())
-#define GTK_CANVAS_SIMPLELINE(obj)                   (GTK_CHECK_CAST ((obj), GTK_CANVAS_TYPE_CANVAS_SIMPLELINE, GtkCanvasSimpleLine))
-#define GTK_CANVAS_SIMPLELINE_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GTK_CANVAS_TYPE_CANVAS_SIMPLELINE, GtkCanvasSimpleLineClass))
-#define GTK_CANVAS_IS_CANVAS_SIMPLELINE(obj)         (GTK_CHECK_TYPE ((obj), GTK_CANVAS_TYPE_CANVAS_SIMPLELINE))
-#define GTK_CANVAS_IS_CANVAS_SIMPLELINE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_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 _GtkCanvasSimpleLine            GtkCanvasSimpleLine;
-typedef struct _GtkCanvasSimpleLineClass       GtkCanvasSimpleLineClass;
+typedef struct _GnomeCanvasSimpleLine            GnomeCanvasSimpleLine;
+typedef struct _GnomeCanvasSimpleLineClass       GnomeCanvasSimpleLineClass;
 
-struct _GtkCanvasSimpleLine
+struct _GnomeCanvasSimpleLine
 {
-    GtkCanvasItem item;
-    double x1, y1, x2, y2;
+    GnomeCanvasItem item;
+    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 _GtkCanvasSimpleLineClass {
-	GtkCanvasItemClass parent_class;
+struct _GnomeCanvasSimpleLineClass {
+	GnomeCanvasItemClass parent_class;
 };
 
-GtkType gtk_canvas_simpleline_get_type (void);
+GType gnome_canvas_simpleline_get_type (void) G_GNUC_CONST;
 
-END_GTK_CANVAS_DECLS
+G_END_DECLS
 
-#endif /* __GTK_CANVAS_SIMPLELINE_H__ */
+#endif /* __GNOME_CANVAS_SIMPLELINE_H__ */