X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mouse.cc;h=49aaac68bfb1edaf48f95b61b5d7daa18c799d2b;hb=898764c5137a5d7dfe63cde93bc4ef3ed86dd5bf;hp=7740cb9b17c67bc4083849a651cc9eb691015fef;hpb=336f8d47fe810ee9d057632854e009f1616d272e;p=ardour.git

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 7740cb9b17..49aaac68bf 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -34,7 +34,6 @@
 
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/tearoff.h"
 
 #include "canvas/canvas.h"
 
@@ -333,12 +332,12 @@ Editor::update_time_selection_display ()
 	switch (mouse_mode) {
 	case MouseRange:
 		selection->clear_objects ();
-		selection->ClearMidiNoteSelection ();  /* EMIT SIGNAL */
+		selection->clear_midi_notes ();
 		break;
 	case MouseObject:
 		selection->clear_time ();
 		selection->clear_tracks ();
-		selection->ClearMidiNoteSelection ();  /* EMIT SIGNAL */
+		selection->clear_midi_notes ();
 		break;
 	case MouseDraw:
 		/* Clear regions, but not time or tracks, since that
@@ -685,7 +684,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			new TempoMarkerDrag (
 				this,
 				item,
-				Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
+				Keyboard::modifier_state_equals (event->button.state, Keyboard::CopyModifier)
 				),
 			event
 			);
@@ -2457,7 +2456,7 @@ Editor::escape ()
 		selection->clear ();
 	}
 
-	reset_focus ();
+	reset_focus (&contents());
 }
 
 /** Update _join_object_range_state which indicate whether we are over the top