X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-imageframe.h;h=8cfb6e273a26af819422383c47f30e5927f615f7;hb=cccc71e011180f610afb2791988933e8c16bf938;hp=408814b8fc1aa555ebac3398b0588fb80d399c07;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/canvas-imageframe.h b/gtk2_ardour/canvas-imageframe.h
index 408814b8fc..8cfb6e273a 100644
--- a/gtk2_ardour/canvas-imageframe.h
+++ b/gtk2_ardour/canvas-imageframe.h
@@ -1,27 +1,34 @@
-/* Image item type for GtkCanvas widget
+/* Image item type for GnomeCanvas widget
  *
- * GtkCanvas is basically a port of the Tk toolkit's most excellent canvas widget.  Tk is
+ * 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 The Free Software Foundation
  *
  * Author: Federico Mena <federico@nuclecu.unam.mx>
  */
- 
- 
-#ifndef __GTK_CANVAS_IMAGEFRAME_H__
-#define __GTK_CANVAS_IMAGEFRAME_H__
+
+
+#ifndef __GNOME_CANVAS_IMAGEFRAME_H__
+#define __GNOME_CANVAS_IMAGEFRAME_H__
 
 #include <stdint.h>
 
-#include <gtk-canvas/gtk-canvas-defs.h>
-#include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.h? */
+#include <libgnomecanvas/libgnomecanvas.h>
+#include <gtk/gtkenums.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include <libart_lgpl/art_misc.h>
+#ifdef __cplusplus
+}
+#endif
+
 #include <libart_lgpl/art_pixbuf.h>
-#include "gtk-canvas/gtk-canvas.h"
 
 
-BEGIN_GTK_CANVAS_DECLS
+G_BEGIN_DECLS
 
 
 /* Image item for the canvas.  Images are positioned by anchoring them to a point.
@@ -39,18 +46,18 @@ BEGIN_GTK_CANVAS_DECLS
  */
 
 
-#define GTK_CANVAS_TYPE_CANVAS_IMAGEFRAME            (gtk_canvas_imageframe_get_type ())
-#define GTK_CANVAS_IMAGEFRAME(obj)                   (GTK_CHECK_CAST ((obj), GTK_CANVAS_TYPE_CANVAS_IMAGEFRAME, GtkCanvasImageFrame))
-#define GTK_CANVAS_IMAGEFRAME_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GTK_CANVAS_TYPE_CANVAS_IMAGEFRAME, GtkCanvasImageFrameClass))
-#define GTK_CANVAS_IS_CANVAS_IMAGEFRAME(obj)         (GTK_CHECK_TYPE ((obj), GTK_CANVAS_TYPE_CANVAS_IMAGEFRAME))
-#define GTK_CANVAS_IS_CANVAS_IMAGEFRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_CANVAS_TYPE_CANVAS_IMAGEFRAME))
+#define GNOME_CANVAS_TYPE_CANVAS_IMAGEFRAME            (gnome_canvas_imageframe_get_type ())
+#define GNOME_CANVAS_IMAGEFRAME(obj)                   (GTK_CHECK_CAST ((obj), GNOME_CANVAS_TYPE_CANVAS_IMAGEFRAME, GnomeCanvasImageFrame))
+#define GNOME_CANVAS_IMAGEFRAME_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GNOME_CANVAS_TYPE_CANVAS_IMAGEFRAME, GnomeCanvasImageFrameClass))
+#define GNOME_CANVAS_IS_CANVAS_IMAGEFRAME(obj)         (GTK_CHECK_TYPE ((obj), GNOME_CANVAS_TYPE_CANVAS_IMAGEFRAME))
+#define GNOME_CANVAS_IS_CANVAS_IMAGEFRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_CANVAS_TYPE_CANVAS_IMAGEFRAME))
 
 
-typedef struct _GtkCanvasImageFrame GtkCanvasImageFrame;
-typedef struct _GtkCanvasImageFrameClass GtkCanvasImageFrameClass;
+typedef struct _GnomeCanvasImageFrame GnomeCanvasImageFrame;
+typedef struct _GnomeCanvasImageFrameClass GnomeCanvasImageFrameClass;
 
-struct _GtkCanvasImageFrame {
-	GtkCanvasItem item;
+struct _GnomeCanvasImageFrame {
+	GnomeCanvasItem item;
 
 	double x, y;			/* Position at anchor, item relative */
 	double width, height;		/* Size of image, item relative */
@@ -66,15 +73,15 @@ struct _GtkCanvasImageFrame {
 	double affine[6];               /* The item -> canvas affine */
 };
 
-struct _GtkCanvasImageFrameClass {
-	GtkCanvasItemClass parent_class;
+struct _GnomeCanvasImageFrameClass {
+	GnomeCanvasItemClass parent_class;
 };
 
 
 /* Standard Gtk function */
-GtkType gtk_canvas_imageframe_get_type (void);
+GtkType gnome_canvas_imageframe_get_type (void);
 
 
-END_GTK_CANVAS_DECLS
+G_END_DECLS
 
 #endif