X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_width.cpp;h=6f63fe3bca555777835b87e6fa82400c9f4bb1e2;hb=528053937deeba8d8ae63078306f1bc951229781;hp=c7d50bbecd00186fb8b7bf3120a33939ba54a9bb;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_width.cpp b/synfig-studio/trunk/src/gtkmm/state_width.cpp
index c7d50bb..6f63fe3 100644
--- a/synfig-studio/trunk/src/gtkmm/state_width.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_width.cpp
@@ -55,6 +55,8 @@
 
 #include <ETL/clock>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -208,8 +210,8 @@ StateWidth_Context::reset()
 StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	canvas_view_(canvas_view),
 	is_working(*canvas_view),
-	prev_workarea_layer_clicking(get_work_area()->allow_layer_clicks),
-	prev_workarea_duck_clicking(get_work_area()->allow_duck_clicks),
+	prev_workarea_layer_clicking(get_work_area()->get_allow_layer_clicks()),
+	prev_workarea_duck_clicking(get_work_area()->get_allow_duck_clicks()),
 	old_duckmask(get_work_area()->get_type_mask()),
 
 	settings(synfigapp::Main::get_selected_input_device()->settings()),
@@ -243,7 +245,7 @@ StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	App::dialog_tool_options->present();
 
 	// Turn off layer clicking
-	get_work_area()->allow_layer_clicks=false;
+	get_work_area()->set_allow_layer_clicks(false);
 
 	// clear out the ducks
 	//get_work_area()->clear_ducks();
@@ -278,7 +280,7 @@ StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	}
 
 	//Disable duck clicking for the maximum coolness :)
-	get_work_area()->allow_duck_clicks = false;
+	get_work_area()->set_allow_duck_clicks(false);
 	get_work_area()->set_type_mask((Duck::Type)((int)Duck::TYPE_WIDTH + (int)Duck::TYPE_RADIUS));
 
 	// Turn the mouse pointer to crosshairs
@@ -327,10 +329,10 @@ StateWidth_Context::~StateWidth_Context()
 	}
 
 	// Restore Duck clicking
-	get_work_area()->allow_duck_clicks = prev_workarea_duck_clicking;
+	get_work_area()->set_allow_duck_clicks(prev_workarea_duck_clicking);
 
 	// Restore layer clicking
-	get_work_area()->allow_layer_clicks = prev_workarea_layer_clicking;
+	get_work_area()->set_allow_layer_clicks(prev_workarea_layer_clicking);
 
 	// Restore the mouse pointer
 	get_work_area()->reset_cursor();
@@ -461,7 +463,7 @@ StateWidth_Context::event_mouse_handler(const Smach::event& x)
 {
 	const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
 
-	//handle ze click
+	//handle the click
 	if( (event.key == EVENT_WORKAREA_MOUSE_BUTTON_DOWN || event.key == EVENT_WORKAREA_MOUSE_BUTTON_DRAG)
 			&& event.button == BUTTON_LEFT )
 	{