From 60f817b0d2411947c257ecbf0b0376589ea77acd Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 5 Oct 2005 13:48:09 +0000 Subject: 2 cleanup patches from nickm, plus work on mixer_ui.cc so that it compiles git-svn-id: svn://localhost/trunk/ardour2@47 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/public_editor.cc | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'gtk2_ardour/public_editor.cc') diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc index 184c1c0dc9..f1c287b969 100644 --- a/gtk2_ardour/public_editor.cc +++ b/gtk2_ardour/public_editor.cc @@ -4,7 +4,7 @@ PublicEditor* PublicEditor::_instance = 0; PublicEditor::PublicEditor () - : Window (GTK_WINDOW_TOPLEVEL), + : Window (Gtk::WINDOW_TOPLEVEL), KeyboardTarget (*this, "editor") { } @@ -15,130 +15,130 @@ PublicEditor::~PublicEditor() gint PublicEditor::canvas_fade_in_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_fade_in_event() (item, event, data); + return instance()->canvas_fade_in_event (item, event, data); } gint PublicEditor::canvas_fade_in_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_fade_in_handle_event() (item, event, data); + return instance()->canvas_fade_in_handle_event (item, event, data); } gint PublicEditor::canvas_fade_out_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_fade_out_event() (item, event, data); + return instance()->canvas_fade_out_event (item, event, data); } gint PublicEditor::canvas_fade_out_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_fade_out_handle_event() (item, event, data); + return instance()->canvas_fade_out_handle_event (item, event, data); } gint PublicEditor::canvas_crossfade_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_crossfade_view_event() (item, event, data); + return instance()->canvas_crossfade_view_event (item, event, data); } gint PublicEditor::canvas_region_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_region_view_event() (item, event, data); + return instance()->canvas_region_view_event (item, event, data); } gint PublicEditor::canvas_region_view_name_highlight_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_region_view_name_highlight_event() (item, event, data); + return instance()->canvas_region_view_name_highlight_event (item, event, data); } gint PublicEditor::canvas_region_view_name_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_region_view_name_event() (item, event, data); + return instance()->canvas_region_view_name_event (item, event, data); } gint PublicEditor::canvas_stream_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_stream_view_event() (item, event, data); + return instance()->canvas_stream_view_event (item, event, data); } gint PublicEditor::canvas_automation_track_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_automation_track_event() (item, event, data); + return instance()->canvas_automation_track_event (item, event, data); } gint PublicEditor::canvas_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_marker_event() (item, event, data); + return instance()->canvas_marker_event (item, event, data); } gint PublicEditor::canvas_zoom_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_zoom_rect_event() (item, event, data); + return instance()->canvas_zoom_rect_event (item, event, data); } gint PublicEditor::canvas_selection_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_selection_rect_event() (item, event, data); + return instance()->canvas_selection_rect_event (item, event, data); } gint PublicEditor::canvas_selection_start_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_selection_start_trim_event() (item, event, data); + return instance()->canvas_selection_start_trim_event (item, event, data); } gint PublicEditor::canvas_selection_end_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_selection_end_trim_event() (item, event, data); + return instance()->canvas_selection_end_trim_event (item, event, data); } gint PublicEditor::canvas_control_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_control_point_event() (item, event, data); + return instance()->canvas_control_point_event (item, event, data); } gint PublicEditor::canvas_line_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_line_event() (item, event, data); + return instance()->canvas_line_event (item, event, data); } gint PublicEditor::canvas_tempo_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_tempo_marker_event() (item, event, data); + return instance()->canvas_tempo_marker_event (item, event, data); } gint PublicEditor::canvas_meter_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_meter_marker_event() (item, event, data); + return instance()->canvas_meter_marker_event (item, event, data); } gint PublicEditor::canvas_tempo_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_tempo_bar_event() (item, event, data); + return instance()->canvas_tempo_bar_event (item, event, data); } gint PublicEditor::canvas_meter_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_meter_bar_event() (item, event, data); + return instance()->canvas_meter_bar_event (item, event, data); } gint PublicEditor::canvas_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_marker_bar_event() (item, event, data); + return instance()->canvas_marker_bar_event (item, event, data); } gint PublicEditor::canvas_range_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_range_marker_bar_event() (item, event, data); + return instance()->canvas_range_marker_bar_event (item, event, data); } gint PublicEditor::canvas_transport_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_transport_marker_bar_event() (item, event, data); + return instance()->canvas_transport_marker_bar_event (item, event, data); } gint PublicEditor::canvas_imageframe_item_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_imageframe_item_view_event()(item, event, data); + return instance()->canvas_imageframe_item_view_event(item, event, data); } gint PublicEditor::canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_imageframe_view_event()(item, event, data); + return instance()->canvas_imageframe_view_event(item, event, data); } gint PublicEditor::canvas_imageframe_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_imageframe_start_handle_event()(item, event, data); + return instance()->canvas_imageframe_start_handle_event(item, event, data); } gint PublicEditor::canvas_imageframe_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_imageframe_end_handle_event()(item, event, data); + return instance()->canvas_imageframe_end_handle_event(item, event, data); } gint PublicEditor::canvas_marker_time_axis_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_marker_time_axis_view_event()(item, event, data); + return instance()->canvas_marker_time_axis_view_event(item, event, data); } gint PublicEditor::canvas_markerview_item_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_markerview_item_view_event()(item, event, data); + return instance()->canvas_markerview_item_view_event(item, event, data); } gint PublicEditor::canvas_markerview_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_markerview_start_handle_event()(item, event, data); + return instance()->canvas_markerview_start_handle_event(item, event, data); } gint PublicEditor::canvas_markerview_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_markerview_end_handle_event()(item, event, data); + return instance()->canvas_markerview_end_handle_event(item, event, data); } -- cgit v1.2.3