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_star.cpp
diff --git
a/synfig-studio/src/gtkmm/state_star.cpp
b/synfig-studio/src/gtkmm/state_star.cpp
index
719e0d3
..
270571a
100644
(file)
--- a/
synfig-studio/src/gtkmm/state_star.cpp
+++ b/
synfig-studio/src/gtkmm/state_star.cpp
@@
-38,7
+38,7
@@
#include <synfig/valuenode_bline.h>
#include "state_star.h"
#include <synfig/valuenode_bline.h>
#include "state_star.h"
-#include "state_normal.h"
throw &state_normal; //throw Smach::egress_exception();
+#include "state_normal.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
@@
-511,7
+511,7
@@
StateStar_Context::StateStar_Context(CanvasView* canvas_view):
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateStar_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateStar_Context::on_user_click));
- get_
canvas_view()->work_area->set_cursor(Gdk::CROSSHAI
R);
+ get_
work_area()->set_cursor(Gdk::STA
R);
App::toolbox->refresh();
}
App::toolbox->refresh();
}
@@
-538,7
+538,7
@@
StateStar_Context::~StateStar_Context()
// 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_);
- get_
canvas_view()->work_area
->reset_cursor();
+ get_
work_area()
->reset_cursor();
App::dialog_tool_options->clear();
App::dialog_tool_options->clear();
@@
-559,7
+559,9
@@
StateStar_Context::~StateStar_Context()
Smach::event_result
StateStar_Context::event_stop_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateStar_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