Fix an error on startup that said: "error: canvasview.cpp:445 canvas_view.layer_tree...

[synfig.git] / synfig-studio / trunk / src / gtkmm / duckmatic.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index da1b6a2..d6cc012 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -99,7 +99,12 @@ Duckmatic::Duckmatic():
 Duckmatic::~Duckmatic()
 {
        clear_ducks();
-       //synfig::info("Duckmatic::~Duckmatic(): Deleted. Duck Count=%d",Duck::duck_count);
+
+       if (Duck::duck_count)
+               synfig::error("%d ducks not yet deleted!", Duck::duck_count);
+
+       if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+               synfig::info("Duckmatic::~Duckmatic(): Deleted");
 }
 
 void
@@ -408,7 +413,7 @@ Duckmatic::end_duck_drag()
 }
 
 Point
-Duckmatic::snap_point_to_grid(const Point& x, float radius)const
+Duckmatic::snap_point_to_grid(const synfig::Point& x, float radius)const
 {
        Point ret(x);
 
@@ -534,8 +539,7 @@ Duckmatic::signal_edited_selected_ducks()
        // Go ahead and call everyone's signals
        for(iter=ducks.begin();iter!=ducks.end();++iter)
        {
-               if ((*iter)->get_type() == Duck::TYPE_ANGLE ||
-                       (*iter)->get_type() == Duck::TYPE_TANGENT)
+               if ((*iter)->get_type() == Duck::TYPE_ANGLE)
                {
                        if(!(*iter)->signal_edited_angle()((*iter)->get_rotations()))
                        {
@@ -818,6 +822,7 @@ Duckmatic::find_bezier(synfig::Point pos, synfig::Real scale, synfig::Real radiu
 bool
 Duckmatic::save_sketch(const synfig::String& filename)const
 {
+       ChangeLocale change_locale(LC_NUMERIC, "C");
        std::ofstream file(filename.c_str());
 
        if(!file)return false;
@@ -851,6 +856,7 @@ Duckmatic::save_sketch(const synfig::String& filename)const
 bool
 Duckmatic::load_sketch(const synfig::String& filename)
 {
+       ChangeLocale change_locale(LC_NUMERIC, "C");
        std::ifstream file(filename.c_str());
 
        if(!file)
@@ -1020,7 +1026,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        }
 
                        duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_REAL:
-                       printf("DESC REAL, DUCK %d\n", int(duck->get_type()));
                        duck->signal_edited().connect(
                                sigc::bind(
                                        sigc::mem_fun(
@@ -1097,7 +1102,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        }
 
                        duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_ANGLE:
-                       printf("DESC ANGLE, DUCK %d\n", int(duck->get_type()));
                        duck->signal_edited_angle().clear();
                        duck->signal_edited_angle().connect(
                                sigc::bind(
@@ -1197,7 +1201,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                duck->set_type(Duck::TYPE_POSITION);
 
                        duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_VECTOR:
-                       printf("DESC VECTOR, DUCK %d\n", int(duck->get_type()));
                        duck->signal_edited().connect(
                                sigc::bind(
                                        sigc::mem_fun(