diff options
author | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 22:26:56 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 22:26:56 +0000 |
commit | 14d43ca9fe28a8309b4a52fa85e2b0c64a92248b (patch) | |
tree | 0ca37421248da4aaba70869fbc0156bf64e3b0ce /gtk2_ardour/canvas-imageframe.h | |
parent | d38e2213d79b1c8952c776a3b60f7709457edc0c (diff) |
Switched to use libgnomecanvas (not the C++ one).
git-svn-id: svn://localhost/trunk/ardour2@30 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-imageframe.h')
-rw-r--r-- | gtk2_ardour/canvas-imageframe.h | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/gtk2_ardour/canvas-imageframe.h b/gtk2_ardour/canvas-imageframe.h index 408814b8fc..9522bf3796 100644 --- a/gtk2_ardour/canvas-imageframe.h +++ b/gtk2_ardour/canvas-imageframe.h @@ -1,6 +1,6 @@ -/* 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 @@ -9,19 +9,18 @@ */ -#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 <libgnomecanvas/libgnomecanvas.h> #include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.h? */ #include <libart_lgpl/art_misc.h> #include <libart_lgpl/art_pixbuf.h> -#include "gtk-canvas/gtk-canvas.h" -BEGIN_GTK_CANVAS_DECLS +BEGIN_GNOME_CANVAS_DECLS /* Image item for the canvas. Images are positioned by anchoring them to a point. @@ -39,18 +38,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 +65,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 +END_GNOME_CANVAS_DECLS #endif |