X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fimageframe.cc;h=7ff05ee9e94b693986d7f991d728a309ac0d333b;hb=06ce1ae2133acf3986f3497f6a01649ee37d64ef;hp=b54cc72dc11cb5d281ae654fd0117bdb19ec23b2;hpb=54a80321064aa543023cd0b224ba9d433520983f;p=ardour.git

diff --git a/gtk2_ardour/imageframe.cc b/gtk2_ardour/imageframe.cc
index b54cc72dc1..7ff05ee9e9 100644
--- a/gtk2_ardour/imageframe.cc
+++ b/gtk2_ardour/imageframe.cc
@@ -4,7 +4,6 @@
 #include "imageframe_p.h"
 #include <libgnomecanvasmm/private/shape_p.h>
 
-/* $Id$ */
 
 /* rect.c
  *
@@ -36,7 +35,7 @@ ImageFrame::ImageFrame(Group& parentx, ArtPixBuf* pbuf, double x, double y, Gtk:
 : Item(GNOME_CANVAS_ITEM(g_object_new(get_type(),0)))
 {
   item_construct(parentx);
-  set("x1",x1,"y1",y1,"x2",x2,"y2",y2,0);
+  set("pixbuf", pbuf, "x", x,"y", y,"width", w,"height", h, 0);
 }
 
 ImageFrame::ImageFrame(Group& parentx)
@@ -57,9 +56,9 @@ namespace
 namespace Glib
 {
 
-ArdourCanvas::ImageFrame* wrap(GnomeCanvasImageFrame* object, bool take_copy)
+Gnome::Canvas::ImageFrame* wrap(GnomeCanvasImageFrame* object, bool take_copy)
 {
-  return dynamic_cast<ArdourCanvas::ImageFrame *> (Glib::wrap_auto ((GObject*)(object), take_copy));
+    return dynamic_cast<Gnome::Canvas::ImageFrame *> (Glib::wrap_auto ((GObject*)(object), take_copy));
 }
 
 } /* namespace Glib */
@@ -167,12 +166,18 @@ Glib::PropertyProxy_ReadOnly<double> ImageFrame::property_drawwidth() const
 {
 	return Glib::PropertyProxy_ReadOnly<double> (this, "drawwidth");
 }
-
+Glib::PropertyProxy<double> ImageFrame::property_height()
+{
+	return Glib::PropertyProxy<double> (this, "height");
+}
+Glib::PropertyProxy_ReadOnly<double> ImageFrame::property_height() const
+{
+	return Glib::PropertyProxy_ReadOnly<double> (this, "height");
+}
 Glib::PropertyProxy<Gtk::AnchorType> ImageFrame::property_anchor() 
 {
   return Glib::PropertyProxy<Gtk::AnchorType>(this, "anchor");
 }
-
 Glib::PropertyProxy_ReadOnly<Gtk::AnchorType> ImageFrame::property_anchor() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::AnchorType>(this, "anchor");