projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
make all of dialog visible for add_route_dialog
[ardour.git] / gtk2_ardour / canvas-simplerect.c
diff --git a/gtk2_ardour/canvas-simplerect.c b/gtk2_ardour/canvas-simplerect.c
index a4ded6fadcb26ca4b8c56c6d2013faf54557cd68..85d8b4e7bfcbe8b17e43e80a81d28381d58500db 100644 (file)
--- a/gtk2_ardour/canvas-simplerect.c
+++ b/gtk2_ardour/canvas-simplerect.c
@@ -22,43 +22,63 @@ enum {
        
 };
 
-static void  gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class);
-static void   gnome_canvas_simplerect_init       (GnomeCanvasSimpleRect      *simplerect);
+static void   gnome_canvas_simplerect_class_init    (GnomeCanvasSimpleRectClass *class);
+
+static void   gnome_canvas_simplerect_init          (GnomeCanvasSimpleRect      *simplerect);
+
+static void   gnome_canvas_simplerect_destroy       (GtkObject                  *object);
+
 static void   gnome_canvas_simplerect_set_property  (GObject        *object,
                                                     guint            prop_id,
                                                     const GValue   *value,
                                                     GParamSpec     *pspec);
+
 static void   gnome_canvas_simplerect_get_property  (GObject        *object,
                                                     guint           prop_id,
                                                     GValue         *value,
                                                     GParamSpec     *pspec);
-static void   gnome_canvas_simplerect_update      (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags);
-static void   gnome_canvas_simplerect_bounds      (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2);
-static double gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
-static void   gnome_canvas_simplerect_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
-static void   gnome_canvas_simplerect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h);
+
+static void   gnome_canvas_simplerect_update        (GnomeCanvasItem *item,
+                                                    double          *affine,
+                                                    ArtSVP          *clip_path,
+                                                    int              flags);
+
+static void   gnome_canvas_simplerect_bounds        (GnomeCanvasItem *item,
+                                                    double          *x1,
+                                                    double          *y1,
+                                                    double          *x2,
+                                                    double          *y2);
+
+static double gnome_canvas_simplerect_point         (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
+
+static void   gnome_canvas_simplerect_render        (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
+
+static void   gnome_canvas_simplerect_draw          (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h);
 
 static GnomeCanvasItemClass *parent_class;
 
 
-GtkType
+GType
 gnome_canvas_simplerect_get_type (void)
 {
-       static GtkType simplerect_type = 0;
+       static GType simplerect_type;
 
        if (!simplerect_type) {
-               GtkTypeInfo simplerect_info = {
-                       "GnomeCanvasSimpleRect",
-                       sizeof (GnomeCanvasSimpleRect),
+               static const GTypeInfo object_info = {
                        sizeof (GnomeCanvasSimpleRectClass),
-                       (GtkClassInitFunc) gnome_canvas_simplerect_class_init,
-                       (GtkObjectInitFunc) gnome_canvas_simplerect_init,
-                       NULL, /* reserved_1 */
-                       NULL, /* reserved_2 */
-                       (GtkClassInitFunc) NULL
+                       (GBaseInitFunc) NULL,
+                       (GBaseFinalizeFunc) NULL,
+                       (GClassInitFunc) gnome_canvas_simplerect_class_init,
+                       (GClassFinalizeFunc) NULL,
+                       NULL,                   /* class_data */
+                       sizeof (GnomeCanvasSimpleRect),
+                       0,                      /* n_preallocs */
+                       (GInstanceInitFunc) gnome_canvas_simplerect_init,
+                       NULL                    /* value_table */
                };
 
-               simplerect_type = gtk_type_unique (gnome_canvas_item_get_type (), &simplerect_info);
+               simplerect_type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM, "GnomeCanvasSimpleRect",
+                                                         &object_info, 0);
        }
 
        return simplerect_type;
@@ -67,18 +87,20 @@ gnome_canvas_simplerect_get_type (void)
 static void
 gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
 {
-       GObjectClass *object_class;
+        GObjectClass *gobject_class;
+       GtkObjectClass *object_class;
        GnomeCanvasItemClass *item_class;
 
-       object_class = G_OBJECT_CLASS (class);
+       gobject_class = (GObjectClass *) class;
+       object_class = (GtkObjectClass *) class;
        item_class = (GnomeCanvasItemClass *) class;
+       
+       parent_class = g_type_class_peek_parent (class);
 
-       parent_class = gtk_type_class (gnome_canvas_item_get_type ());
-
-       object_class->set_property = gnome_canvas_simplerect_set_property;
-       object_class->get_property = gnome_canvas_simplerect_get_property;
+       gobject_class->set_property = gnome_canvas_simplerect_set_property;
+       gobject_class->get_property = gnome_canvas_simplerect_get_property;
        
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_X1,
                                         g_param_spec_double ("x1",
                                                              _("x1"),
@@ -88,7 +110,7 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
                                                              0.0,
                                                              G_PARAM_READWRITE));  
        
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_Y1,
                                         g_param_spec_double ("y1",
                                                              _("y1"),
@@ -99,7 +121,7 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
                                                              G_PARAM_READWRITE));  
        
 
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_X2,
                                         g_param_spec_double ("x2",
                                                              _("x2"),
@@ -109,7 +131,7 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
                                                              0.0,
                                                              G_PARAM_READWRITE));  
        
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_Y2,
                                         g_param_spec_double ("y2",
                                                              _("y2"),
@@ -120,30 +142,30 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
                                                              G_PARAM_READWRITE));  
        
 
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_OUTLINE_PIXELS,
                                         g_param_spec_uint ("outline_pixels",
                                                              _("outline pixels"),
                                                              _("width in pixels of outline"),
                                                              0,
-                                                             G_MAXINT,
+                                                             G_MAXUINT,
                                                              0,
                                                              G_PARAM_READWRITE));  
        
 
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_OUTLINE_WHAT,
                                         g_param_spec_uint ("outline_what",
                                                              _("outline what"),
                                                              _("which boundaries to outline (mask)"),
                                                              0,
-                                                             G_MAXINT,
+                                                             G_MAXUINT,
                                                              0,
                                                              G_PARAM_READWRITE));  
        
 
 
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_FILL,
                                         g_param_spec_boolean ("fill",
                                                               _("fill"),
@@ -151,7 +173,7 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
                                                               TRUE,
                                                               G_PARAM_READWRITE));  
        
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_DRAW,
                                         g_param_spec_boolean ("draw",
                                                               _("draw"),
@@ -160,32 +182,35 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
                                                               G_PARAM_READWRITE));  
        
 
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_OUTLINE_COLOR_RGBA,
                                         g_param_spec_uint ("outline_color_rgba",
-                                                             _("outline color rgba"),
-                                                             _("color of outline"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             0,
-                                                             G_PARAM_READWRITE));  
+                                                           _("outline color rgba"),
+                                                           _("color of outline"),
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READWRITE));  
        
 
-       g_object_class_install_property (object_class,
+       g_object_class_install_property (gobject_class,
                                         PROP_FILL_COLOR_RGBA,
                                         g_param_spec_uint ("fill_color_rgba",
-                                                             _("fill color rgba"),
-                                                             _("color of fill"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             0,
-                                                             G_PARAM_READWRITE));  
-       
+                                                           _("fill color rgba"),
+                                                           _("color of fill"),
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READWRITE));  
+
+       object_class->destroy = gnome_canvas_simplerect_destroy;
+
        item_class->update = gnome_canvas_simplerect_update;
+       item_class->draw = gnome_canvas_simplerect_draw;
        item_class->bounds = gnome_canvas_simplerect_bounds;
        item_class->point = gnome_canvas_simplerect_point;
        item_class->render = gnome_canvas_simplerect_render;
-       item_class->draw = gnome_canvas_simplerect_draw;
+
 }
 
 static void
@@ -207,6 +232,22 @@ gnome_canvas_simplerect_init (GnomeCanvasSimpleRect *simplerect)
        // GNOME_CANVAS_ITEM(simplerect)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW;
 }
 
+static void
+gnome_canvas_simplerect_destroy (GtkObject *object)
+{
+       GnomeCanvasSimpleRect *rect;
+       
+       g_return_if_fail (object != NULL);
+       g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
+
+       rect = GNOME_CANVAS_SIMPLERECT (object);
+
+       /* remember, destroy can be run multiple times! */
+
+       if (GTK_OBJECT_CLASS (parent_class)->destroy)
+             (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
 static void
 gnome_canvas_simplerect_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
 {
@@ -299,14 +340,13 @@ gnome_canvas_simplerect_set_property (GObject      *object,
 
 {
        GnomeCanvasSimpleRect *simplerect;
-       int update;
-       int bounds_changed;
+       int update = FALSE;
+       int bounds_changed = FALSE;
+       g_return_if_fail (object != NULL);
+       g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
 
        simplerect = GNOME_CANVAS_SIMPLERECT (object);
 
-       update = FALSE;
-       bounds_changed = FALSE;
-
        switch (prop_id) {
        case PROP_X1:
                if (simplerect->x1 != g_value_get_double (value)) {
@@ -398,6 +438,9 @@ gnome_canvas_simplerect_get_property (GObject      *object,
 {
        GnomeCanvasSimpleRect *rect = GNOME_CANVAS_SIMPLERECT (object);
        
+       g_return_if_fail (object != NULL);
+       g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
+
        switch (prop_id) {
        case PROP_X1:
                g_value_set_double (value, rect->x1);
Unnamed repository; edit this file 'description' to name the repository.