merge robin gareus' libltc into ardour source tree for convenience

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

diff --git a/gtk2_ardour/canvas-imageframe.h b/gtk2_ardour/canvas-imageframe.h
index 9522bf3796c64b03cbf07ae9aa02e89c49348a66..8cfb6e273a26af819422383c47f30e5927f615f7 100644 (file)
--- a/gtk2_ardour/canvas-imageframe.h
+++ b/gtk2_ardour/canvas-imageframe.h
@@ -7,20 +7,28 @@
  *
  * Author: Federico Mena <federico@nuclecu.unam.mx>
  */
- 
- 
+
+
 #ifndef __GNOME_CANVAS_IMAGEFRAME_H__
 #define __GNOME_CANVAS_IMAGEFRAME_H__
 
 #include <stdint.h>
 
 #include <libgnomecanvas/libgnomecanvas.h>
-#include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.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>
 
 
-BEGIN_GNOME_CANVAS_DECLS
+G_BEGIN_DECLS
 
 
 /* Image item for the canvas.  Images are positioned by anchoring them to a point.
@@ -74,6 +82,6 @@ struct _GnomeCanvasImageFrameClass {
 GtkType gnome_canvas_imageframe_get_type (void);
 
 
-END_GNOME_CANVAS_DECLS
+G_END_DECLS
 
 #endif