projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into nikitakit_master
[synfig.git]
/
synfig-studio
/
src
/
gtkmm
/
state_draw.cpp
diff --git
a/synfig-studio/src/gtkmm/state_draw.cpp
b/synfig-studio/src/gtkmm/state_draw.cpp
index
dbc5ace
..
4482045
100644
(file)
--- a/
synfig-studio/src/gtkmm/state_draw.cpp
+++ b/
synfig-studio/src/gtkmm/state_draw.cpp
@@
-7,6
+7,7
@@
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007 Chris Moore
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2009 Nikita Kitaev
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-37,6
+38,7
@@
#include "state_draw.h"
#include "state_stroke.h"
#include "state_draw.h"
#include "state_stroke.h"
+#include "state_normal.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
@@
-486,7
+488,7
@@
StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateDraw_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateDraw_Context::on_user_click));
- get_
canvas_view()->work_area
->set_cursor(Gdk::PENCIL);
+ get_
work_area()
->set_cursor(Gdk::PENCIL);
App::toolbox->refresh();
App::toolbox->refresh();
@@
-543,7
+545,7
@@
StateDraw_Context::~StateDraw_Context()
get_work_area()->set_type_mask(old_duckmask);
get_work_area()->set_type_mask(old_duckmask);
- get_
canvas_view()->work_area
->reset_cursor();
+ get_
work_area()
->reset_cursor();
// Restore layer clicking
get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
// Restore layer clicking
get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
@@
-566,7
+568,9
@@
StateDraw_Context::~StateDraw_Context()
Smach::event_result
StateDraw_Context::event_stop_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateDraw_Context::event_stop_handler(const Smach::event& /*x*/)
{
- throw Smach::egress_exception();
+ //throw Smach::egress_exception();
+ throw &state_normal;
+ return Smach::RESULT_OK;
}
Smach::event_result
}
Smach::event_result