projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reinstate the -Wno-unused-parameter flag, because when building a non-debug build...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_polygon.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
index
ed7f164
..
ab1138b
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_polygon.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_polygon.cpp
@@
-2,7
+2,7
@@
/*! \file state_polygon.cpp
** \brief Template File
**
/*! \file state_polygon.cpp
** \brief Template File
**
-** $Id
: state_polygon.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-119,7
+119,7
@@
public:
void reset();
void increment_id();
bool no_egress_on_selection_change;
void reset();
void increment_id();
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();
@@
-249,8
+249,8
@@
StatePolygon_Context::StatePolygon_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::StatePolygon_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StatePolygon_Context::on_user_click));
@@
-289,7
+289,7
@@
StatePolygon_Context::refresh_tool_options()
}
Smach::event_result
}
Smach::event_result
-StatePolygon_Context::event_refresh_tool_options(const Smach::event&
x
)
+StatePolygon_Context::event_refresh_tool_options(const Smach::event&
/*x*/
)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
@@
-307,9
+307,8
@@
StatePolygon_Context::~StatePolygon_Context()
get_canvas_view()->work_area->reset_cursor();
get_canvas_view()->work_area->reset_cursor();
- // 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();
@@
-321,7
+320,7
@@
StatePolygon_Context::~StatePolygon_Context()
}
Smach::event_result
}
Smach::event_result
-StatePolygon_Context::event_stop_handler(const Smach::event&
x
)
+StatePolygon_Context::event_stop_handler(const Smach::event&
/*x*/
)
{
synfig::info("STATE RotoPolygon: Received Stop Event");
//throw Smach::egress_exception();
{
synfig::info("STATE RotoPolygon: Received Stop Event");
//throw Smach::egress_exception();
@@
-331,7
+330,7
@@
StatePolygon_Context::event_stop_handler(const Smach::event& x)
}
Smach::event_result
}
Smach::event_result
-StatePolygon_Context::event_refresh_handler(const Smach::event&
x
)
+StatePolygon_Context::event_refresh_handler(const Smach::event&
/*x*/
)
{
synfig::info("STATE RotoPolygon: Received Refresh Event");
refresh_ducks();
{
synfig::info("STATE RotoPolygon: Received Refresh Event");
refresh_ducks();