X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_scale.cpp;h=300ff4b1824bb1d21a715011bdb0ec0677af113c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=7468cb52c1bd6af5043b581fc9c5fb07bff9538f;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_scale.cpp b/synfig-studio/trunk/src/gtkmm/state_scale.cpp
index 7468cb5..300ff4b 100644
--- a/synfig-studio/trunk/src/gtkmm/state_scale.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_scale.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -49,6 +50,8 @@
 #include "duck.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -161,8 +164,8 @@ StateScale_Context::StateScale_Context(CanvasView* canvas_view):
 	checkbutton_aspect_lock(_("Lock Aspect Ratio"))
 {
 	// Set up the tool options dialog
-	//options_table.attach(*manage(new Gtk::Label(_("Scale Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(checkbutton_aspect_lock, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(*manage(new Gtk::Label(_("Scale Tool"))),	0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(checkbutton_aspect_lock,					0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
 	checkbutton_aspect_lock.signal_toggled().connect(sigc::mem_fun(*this,&StateScale_Context::refresh_aspect_lock_flag));
 
@@ -170,7 +173,7 @@ StateScale_Context::StateScale_Context(CanvasView* canvas_view):
 	refresh_tool_options();
 	App::dialog_tool_options->present();
 
-	get_work_area()->allow_layer_clicks=true;
+	get_work_area()->set_allow_layer_clicks(true);
 	get_work_area()->set_duck_dragger(duck_dragger_);
 
 //	get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR);