projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document --start-time.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_zoom.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp
b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp
index
ad1f439
..
66b8d4e
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_zoom.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_zoom.cpp
@@
-1,6
+1,6
@@
/* === S Y N F I G ========================================================= */
/*! \file state_zoom.cpp
/* === S Y N F I G ========================================================= */
/*! \file state_zoom.cpp
-** \brief Zoom Tool
e
Implementation File
+** \brief Zoom Tool Implementation File
**
** $Id$
**
**
** $Id$
**
@@
-45,6
+45,8
@@
#include "toolbox.h"
#include <synfigapp/main.h>
#include "toolbox.h"
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-153,7
+155,7
@@
StateZoom_Context::reset()
StateZoom_Context::StateZoom_Context(CanvasView* canvas_view):
canvas_view_(canvas_view),
is_working(*canvas_view),
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
settings(synfigapp::Main::get_selected_input_device()->settings())
{
// Set up the tool options dialog
@@
-167,7
+169,7
@@
StateZoom_Context::StateZoom_Context(CanvasView* canvas_view):
App::dialog_tool_options->present();
// Turn off layer clicking
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(); //???
// clear out the ducks
get_work_area()->clear_ducks(); //???
@@
-210,7
+212,7
@@
StateZoom_Context::~StateZoom_Context()
save_settings();
// Restore layer clicking
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();
get_canvas_view()->work_area->reset_cursor();
App::dialog_tool_options->clear();