X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasoptions.cpp;h=e880f87f134b0f6b18dcef6c7f2397d35e73dfb8;hb=b6c331ec41a1788c39606b9c398a25f801bacb4a;hp=c937586783717f8a1a4ac8c80dad59014fa17c72;hpb=e10033355e7df3cd6b2dc9799cf9423d16e3c4ce;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp
index c937586..e880f87 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp
@@ -2,7 +2,7 @@
 /*!	\file canvasoptions.cpp
 **	\brief Template File
 **
-**	$Id: canvasoptions.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -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),
@@ -66,7 +68,7 @@ CanvasOptions::CanvasOptions(loose_handle<studio::CanvasView> canvas_view):
 
 	Gtk::Alignment *dialogPadding = manage(new Gtk::Alignment(0, 0, 1, 1));
 	dialogPadding->set_padding(12, 12, 12, 12);
-	
+
 	Gtk::Notebook *notebook=manage(new class Gtk::Notebook());
 	dialogPadding->add(*notebook);
 
@@ -79,7 +81,7 @@ CanvasOptions::CanvasOptions(loose_handle<studio::CanvasView> canvas_view):
 
 	Gtk::VBox *gridBox = manage(new Gtk::VBox(false, 12));
 	gridPadding->add(*gridBox);
-	
+
 	Gtk::Table *gridTable = manage(new Gtk::Table(3, 2, false));
 	gridTable->set_row_spacings(6);
 	gridTable->set_col_spacings(12);
@@ -127,15 +129,15 @@ CanvasOptions::CanvasOptions(loose_handle<studio::CanvasView> canvas_view):
 	cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasOptions::on_cancel_pressed));
 
 	//set_default_response(1);
-	
-	
+
+
 	get_vbox()->pack_start(*dialogPadding);
 	get_vbox()->show_all();
-	
+
 	signal_show().connect(sigc::mem_fun(*this, &studio::CanvasOptions::refresh));
 
 	vector_grid_size.set_digits(5);
-	
+
 	update_title();
 }
 
@@ -156,14 +158,14 @@ CanvasOptions::refresh()
 		toggle_grid_show.set_active(true);
 	else
 		toggle_grid_show.set_active(false);
-		
+
 	if(canvas_view_->work_area->get_grid_snap())
 		toggle_grid_snap.set_active(true);
 	else
 		toggle_grid_snap.set_active(false);
-	
+
 	vector_grid_size.set_value(canvas_view_->work_area->get_grid_size());
-	
+
 	tooltips.set_tip(toggle_time_snap,_("Not yet implemented"));
 	toggle_time_snap.set_sensitive(false);
 
@@ -187,7 +189,7 @@ CanvasOptions::on_apply_pressed()
 		canvas_view_->work_area->enable_grid_snap();
 	else
 		canvas_view_->work_area->disable_grid_snap();
-		
+
 	if(toggle_grid_show.get_active())
 		canvas_view_->work_area->enable_grid();
 	else