projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The 'polygon', 'draw', 'sketch', and 'width' tools are disabled by default. This...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvasview.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index
e17fb3e
..
f882d12
100644
(file)
--- 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) \
#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( \
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()
{
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;
}
return false;
}