X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=b60734543b3c902ccee998ad3134ba53e19e0443;hb=0313f3153df081c11ff8a57d1ded6864142b21e2;hp=035208d7e969c261236ecc2150d1036ef4a305d8;hpb=493ba873017ae66e23031e3caf949466960dc971;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp index 035208d..b607345 100644 --- a/synfig-core/trunk/src/synfig/canvas.cpp +++ b/synfig-core/trunk/src/synfig/canvas.cpp @@ -700,7 +700,7 @@ Canvas::insert(iterator iter,etl::handle x) //while(correct_canvas->is_inline())correct_canvas=correct_canvas->parent(); Layer::LooseHandle loose_layer(x); - add_connection(x, + add_connection(loose_layer, sigc::connection::connection( x->signal_added_to_group().connect( sigc::bind( @@ -708,7 +708,7 @@ Canvas::insert(iterator iter,etl::handle x) *correct_canvas, &Canvas::add_group_pair), loose_layer)))); - add_connection(x, + add_connection(loose_layer, sigc::connection::connection( x->signal_removed_from_group().connect( sigc::bind( @@ -1179,13 +1179,13 @@ Canvas::remove_group_pair(String group, etl::handle layer) } void -Canvas::add_connection(etl::handle layer, sigc::connection connection) +Canvas::add_connection(Layer::LooseHandle layer, sigc::connection connection) { connections_[layer].push_back(connection); } void -Canvas::disconnect_connections(etl::handle layer) +Canvas::disconnect_connections(Layer::LooseHandle layer) { std::vector::iterator iter; for(iter=connections_[layer].begin();iter!=connections_[layer].end();++iter)