From 053eaf77fde7639d4e200d36a9db99b2d4fc615b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 9 Apr 2013 14:22:58 -0400 Subject: a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff --- gtk2_ardour/marker.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/marker.cc') diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 246f1f4087..875fd4cdf3 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -282,15 +282,19 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); - group->set_data ("marker", this); + /* events will be handled by both the group and the mark itself, so + * make sure they can both be used to lookup this object. + */ + group->set_data ("marker", this); + mark->set_data ("marker", this); + if (handle_events) { group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } } - Marker::~Marker () { CatchDeletion (this); /* EMIT SIGNAL */ -- cgit v1.2.3