projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing copyright declaration.
[ardour.git]
/
gtk2_ardour
/
imageframe.cc
diff --git
a/gtk2_ardour/imageframe.cc
b/gtk2_ardour/imageframe.cc
index b54cc72dc11cb5d281ae654fd0117bdb19ec23b2..7ff05ee9e94b693986d7f991d728a309ac0d333b 100644
(file)
--- a/
gtk2_ardour/imageframe.cc
+++ b/
gtk2_ardour/imageframe.cc
@@
-4,7
+4,6
@@
#include "imageframe_p.h"
#include <libgnomecanvasmm/private/shape_p.h>
#include "imageframe_p.h"
#include <libgnomecanvasmm/private/shape_p.h>
-/* $Id$ */
/* rect.c
*
/* 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);
: 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)
}
ImageFrame::ImageFrame(Group& parentx)
@@
-57,9
+56,9
@@
namespace
namespace Glib
{
namespace Glib
{
-
Ardour
Canvas::ImageFrame* wrap(GnomeCanvasImageFrame* object, bool take_copy)
+
Gnome::
Canvas::ImageFrame* wrap(GnomeCanvasImageFrame* object, bool take_copy)
{
{
-
return dynamic_cast<Ardour
Canvas::ImageFrame *> (Glib::wrap_auto ((GObject*)(object), take_copy));
+
return dynamic_cast<Gnome::
Canvas::ImageFrame *> (Glib::wrap_auto ((GObject*)(object), take_copy));
}
} /* namespace Glib */
}
} /* namespace Glib */
@@
-167,12
+166,18
@@
Glib::PropertyProxy_ReadOnly<double> ImageFrame::property_drawwidth() const
{
return Glib::PropertyProxy_ReadOnly<double> (this, "drawwidth");
}
{
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<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");
Glib::PropertyProxy_ReadOnly<Gtk::AnchorType> ImageFrame::property_anchor() const
{
return Glib::PropertyProxy_ReadOnly<Gtk::AnchorType>(this, "anchor");