smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

incomplete changes based on karsten's megapatch

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@81 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-11-12 22:07:07 +00:00
parent bc8174cd08
commit 1a3a776077
37 changed files with 477 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/simplerect.cc
View file

@ -33,14 +33,14 @@ namespace Canvas
{
SimpleRect::SimpleRect(Group& parentx, double x1, double y1, double x2, double y2)
: Shape(GNOME_CANVAS_SHAPE(g_object_new(get_type(),0)))
: Item(GNOME_CANVAS_ITEM(g_object_new(get_type(),0)))
{
item_construct(parentx);
set("x1",x1,"y1",y1,"x2",x2,"y2",y2,0);
}
SimpleRect::SimpleRect(Group& parentx)
: Shape(GNOME_CANVAS_SHAPE(g_object_new(get_type(),0)))
: Item(GNOME_CANVAS_ITEM(g_object_new(get_type(),0)))
{
item_construct(parentx);
}
@ -57,7 +57,7 @@ namespace
namespace Glib
{
Gnome::Canvas::SimpleRect* wrap(GnomeCanvasRect* object, bool take_copy)
Gnome::Canvas::SimpleRect* wrap(GnomeCanvasSimpleRect* object, bool take_copy)
{
return dynamic_cast<Gnome::Canvas::SimpleRect *> (Glib::wrap_auto ((GObject*)(object), take_copy));
}
@ -78,7 +78,7 @@ const Glib::Class& SimpleRect_Class::init()
if(!gtype_) // create the GType if necessary
{
// Glib::Class has to know the class init function to clone custom types.
class_init_func_ = &Shape_Class::class_init_function;
class_init_func_ = &SimpleRect_Class::class_init_function;
// This is actually just optimized away, apparently with no harm.
// Make sure that the parent type has been created.
@ -109,14 +109,14 @@ Glib::ObjectBase* SimpleRect_Class::wrap_new(GObject* o)
/* The implementation: */
SimpleRect::SimpleRect(const Glib::ConstructParams& construct_params)
: Shape(construct_params)
: Item(construct_params)
{
}
SimpleRect::SimpleRect(GnomeCanvasSimpleRect* castitem)
: Shape ((GnomeCanvasShape*)(castitem))
: Item ((GnomeCanvasItem*)(castitem))
{
}
}
SimpleRect::~SimpleRect()
{