Numerical sort patch from mantis #2654

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

diff --git a/gtk2_ardour/canvas-imageframe.c b/gtk2_ardour/canvas-imageframe.c
index 31ac9e36de689af1885261bbb3269310076bca99..1f0e7e877b54a5e346eab3298c79d10745914676 100644 (file)
--- a/gtk2_ardour/canvas-imageframe.c
+++ b/gtk2_ardour/canvas-imageframe.c
@@ -100,10 +100,9 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 
        g_object_class_install_property (gobject_class,
                                         PROP_PIXBUF,
-                                        g_param_spec_boxed ("pixbuf",
+                                        g_param_spec_pointer ("pixbuf",
                                                             _("pixbuf"),
                                                             _("the pixbuf"),
-                                                            GDK_TYPE_PIXBUF,
                                                             G_PARAM_WRITABLE)); 
        g_object_class_install_property (gobject_class,
                                         PROP_X,
@@ -181,8 +180,6 @@ gnome_canvas_imageframe_init (GnomeCanvasImageFrame *image)
        image->height = 0.0;
        image->drawwidth = 0.0;
        image->anchor = GTK_ANCHOR_CENTER;
-       // GTK2FIX
-       // GNOME_CANVAS_ITEM(image)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW;
 }
 
 static void
@@ -291,10 +288,10 @@ gnome_canvas_imageframe_set_property (GObject *object,
 
        switch (prop_id) {
        case PROP_PIXBUF:
-               if (item->canvas->aa && g_value_get_boxed (value)) {
+               if (item->canvas->aa && g_value_get_pointer (value)) {
                        if (image->pixbuf != NULL)
                                art_pixbuf_free (image->pixbuf);
-                       image->pixbuf = g_value_get_boxed (value);
+                       image->pixbuf = g_value_get_pointer (value);
                }
                update = TRUE;
                break;
@@ -459,8 +456,6 @@ static void
 gnome_canvas_imageframe_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
                         int x, int y, int width, int height)
 {
-       fprintf(stderr, "please don't use the CanvasImageFrame item in a non-aa Canvas\n") ;
-       abort() ;
 }
 
 static double