X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-imageframe.c;h=3654836c792d2e489dc0ef4bc243025c01e0208d;hb=6ab6ad5bb732512d04593b1a5d566d5e787d45ed;hp=6ba51c0fdc92b0c64b47d4ee96d938ea4e31a11b;hpb=2b49b2433b6dc06a52b0848af62373c747f18ac9;p=ardour.git

diff --git a/gtk2_ardour/canvas-imageframe.c b/gtk2_ardour/canvas-imageframe.c
index 6ba51c0fdc..3654836c79 100644
--- a/gtk2_ardour/canvas-imageframe.c
+++ b/gtk2_ardour/canvas-imageframe.c
@@ -7,8 +7,8 @@
  *
  * Author: Federico Mena <federico@nuclecu.unam.mx>
  */
- 
- 
+
+
 #include <string.h> /* for memcpy() */
 #include <math.h>
 #include <stdio.h>
@@ -103,7 +103,7 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 					 g_param_spec_pointer ("pixbuf",
 							     _("pixbuf"),
 							     _("the pixbuf"),
-							     G_PARAM_WRITABLE)); 
+							     G_PARAM_WRITABLE));
 	g_object_class_install_property (gobject_class,
 					 PROP_X,
 					 g_param_spec_double ("x",
@@ -112,8 +112,8 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 							      -G_MAXDOUBLE,
 							      G_MAXDOUBLE,
 							      0.0,
-							      G_PARAM_READWRITE));  
-	
+							      G_PARAM_READWRITE));
+
 	g_object_class_install_property (gobject_class,
 					 PROP_Y,
 					 g_param_spec_double ("y",
@@ -122,7 +122,7 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 							      -G_MAXDOUBLE,
 							      G_MAXDOUBLE,
 							      0.0,
-							      G_PARAM_READWRITE));  
+							      G_PARAM_READWRITE));
 	g_object_class_install_property (gobject_class,
 					 PROP_WIDTH,
 					 g_param_spec_double ("width",
@@ -131,8 +131,8 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 							      -G_MAXDOUBLE,
 							      G_MAXDOUBLE,
 							      0.0,
-							      G_PARAM_READWRITE));  
-	
+							      G_PARAM_READWRITE));
+
 	g_object_class_install_property (gobject_class,
 					 PROP_DRAWWIDTH,
 					 g_param_spec_double ("drawwidth",
@@ -141,7 +141,7 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 							      -G_MAXDOUBLE,
 							      G_MAXDOUBLE,
 							      0.0,
-							      G_PARAM_READWRITE));  
+							      G_PARAM_READWRITE));
 	g_object_class_install_property (gobject_class,
 					 PROP_HEIGHT,
 					 g_param_spec_double ("height",
@@ -150,7 +150,7 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 							      -G_MAXDOUBLE,
 							      G_MAXDOUBLE,
 							      0.0,
-							      G_PARAM_READWRITE));  
+							      G_PARAM_READWRITE));
 	g_object_class_install_property (gobject_class,
 					 PROP_ANCHOR,
 					 g_param_spec_enum ("anchor",
@@ -158,7 +158,7 @@ gnome_canvas_imageframe_class_init (GnomeCanvasImageFrameClass *class)
 							    _("the anchor"),
 							    GTK_TYPE_ANCHOR_TYPE,
 							    GTK_ANCHOR_NW,
-							    G_PARAM_READWRITE));  
+							    G_PARAM_READWRITE));
 
 	object_class->destroy = gnome_canvas_imageframe_destroy;
 
@@ -180,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
@@ -193,7 +191,7 @@ gnome_canvas_imageframe_destroy (GtkObject *object)
 	g_return_if_fail (GNOME_CANVAS_IS_CANVAS_IMAGEFRAME (object));
 
 	image = GNOME_CANVAS_IMAGEFRAME (object);
-	
+
 	image->cwidth = 0;
 	image->cheight = 0;
 
@@ -317,7 +315,7 @@ gnome_canvas_imageframe_set_property (GObject *object,
 		image->height = fabs (g_value_get_double (value));
 		update = TRUE;
 		break;
-		
+
 	case PROP_DRAWWIDTH:
 		image->drawwidth = fabs (g_value_get_double (value));
 		update = TRUE;
@@ -359,11 +357,11 @@ gnome_canvas_imageframe_get_property (GObject *object,
 	case PROP_WIDTH:
 	        g_value_set_double (value, image->width);
 		break;
-	  
+
 	case PROP_HEIGHT:
                 g_value_set_double (value, image->height);
 		break;
-		
+
 	case PROP_DRAWWIDTH:
 	        g_value_set_double (value, image->drawwidth);
 		break;
@@ -458,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