X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simplerect.h;h=5bb695bbf35705a8c970b45912dd5e263ced6521;hb=fddb3778120e25b3b8e8134084e260dac07c1365;hp=a4031453b579554d0111316a39ea4e3e9eec62de;hpb=60f817b0d2411947c257ecbf0b0376589ea77acd;p=ardour.git

diff --git a/gtk2_ardour/canvas-simplerect.h b/gtk2_ardour/canvas-simplerect.h
index a4031453b5..5bb695bbf3 100644
--- a/gtk2_ardour/canvas-simplerect.h
+++ b/gtk2_ardour/canvas-simplerect.h
@@ -31,11 +31,12 @@ 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,24 +48,24 @@ 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;
 
 G_END_DECLS