13
0

add back change lost during branch merging

This commit is contained in:
Paul Davis 2013-04-21 18:57:55 -04:00
parent 0a2a876248
commit b36e085001

View File

@ -236,13 +236,14 @@ Item::parent_to_item (ArdourCanvas::Rect const & d) const
void void
Item::unparent () Item::unparent ()
{ {
_canvas = 0;
_parent = 0; _parent = 0;
} }
void void
Item::reparent (Group* new_parent) Item::reparent (Group* new_parent)
{ {
assert (_canvas == _parent->canvas());
if (_parent) { if (_parent) {
_parent->remove (this); _parent->remove (this);
} }