Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / gtkmm / canvasoptions.cpp

diff --git a/synfig-studio/tags/stable/src/gtkmm/canvasoptions.cpp b/synfig-studio/tags/stable/src/gtkmm/canvasoptions.cpp
index e1a7d21..dfc15ed 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/canvasoptions.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/canvasoptions.cpp
@@ -38,6 +38,8 @@
 #include "canvasview.h"
 #include "workarea.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -55,7 +57,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-CanvasOptions::CanvasOptions(loose_handle<studio::CanvasView> canvas_view):
+CanvasOptions::CanvasOptions(etl::loose_handle<CanvasView> canvas_view):
        Gtk::Dialog(_("Canvas Options"),*canvas_view,false,true),
        canvas_view_(canvas_view),
        toggle_grid_snap(_("_Snap to grid"), true),
@@ -183,11 +185,13 @@ CanvasOptions::on_grid_show_toggle()
 void
 CanvasOptions::on_apply_pressed()
 {
+       canvas_view_->set_grid_snap_toggle(toggle_grid_snap.get_active());
        if(toggle_grid_snap.get_active())
                canvas_view_->work_area->enable_grid_snap();
        else
                canvas_view_->work_area->disable_grid_snap();
 
+       canvas_view_->set_grid_show_toggle(toggle_grid_show.get_active());
        if(toggle_grid_show.get_active())
                canvas_view_->work_area->enable_grid();
        else