X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=6557ca51a74944d92e3f8c1d51483a3f4c992fd1;hb=0775390967acc868a87002bd747f3a4846a26cfb;hp=cf26372620a55a70f0f5b3a6730d30ad97dec1b4;hpb=466bd68259ab70207c5bdbd1ecaa180699be4969;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index cf26372..6557ca5 100644
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -386,7 +386,7 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
 	canvas_view_(canvas_view),
 	is_working(*canvas_view),
 	loop_(false),
-	prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
+	prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
 	settings(synfigapp::Main::get_selected_input_device()->settings()),
 	entry_id(),
 	checkbutton_pressure_width(_("Pressure Width")),
@@ -448,10 +448,10 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
 	get_work_area()->set_type_mask(Duck::TYPE_ALL-Duck::TYPE_TANGENT-Duck::TYPE_WIDTH);
 
 	// Turn off layer clicking
-	get_work_area()->allow_layer_clicks=false;
+	get_work_area()->set_allow_layer_clicks(false);
 
 	// Turn off duck clicking
-	get_work_area()->allow_duck_clicks=false;
+	get_work_area()->set_allow_duck_clicks(false);
 
 	// clear out the ducks
 	//get_work_area()->clear_ducks();
@@ -515,7 +515,7 @@ StateDraw_Context::refresh_tool_options()
 }
 
 Smach::event_result
-StateDraw_Context::event_refresh_tool_options(const Smach::event& x)
+StateDraw_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
 	refresh_tool_options();
 	return Smach::RESULT_ACCEPT;
@@ -532,10 +532,10 @@ StateDraw_Context::~StateDraw_Context()
 	get_canvas_view()->work_area->reset_cursor();
 
 	// Restore layer clicking
-	get_work_area()->allow_layer_clicks=prev_workarea_layer_status_;
+	get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
 
 	// Restore duck clicking
-	get_work_area()->allow_duck_clicks=true;
+	get_work_area()->set_allow_duck_clicks(true);
 
 	// Enable the time bar
 	get_canvas_view()->set_sensitive_timebar(true);
@@ -550,13 +550,13 @@ StateDraw_Context::~StateDraw_Context()
 }
 
 Smach::event_result
-StateDraw_Context::event_stop_handler(const Smach::event& x)
+StateDraw_Context::event_stop_handler(const Smach::event& /*x*/)
 {
 	throw Smach::egress_exception();
 }
 
 Smach::event_result
-StateDraw_Context::event_refresh_handler(const Smach::event& x)
+StateDraw_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
 	refresh_ducks();
 	return Smach::RESULT_ACCEPT;
@@ -575,7 +575,7 @@ StateDraw_Context::event_mouse_down_handler(const Smach::event& x)
 			return Smach::RESULT_ACCEPT;
 		}
 
-	case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
+	case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
 		return Smach::RESULT_ACCEPT;
 
 	default:
@@ -758,7 +758,7 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 	bool extend_start=false,extend_finish=false,complete_loop=false;
 	bool extend_start_join_same=false,extend_start_join_different=false;
 	bool extend_finish_join_same=false,extend_finish_join_different=false;
-	int start_duck_index = 0,finish_duck_index = 0; // initialised to keep the compiler happy; shouldn't be needed though
+	int start_duck_index = 0,finish_duck_index = 0; // initialized to keep the compiler happy; shouldn't be needed though
 	ValueNode_BLine::Handle start_duck_value_node_bline=NULL,finish_duck_value_node_bline=NULL;
 
 	// Find any ducks at the start or end that we might attach to