X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=87b60886f30379aee06a70f99a826a76918d5882;hb=HEAD;hp=2bbb743366aed661dfc3dde7956999c420edee08;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;p=synfig.git diff --git a/synfig-core/src/synfig/canvas.cpp b/synfig-core/src/synfig/canvas.cpp index 2bbb743..87b6088 100644 --- a/synfig-core/src/synfig/canvas.cpp +++ b/synfig-core/src/synfig/canvas.cpp @@ -23,8 +23,6 @@ /* === H E A D E R S ======================================================= */ -#define SYNFIG_NO_ANGLE - #ifdef USING_PCH # include "pch.h" #else @@ -716,7 +714,7 @@ Canvas::insert(iterator iter,etl::handle x) Layer::LooseHandle loose_layer(x); add_connection(loose_layer, - sigc::connection::connection( + sigc::connection( x->signal_added_to_group().connect( sigc::bind( sigc::mem_fun( @@ -724,7 +722,7 @@ Canvas::insert(iterator iter,etl::handle x) &Canvas::add_group_pair), loose_layer)))); add_connection(loose_layer, - sigc::connection::connection( + sigc::connection( x->signal_removed_from_group().connect( sigc::bind( sigc::mem_fun( @@ -776,7 +774,7 @@ Canvas::clone(const GUID& deriv_guid)const { synfig::String name; if(is_inline()) - name="inline"; + name=_("in line"); else { name=get_id()+"_CLONE"; @@ -841,7 +839,7 @@ Canvas::set_inline(LooseHandle parent) } - id_="inline"; + id_=_("in line"); is_inline_=true; parent_=parent; @@ -864,7 +862,7 @@ Canvas::create_inline(Handle parent) //if(parent->is_inline()) // return create_inline(parent->parent()); - Handle canvas(new Canvas("inline")); + Handle canvas(new Canvas(_("in line"))); canvas->set_inline(parent); return canvas; }