projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made a comment about some compiler warnings that I don't yet understand.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_bline.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index
41f8e04
..
9211a07
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@
-163,7
+163,7
@@
public:
Smach::event_result event_mouse_motion_handler(const Smach::event& x);
Smach::event_result event_refresh_tool_options(const Smach::event& x);
Smach::event_result event_mouse_motion_handler(const Smach::event& x);
Smach::event_result event_refresh_tool_options(const Smach::event& x);
- Smach::event_result event_hijack(const Smach::event&
x
) { return Smach::RESULT_ACCEPT; }
+ Smach::event_result event_hijack(const Smach::event&
/*x*/
) { return Smach::RESULT_ACCEPT; }
void refresh_tool_options();
void refresh_tool_options();
@@
-187,7
+187,7
@@
public:
bool run();
bool no_egress_on_selection_change;
bool run();
bool no_egress_on_selection_change;
- Smach::event_result event_layer_selection_changed_handler(const Smach::event&
x
)
+ Smach::event_result event_layer_selection_changed_handler(const Smach::event&
/*x*/
)
{
if(!no_egress_on_selection_change)
throw Smach::egress_exception();
{
if(!no_egress_on_selection_change)
throw Smach::egress_exception();
@@
-369,8
+369,8
@@
StateBLine_Context::StateBLine_Context(CanvasView* canvas_view):
prev_table_status=get_canvas_view()->tables_are_visible();
if(prev_table_status)get_canvas_view()->hide_tables();
prev_table_status=get_canvas_view()->tables_are_visible();
if(prev_table_status)get_canvas_view()->hide_tables();
- //
Hid
e the time bar
- get_canvas_view()->
hide_timebar(
);
+ //
Disabl
e the time bar
+ get_canvas_view()->
set_sensitive_timebar(false
);
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateBLine_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateBLine_Context::on_user_click));
@@
-409,7
+409,7
@@
StateBLine_Context::refresh_tool_options()
}
Smach::event_result
}
Smach::event_result
-StateBLine_Context::event_refresh_tool_options(const Smach::event&
x
)
+StateBLine_Context::event_refresh_tool_options(const Smach::event&
/*x*/
)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
@@
-427,9
+427,8
@@
StateBLine_Context::~StateBLine_Context()
// Restore layer clicking
get_work_area()->allow_layer_clicks=prev_workarea_layer_status_;
// Restore layer clicking
get_work_area()->allow_layer_clicks=prev_workarea_layer_status_;
- // Show the time bar
- if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end())
- get_canvas_view()->show_timebar();
+ // Enable the time bar
+ get_canvas_view()->set_sensitive_timebar(true);
// Bring back the tables if they were out before
if(prev_table_status)get_canvas_view()->show_tables();
// Bring back the tables if they were out before
if(prev_table_status)get_canvas_view()->show_tables();
@@
-443,7
+442,7
@@
StateBLine_Context::~StateBLine_Context()
}
Smach::event_result
}
Smach::event_result
-StateBLine_Context::event_stop_handler(const Smach::event&
x
)
+StateBLine_Context::event_stop_handler(const Smach::event&
/*x*/
)
{
synfig::info("STATE RotoBLine: Received Stop Event");
// run();
{
synfig::info("STATE RotoBLine: Received Stop Event");
// run();
@@
-454,7
+453,7
@@
StateBLine_Context::event_stop_handler(const Smach::event& x)
}
Smach::event_result
}
Smach::event_result
-StateBLine_Context::event_refresh_handler(const Smach::event&
x
)
+StateBLine_Context::event_refresh_handler(const Smach::event&
/*x*/
)
{
synfig::info("STATE RotoBLine: Received Refresh Event");
refresh_ducks();
{
synfig::info("STATE RotoBLine: Received Refresh Event");
refresh_ducks();
@@
-731,7
+730,7
@@
StateBLine_Context::event_mouse_motion_handler(const Smach::event& x)
}
Smach::event_result
}
Smach::event_result
-StateBLine_Context::event_mouse_release_handler(const Smach::event&
x
)
+StateBLine_Context::event_mouse_release_handler(const Smach::event&
/*x*/
)
{
if(curr_duck)
{
{
if(curr_duck)
{