change tooltip for group tab to suggest click-to-(de)activate

[ardour.git] / gtk2_ardour / marker_view.cc

diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc
index 7700c8436f0e3fde21034be9d2a80bbd818dda75..a0e8f2bbf0c95a847c768b852760345f8c653992 100644 (file)
--- a/gtk2_ardour/marker_view.cc
+++ b/gtk2_ardour/marker_view.cc
@@ -26,9 +26,8 @@
 #include "marker_view.h"
 
 using namespace ARDOUR ;
-using namespace sigc;
 
-sigc::signal<void,MarkerView*> MarkerView::GoingAway;
+PBD::Signal1<void,MarkerView*> MarkerView::CatchDeletion
 
 //---------------------------------------------------------------------------------------//
 // Constructor / Desctructor
@@ -65,8 +64,10 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent,
 
        // hook up our canvas events
 
-       frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
-       frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));
+       if (frame_handle_start) {
+               frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
+               frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));
+       }
        group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_item_view_event), group, this));
 
        set_position(start, this) ;