X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Fstate_width.cpp;h=b8a79261a44c189c66577f7441c5da2e7d84adde;hb=a42ee14a3397a3fbb31d14e6eece4236620ae2db;hp=5af67655f028851d0179ce9bebeb7df0afc04310;hpb=f6184c2a9c2245aae802c31c8f3300e1b744359c;p=synfig.git diff --git a/synfig-studio/tags/stable/src/gtkmm/state_width.cpp b/synfig-studio/tags/stable/src/gtkmm/state_width.cpp index 5af6765..b8a7926 100644 --- a/synfig-studio/tags/stable/src/gtkmm/state_width.cpp +++ b/synfig-studio/tags/stable/src/gtkmm/state_width.cpp @@ -208,8 +208,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 +243,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 +278,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 @@ -307,7 +307,7 @@ StateWidth_Context::refresh_tool_options() } Smach::event_result -StateWidth_Context::event_refresh_tool_options(const Smach::event& x) +StateWidth_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -327,10 +327,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(); @@ -354,13 +354,13 @@ StateWidth_Context::~StateWidth_Context() } Smach::event_result -StateWidth_Context::event_stop_handler(const Smach::event& x) +StateWidth_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateWidth_Context::event_refresh_handler(const Smach::event& x) +StateWidth_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT;