X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simplerect.h;h=5bb695bbf35705a8c970b45912dd5e263ced6521;hb=3b4beb03b2a92ebfd1a9610b822360135c18038d;hp=b3ae7d1f566efdeced4843a7676195409908116a;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git

diff --git a/gtk2_ardour/canvas-simplerect.h b/gtk2_ardour/canvas-simplerect.h
index b3ae7d1f56..5bb695bbf3 100644
--- a/gtk2_ardour/canvas-simplerect.h
+++ b/gtk2_ardour/canvas-simplerect.h
@@ -26,16 +26,17 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 
-BEGIN_GNOME_CANVAS_DECLS
+G_BEGIN_DECLS
 
 /* Wave viewer item for canvas.
  */
 
-#define GNOME_CANVAS_TYPE_CANVAS_SIMPLERECT            (gnome_canvas_simplerect_get_type ())
-#define GNOME_CANVAS_SIMPLERECT(obj)                   (GTK_CHECK_CAST ((obj), GNOME_CANVAS_TYPE_CANVAS_SIMPLERECT, GnomeCanvasSimpleRect))
-#define GNOME_CANVAS_SIMPLERECT_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GNOME_CANVAS_TYPE_CANVAS_SIMPLERECT, GnomeCanvasSimpleRectClass))
-#define GNOME_CANVAS_IS_CANVAS_SIMPLERECT(obj)         (GTK_CHECK_TYPE ((obj), GNOME_CANVAS_TYPE_CANVAS_SIMPLERECT))
-#define GNOME_CANVAS_IS_CANVAS_SIMPLERECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_CANVAS_TYPE_CANVAS_SIMPLERECT))
+#define GNOME_TYPE_CANVAS_SIMPLERECT            (gnome_canvas_simplerect_get_type ())
+#define GNOME_CANVAS_SIMPLERECT(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CANVAS_SIMPLERECT, GnomeCanvasSimpleRect))
+#define GNOME_CANVAS_SIMPLERECT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_SIMPLERECT, GnomeCanvasSimpleRectClass))
+#define GNOME_IS_CANVAS_SIMPLERECT(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_SIMPLERECT))
+#define GNOME_IS_CANVAS_SIMPLERECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CANVAS_SIMPLERECT))
+#define GNOME_CANVAS_SIMPLERECT_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_CANVAS_SIMPLERECT, GnomeCanvasSimpleRectClass))
 
 typedef struct _GnomeCanvasSimpleRect            GnomeCanvasSimpleRect;
 typedef struct _GnomeCanvasSimpleRectClass       GnomeCanvasSimpleRectClass;
@@ -47,25 +48,25 @@ struct _GnomeCanvasSimpleRect
     gboolean     fill;
     gboolean     draw;
     gboolean     full_draw_on_update;
-    uint32_t fill_color;
-    uint32_t outline_color;
-    uint32_t outline_pixels;
+    uint32_t     fill_color;
+    uint32_t     outline_color;
+    uint32_t     outline_pixels;
 
     /* cached values set during update/used during render */
 
     unsigned char fill_r, fill_b, fill_g, fill_a;
     unsigned char outline_r, outline_b, outline_g;
     unsigned char outline_what;
-    guint32 bbox_ulx, bbox_uly;
-    guint32 bbox_lrx, bbox_lry;
+    gint32 bbox_ulx, bbox_uly;
+    gint32 bbox_lrx, bbox_lry;
 };
 
 struct _GnomeCanvasSimpleRectClass {
 	GnomeCanvasItemClass parent_class;
 };
 
-GtkType gnome_canvas_simplerect_get_type (void);
+GType gnome_canvas_simplerect_get_type (void) G_GNUC_CONST;
 
-END_GNOME_CANVAS_DECLS
+G_END_DECLS
 
 #endif /* __GNOME_CANVAS_SIMPLERECT_H__ */