add back change lost during branch merging
This commit is contained in:
parent
0a2a876248
commit
b36e085001
@ -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);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user