diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2005-09-26 02:48:59 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-09-26 02:48:59 +0000 |
commit | 25ac88fcae679cb8c1355fee1b4932122dc5fe36 (patch) | |
tree | 42d3bd6a7e28e6881e441f46dccd0ef20dee4a14 | |
parent | 5f9df85b0dac5ab5ac68bd20b14aafa2981973d3 (diff) |
fix all _impl member functions to be on_ instead
git-svn-id: svn://localhost/trunk/ardour2@38 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/ardour_dialog.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/ardour_dialog.h | 6 | ||||
-rw-r--r-- | gtk2_ardour/audio_clock.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/audio_clock.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/connection_editor.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/connection_editor.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/io_selector.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/io_selector.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/meter_bridge.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/meter_bridge.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/panner2d.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/panner2d.h | 10 |
14 files changed, 42 insertions, 42 deletions
diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index dba574540e..1755214bd8 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -43,7 +43,7 @@ ArdourDialog::~ArdourDialog () } gint -ArdourDialog::enter_notify_event_impl (GdkEventCrossing *ev) +ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev) { if (ev->detail != GDK_NOTIFY_INFERIOR) { Keyboard::the_keyboard().set_current_dialog (this); @@ -52,7 +52,7 @@ ArdourDialog::enter_notify_event_impl (GdkEventCrossing *ev) } gint -ArdourDialog::leave_notify_event_impl (GdkEventCrossing *ev) +ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev) { if (ev->detail != GDK_NOTIFY_INFERIOR) { Keyboard::the_keyboard().set_current_dialog (0); @@ -61,12 +61,12 @@ ArdourDialog::leave_notify_event_impl (GdkEventCrossing *ev) } gint -ArdourDialog::unmap_event_impl (GdkEventAny *ev) +ArdourDialog:on_unmap (GdkEventAny *ev) { _within_hiding = true; Hiding (); /* EMIT_SIGNAL */ _within_hiding = false; - return Gtk::Window::unmap_event_impl (ev); + return Gtk::Window::on_unmap (ev); } void diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h index f59802942a..963c604c5a 100644 --- a/gtk2_ardour/ardour_dialog.h +++ b/gtk2_ardour/ardour_dialog.h @@ -49,9 +49,9 @@ class ArdourDialog : public Gtk::Window, public KeyboardTarget void set_hide_on_stop (bool yn); int run_status(); - gint enter_notify_event_impl (GdkEventCrossing*); - gint leave_notify_event_impl (GdkEventCrossing*); - gint unmap_event_impl (GdkEventAny *); + gint on_enter_notify_event (GdkEventCrossing*); + gint on_leave_notify_event (GdkEventCrossing*); + gint on_unmap (GdkEventAny *); ARDOUR::Session *session; diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index c438b3d86c..a2696c659e 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -309,9 +309,9 @@ AudioClock::setup_events () } void -AudioClock::realize_impl () +AudioClock:on_realize () { - HBox::realize_impl (); + HBox::on_realize (); } void diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index fae285e3ad..3d92d7ba26 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -144,7 +144,7 @@ class AudioClock : public Gtk::HBox double drag_y; double drag_accum; - void realize_impl (); + void on_realize (); gint field_motion_notify_event (GdkEventMotion *ev, Field); gint field_button_press_event (GdkEventButton *ev, Field); diff --git a/gtk2_ardour/connection_editor.cc b/gtk2_ardour/connection_editor.cc index b4dbd12ef0..1f55ba0930 100644 --- a/gtk2_ardour/connection_editor.cc +++ b/gtk2_ardour/connection_editor.cc @@ -243,10 +243,10 @@ ConnectionEditor::clear () } gint -ConnectionEditor::map_event_impl (GdkEventAny *ev) +ConnectionEditor::on_map (GdkEventAny *ev) { refill_connection_display (); - return Window::map_event_impl (ev); + return Window::on_map (ev); } void diff --git a/gtk2_ardour/connection_editor.h b/gtk2_ardour/connection_editor.h index 65eb7b9166..f331d05719 100644 --- a/gtk2_ardour/connection_editor.h +++ b/gtk2_ardour/connection_editor.h @@ -53,7 +53,7 @@ class ConnectionEditor : public ArdourDialog { void set_session (ARDOUR::Session *); protected: - gint map_event_impl (GdkEventAny *); + gint on_map (GdkEventAny *); private: ARDOUR::Connection *current_connection; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c34a807402..97d6a8f90d 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1367,7 +1367,7 @@ Editor::deferred_reposition_and_zoom (jack_nframes_t frame, double nfpu) } void -Editor::realize_impl () +Editor::on_realize () { /* Even though we're not using acceleration, we want the labels to show up. @@ -1376,7 +1376,7 @@ Editor::realize_impl () track_context_menu.accelerate (*this->get_toplevel()); track_region_context_menu.accelerate (*this->get_toplevel()); - Window::realize_impl (); + Window::on_realize (); GdkPixmap* empty_pixmap = gdk_pixmap_new (get_window(), 1, 1, 1); GdkPixmap* empty_bitmap = gdk_pixmap_new (get_window(), 1, 1, 1); @@ -1386,9 +1386,9 @@ Editor::realize_impl () } void -Editor::map__impl () +Editor::on_map () { - Window::map__impl (); + Window::on_map (); track_canvas_scroller.get_window().set_cursor (current_canvas_cursor); time_canvas_scroller.get_window().set_cursor (timebar_cursor); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 1d585662fb..6e7f47b920 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -304,8 +304,8 @@ class Editor : public PublicEditor void map_transport_state (); void map_position_change (jack_nframes_t); - void realize_impl(); - void map__impl(); + void on_realize(); + void on_map (); private: diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 4f0bf4375f..5cf7ad5214 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -124,10 +124,10 @@ IOSelectorWindow::accept () gint -IOSelectorWindow::map_event_impl (GdkEventAny *ev) +IOSelectorWindow::on_map (GdkEventAny *ev) { _selector.redisplay (); - return Window::map_event_impl (ev); + return Window::on_map (ev); } /************************* @@ -829,10 +829,10 @@ PortInsertWindow::plugin_going_away (ARDOUR::Redirect* ignored) } gint -PortInsertWindow::map_event_impl (GdkEventAny *ev) +PortInsertWindow::on_map (GdkEventAny *ev) { _portinsertui.redisplay (); - return Window::map_event_impl (ev); + return Window::on_map (ev); } diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h index 534b7482f4..fd549cc6a2 100644 --- a/gtk2_ardour/io_selector.h +++ b/gtk2_ardour/io_selector.h @@ -116,7 +116,7 @@ class IOSelectorWindow : public ArdourDialog IOSelector& selector() { return _selector; } protected: - gint map_event_impl (GdkEventAny *); + gint on_map (GdkEventAny *); private: IOSelector _selector; @@ -158,7 +158,7 @@ class PortInsertWindow : public ArdourDialog PortInsertWindow (ARDOUR::Session&, ARDOUR::PortInsert&, bool can_cancel=false); protected: - gint map_event_impl (GdkEventAny *); + gint on_map (GdkEventAny *); private: diff --git a/gtk2_ardour/meter_bridge.cc b/gtk2_ardour/meter_bridge.cc index f5c3854570..f71796cae2 100644 --- a/gtk2_ardour/meter_bridge.cc +++ b/gtk2_ardour/meter_bridge.cc @@ -241,16 +241,16 @@ MeterBridge::toggle_metering () } gint -MeterBridge::map_event_impl (GdkEventAny *ev) +MeterBridge::on_map (GdkEventAny *ev) { start_metering (); - return Window::map_event_impl (ev); + return Window::on_map (ev); } gint -MeterBridge::unmap_event_impl (GdkEventAny *ev) +MeterBridge::on_unmap (GdkEventAny *ev) { stop_metering (); - return Window::unmap_event_impl (ev); + return Window::on_unmap (ev); } diff --git a/gtk2_ardour/meter_bridge.h b/gtk2_ardour/meter_bridge.h index ba84d2ec21..4fe0c15a92 100644 --- a/gtk2_ardour/meter_bridge.h +++ b/gtk2_ardour/meter_bridge.h @@ -54,8 +54,8 @@ class MeterBridge : public ArdourDialog void toggle_metering (); protected: - gint map_event_impl (GdkEventAny *); - gint unmap_event_impl (GdkEventAny *); + gint on_map (GdkEventAny *); + gint on_unmap (GdkEventAny *); private: /* diskstream/recorder display */ diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 0c04337b87..a228821e9d 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -124,12 +124,12 @@ Panner2d::reset (uint32_t n_inputs) } void -Panner2d::size_allocate_impl (GtkAllocation *alloc) +Panner2d::on_size_allocate (GtkAllocation *alloc) { width = alloc->width; height = alloc->height; - DrawingArea::size_allocate_impl (alloc); + DrawingArea::on_size_allocate (alloc); } int @@ -353,7 +353,7 @@ Panner2d::find_closest_object (gdouble x, gdouble y, int& which, bool& is_puck) } gint -Panner2d::motion_notify_event_impl (GdkEventMotion *ev) +Panner2d::on_motion_notify_event (GdkEventMotion *ev) { gint x, y; GdkModifierType state; @@ -420,7 +420,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) } gint -Panner2d::expose_event_impl (GdkEventExpose *event) +Panner2d::on_expose_event (GdkEventExpose *event) { gint x, y; float fx, fy; @@ -492,7 +492,7 @@ Panner2d::expose_event_impl (GdkEventExpose *event) } gint -Panner2d::button_press_event_impl (GdkEventButton *ev) +Panner2d::on_button_press_event (GdkEventButton *ev) { switch (ev->button) { case 1: @@ -515,7 +515,7 @@ Panner2d::button_press_event_impl (GdkEventButton *ev) } gint -Panner2d::button_release_event_impl (GdkEventButton *ev) +Panner2d::on_button_release_event (GdkEventButton *ev) { switch (ev->button) { case 1: diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h index b16a2a1a2f..70f79f7d6d 100644 --- a/gtk2_ardour/panner2d.h +++ b/gtk2_ardour/panner2d.h @@ -63,11 +63,11 @@ class Panner2d : public Gtk::DrawingArea sigc::signal<void,int> TargetMoved; protected: - gint expose_event_impl (GdkEventExpose *); - gint button_press_event_impl (GdkEventButton *); - gint button_release_event_impl (GdkEventButton *); - gint motion_notify_event_impl (GdkEventMotion *); - void size_allocate_impl (GtkAllocation* alloc); + gint on_expose_event (GdkEventExpose *); + gint on_button_press_event (GdkEventButton *); + gint on_button_release_event (GdkEventButton *); + gint on_motion_notify_event (GdkEventMotion *); + void on_size_allocate (GtkAllocation* alloc); private: struct Target { |