X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=f882d12fac9c5d2725c82d3d1abd55b43bd84a4a;hb=6ee1233ccd00e071d9a1b1f305d980ed91bd1939;hp=e17fb3e192c4fed3ddeef20ddce48f6495cd13ab;hpb=3516deebd394af6e2c1d8c546777d04043eaa29a;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index e17fb3e..f882d12 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -1350,7 +1350,7 @@ CanvasView::init_menus() #define DUCK_MASK(lower,upper) \ - duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", _("Mask "#lower" ducks")); \ + duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", _("Show "#lower" ducks")); \ duck_mask_##lower->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_##upper)); \ action_group->add( duck_mask_##lower, \ sigc::bind( \ @@ -1946,9 +1946,7 @@ CanvasView::refresh_rend_desc() bool CanvasView::close() { - hide(); - // I think this is bad..., removing - // get_instance()->canvas_view_list().erase(std::find(get_instance()->canvas_view_list().begin(),get_instance()->canvas_view_list().end(),this)); + get_instance()->safe_close(); return false; }