projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't print pointers as integers, print them as pointers. Thanks to Aurore.
[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
1a91215
..
847a349
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@
-48,6
+48,8
@@
#include <synfig/timepointcollect.h>
#include <synfig/timepointcollect.h>
+#include "general.h"
+
#endif
using namespace synfig;
#endif
using namespace synfig;
@@
-84,7
+86,7
@@
CellRenderer_TimeTrack::CellRenderer_TimeTrack():
property_adjustment_(*this,"adjustment",&adjustment_),
property_enable_timing_info_(*this,"enable-timing-info", false)
{
property_adjustment_(*this,"adjustment",&adjustment_),
property_enable_timing_info_(*this,"enable-timing-info", false)
{
-
dragging=false;
+ dragging=false;
selection=false;
}
selection=false;
}
@@
-938,11
+940,13
@@
CellRenderer_TimeTrack::show_timepoint_menu(const etl::handle<synfig::Node>& nod
n=synfig::waypoint_collect(waypoint_set,time,node);
Gtk::Menu* menu(manage(new Gtk::Menu()));
n=synfig::waypoint_collect(waypoint_set,time,node);
Gtk::Menu* menu(manage(new Gtk::Menu()));
+ menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
// Create the interpolation method menu
if(!waypoint_set.empty())
{
Gtk::Menu* interp_menu(manage(new Gtk::Menu()));
// Create the interpolation method menu
if(!waypoint_set.empty())
{
Gtk::Menu* interp_menu(manage(new Gtk::Menu()));
+ // no need to connect to signal_hide for this one - it will be deleted when its parent is deleted
Waypoint::Model model;
// note: each of the following 4 'if' blocks provokes these warnings:
Waypoint::Model model;
// note: each of the following 4 'if' blocks provokes these warnings: