X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Fstate_zoom.cpp;h=b53a5fbd759723c2f3bd68b5c9b76f1901d5a611;hb=a42ee14a3397a3fbb31d14e6eece4236620ae2db;hp=6ff0224ab178664908a428ed8b4e69a0f691f741;hpb=f6184c2a9c2245aae802c31c8f3300e1b744359c;p=synfig.git diff --git a/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp b/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp index 6ff0224..b53a5fb 100644 --- a/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp +++ b/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp @@ -153,7 +153,7 @@ StateZoom_Context::reset() StateZoom_Context::StateZoom_Context(CanvasView* canvas_view): canvas_view_(canvas_view), is_working(*canvas_view), - 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()) { // Set up the tool options dialog @@ -167,7 +167,7 @@ StateZoom_Context::StateZoom_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(); //??? @@ -199,7 +199,7 @@ StateZoom_Context::refresh_tool_options() } Smach::event_result -StateZoom_Context::event_refresh_tool_options(const Smach::event& x) +StateZoom_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -210,7 +210,7 @@ StateZoom_Context::~StateZoom_Context() save_settings(); // Restore layer clicking - get_work_area()->allow_layer_clicks=prev_workarea_layer_status_; + get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_); get_canvas_view()->work_area->reset_cursor(); App::dialog_tool_options->clear(); @@ -230,13 +230,13 @@ StateZoom_Context::~StateZoom_Context() } Smach::event_result -StateZoom_Context::event_stop_handler(const Smach::event& x) +StateZoom_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateZoom_Context::event_refresh_handler(const Smach::event& x) +StateZoom_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; }