X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-hit.h;h=f25c49ab10d6ee7d54f6f3e462cc3ed26a637cc2;hb=fdbb9d240d870dd7ddf9c04dcfe5b1d5c7211639;hp=a467952966ad793199dbc196bf4932ab785aec33;hpb=166395c96b8a85d90b9785e629c739494494130f;p=ardour.git

diff --git a/gtk2_ardour/canvas-hit.h b/gtk2_ardour/canvas-hit.h
index a467952966..f25c49ab10 100644
--- a/gtk2_ardour/canvas-hit.h
+++ b/gtk2_ardour/canvas-hit.h
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2007 Paul Davis
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -35,24 +35,22 @@ public:
 			MidiRegionView&                   region,
 			Group&                            group,
 			double                            size,
-			const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
+			const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
+                        bool with_events = true);
 
-		: Diamond(group, size), CanvasNoteEvent(region, this, note)
-	{
-	}
-	
 	void show() { Diamond::show(); }
 	void hide() { Diamond::hide(); }
 
-	double x1() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x1; }
-	double y1() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y1; }
-	double x2() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x2; }
-	double y2() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y2; }
-	
+	double x1() const { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x1; }
+	double y1() const { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y1; }
+	double x2() const { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x2; }
+	double y2() const { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y2; }
+
 	void set_outline_color(uint32_t c) { property_outline_color_rgba() = c; }
 	void set_fill_color(uint32_t c) { property_fill_color_rgba() = c; }
 
-	bool on_event(GdkEvent* ev) { return CanvasNoteEvent::on_event(ev); }
+	bool on_event(GdkEvent* ev);
+	void move_event(double dx, double dy);
 };
 
 } // namespace Gnome