the ongoing story of umpteen lines of code and its love affair with GTK2

git-svn-id: svn://localhost/trunk/ardour2@57 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 32 insertions, 66 deletions

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index bfb2cf78f0..a8b71d427b 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -114,72 +114,38 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget
 	sigc::signal<void> XOriginChanged;
 	sigc::signal<void> Resized;
 
-	static gint canvas_crossfade_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_fade_in_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_fade_in_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_fade_out_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_fade_out_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_region_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_region_view_name_highlight_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_region_view_name_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_stream_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_zoom_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_selection_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_selection_start_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_selection_end_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_control_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_line_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_tempo_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_meter_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_tempo_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_meter_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_range_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_transport_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data);
-	static gint canvas_imageframe_item_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) ;
-	static gint canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) ;
-	static gint canvas_imageframe_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-	static gint canvas_imageframe_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-	static gint canvas_marker_time_axis_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-	static gint canvas_markerview_item_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-	static gint canvas_markerview_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-	static gint canvas_markerview_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-	static gint canvas_automation_track_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) ;
-
-  protected:
-	virtual gint _canvas_fade_in_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_fade_in_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_fade_out_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_fade_out_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_crossfade_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_region_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_region_view_name_highlight_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_region_view_name_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_stream_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_zoom_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_selection_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_selection_start_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_selection_end_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_control_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_line_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_tempo_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_meter_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_tempo_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_meter_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_range_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_transport_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_imageframe_item_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_imageframe_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_imageframe_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_marker_time_axis_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_markerview_item_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_markerview_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_markerview_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-	virtual gint _canvas_automation_track_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) = 0;
+	virtual gint canvas_crossfade_view_event (GdkEvent* event) = 0;
+	virtual gint canvas_fade_in_event (GdkEvent* event) = 0;
+	virtual gint canvas_fade_in_handle_event (GdkEvent* event) = 0;
+	virtual gint canvas_fade_out_event (GdkEvent* event) = 0;
+	virtual gint canvas_fade_out_handle_event (GdkEvent* event) = 0;
+	virtual gint canvas_region_view_event (GdkEvent* event) = 0;
+	virtual gint canvas_region_view_name_highlight_event (GdkEvent* event) = 0;
+	virtual gint canvas_region_view_name_event (GdkEvent* event) = 0;
+	virtual gint canvas_stream_view_event (GdkEvent* event) = 0;
+	virtual gint canvas_marker_event (GdkEvent* event) = 0;
+	virtual gint canvas_zoom_rect_event (GdkEvent* event) = 0;
+	virtual gint canvas_selection_rect_event (GdkEvent* event) = 0;
+	virtual gint canvas_selection_start_trim_event (GdkEvent* event) = 0;
+	virtual gint canvas_selection_end_trim_event (GdkEvent* event) = 0;
+	virtual gint canvas_control_point_event (GdkEvent* event) = 0;
+	virtual gint canvas_line_event (GdkEvent* event) = 0;
+	virtual gint canvas_tempo_marker_event (GdkEvent* event) = 0;
+	virtual gint canvas_meter_marker_event (GdkEvent* event) = 0;
+	virtual gint canvas_tempo_bar_event (GdkEvent* event) = 0;
+	virtual gint canvas_meter_bar_event (GdkEvent* event) = 0;
+	virtual gint canvas_marker_bar_event (GdkEvent* event) = 0;
+	virtual gint canvas_range_marker_bar_event (GdkEvent* event) = 0;
+	virtual gint canvas_transport_marker_bar_event (GdkEvent* event) = 0;
+	virtual gint canvas_imageframe_item_view_event(GdkEvent* event)  = 0;
+	virtual gint canvas_imageframe_view_event(GdkEvent* event)  = 0;
+	virtual gint canvas_imageframe_start_handle_event(GdkEvent* event)  = 0;
+	virtual gint canvas_imageframe_end_handle_event(GdkEvent* event)  = 0;
+	virtual gint canvas_marker_time_axis_view_event(GdkEvent* event)  = 0;
+	virtual gint canvas_markerview_item_view_event(GdkEvent* event)  = 0;
+	virtual gint canvas_markerview_start_handle_event(GdkEvent* event)  = 0;
+	virtual gint canvas_markerview_end_handle_event(GdkEvent* event)  = 0;
+	virtual gint canvas_automation_track_event(GdkEvent* event)  = 0;
 
 	static PublicEditor* _instance;
 };