From: Nikita Kitaev Date: Sun, 2 May 2010 01:20:11 +0000 (-0700) Subject: Fix bug with reverting a composition/canvas not being deleted X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=a8e9e829fa31a982dca6a9a638e61e57fade8832;hp=23e923a6bba837bceec49a81e7f4ec77878b3fe2;p=synfig.git Fix bug with reverting a composition/canvas not being deleted --- diff --git a/synfig-studio/src/gtkmm/state_normal.cpp b/synfig-studio/src/gtkmm/state_normal.cpp index c763022..d3d488b 100644 --- a/synfig-studio/src/gtkmm/state_normal.cpp +++ b/synfig-studio/src/gtkmm/state_normal.cpp @@ -96,7 +96,7 @@ class DuckDrag_Combo : public DuckDrag_Base bool move_only; public: - etl::handle canvas_view_; + CanvasView* canvas_view_; bool scale; bool rotate; bool constrain; @@ -111,7 +111,7 @@ public: class studio::StateNormal_Context : public sigc::trackable { - etl::handle canvas_view_; + CanvasView* canvas_view_; synfigapp::Settings& settings; @@ -144,7 +144,7 @@ public: ~StateNormal_Context(); - const etl::handle& get_canvas_view()const{return canvas_view_;} + CanvasView* get_canvas_view()const{return canvas_view_;} etl::handle get_canvas_interface()const{return canvas_view_->canvas_interface();} synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} WorkArea * get_work_area()const{return canvas_view_->get_work_area();}