projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spread the sprouts out evenly along each bline. Previously they appeared at both...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
cellrenderer_timetrack.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
index
754d260
..
56daa05
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@
-2,7
+2,7
@@
/*! \file cellrenderer_timetrack.cpp
** \brief Template Header
**
/*! \file cellrenderer_timetrack.cpp
** \brief Template Header
**
-** $Id
: cellrenderer_timetrack.cpp,v 1.4 2005/01/13 20:23:01 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
@@
-158,6
+158,14
@@
bool get_closest_time(const synfig::Node::time_set &tset, const Time &t, const T
{
Node::time_set::const_iterator i,j,end = tset.end();
{
Node::time_set::const_iterator i,j,end = tset.end();
+ // stop the crash mentioned in bug #1689282
+ // doesn't solve the underlying problem though, I don't think
+ if (tset.size() == 0)
+ {
+ synfig::error(__FILE__":%d: tset.size() == 0",__LINE__);
+ return false;
+ }
+
//TODO add in RangeGet so it's not so damn hard to click on points
i = tset.upper_bound(t); //where t is the lower bound, t < [first,i)
//TODO add in RangeGet so it's not so damn hard to click on points
i = tset.upper_bound(t); //where t is the lower bound, t < [first,i)
@@
-191,10
+199,10
@@
void
CellRenderer_TimeTrack::render_vfunc(
const Glib::RefPtr<Gdk::Drawable>& window,
Gtk::Widget& widget,
CellRenderer_TimeTrack::render_vfunc(
const Glib::RefPtr<Gdk::Drawable>& window,
Gtk::Widget& widget,
- const Gdk::Rectangle&
background_area
,
+ const Gdk::Rectangle&
/*background_area*/
,
const Gdk::Rectangle& area_,
const Gdk::Rectangle& area_,
- const Gdk::Rectangle&
expose_area
,
- Gtk::CellRendererState
flags
)
+ const Gdk::Rectangle&
/*expose_area*/
,
+ Gtk::CellRendererState
/*flags*/
)
{
if(!window)
return;
{
if(!window)
return;
@@
-521,7
+529,7
@@
CellRenderer_TimeTrack::render_vfunc(
}
synfig::ValueNode_Animated::WaypointList::iterator
}
synfig::ValueNode_Animated::WaypointList::iterator
-CellRenderer_TimeTrack::find_waypoint(const synfig::Time&
t
,const synfig::Time& scope)
+CellRenderer_TimeTrack::find_waypoint(const synfig::Time&
/*t*/
,const synfig::Time& scope)
{
synfig::ValueNode_Animated *value_node=dynamic_cast<synfig::ValueNode_Animated*>(property_value_desc().get_value().get_value_node().get());
{
synfig::ValueNode_Animated *value_node=dynamic_cast<synfig::ValueNode_Animated*>(property_value_desc().get_value().get_value_node().get());
@@
-556,11
+564,11
@@
CellRenderer_TimeTrack::find_waypoint(const synfig::Time& t,const synfig::Time&
bool
CellRenderer_TimeTrack::activate_vfunc(
GdkEvent* event,
bool
CellRenderer_TimeTrack::activate_vfunc(
GdkEvent* event,
- Gtk::Widget&
widget
,
+ Gtk::Widget&
/*widget*/
,
const Glib::ustring& treepath,
const Glib::ustring& treepath,
- const Gdk::Rectangle&
background_area
,
+ const Gdk::Rectangle&
/*background_area*/
,
const Gdk::Rectangle& cell_area,
const Gdk::Rectangle& cell_area,
- Gtk::CellRendererState
flags
)
+ Gtk::CellRendererState
/*flags*/
)
{
path=treepath;
synfig::ValueNode_Animated::WaypointList::iterator iter;
{
path=treepath;
synfig::ValueNode_Animated::WaypointList::iterator iter;