Added comment explaining new Gtk::Dialog idiom.

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 756ec028aee16f89df8dfed6589a4eb9533510cb..9e73596b9f5fe1d07a86ee8db30faca05fd4dff6 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -44,15 +44,19 @@ class TempoMarker;
 class MeterMarker;
 class Marker;
 class AutomationTimeAxisView;
+class MarkerTimeAxis;
+class ImageFrameView;
+class ImageFrameTimeAxis;
+class MarkerView;
 
-class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget {
+class PublicEditor : public Gtk::Window, public Stateful {
   public:
        PublicEditor();
        virtual ~PublicEditor();
 
        typedef list<TimeAxisView *> TrackViewList;
 
-       static PublicEditor* instance() { return _instance; }
+       static PublicEditor& instance() { return *_instance; }
 
        virtual void             connect_to_session (ARDOUR::Session*) = 0;
        virtual ARDOUR::Session* current_session() const = 0;
@@ -90,6 +94,7 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget
        virtual bool show_measures () const = 0;
        virtual void export_session() = 0;
        virtual void export_selection() = 0;
+       virtual void register_actions() = 0;
        virtual void add_toplevel_controls (Gtk::Container&) = 0;
        virtual void      set_zoom_focus (Editing::ZoomFocus) = 0;
        virtual Editing::ZoomFocus get_zoom_focus () const = 0;
@@ -152,16 +157,14 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget
        virtual bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
        virtual bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
 
-       // PENDING
-
-       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 bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0;
+       virtual bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*) = 0;
+       virtual bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0;
+       virtual bool canvas_imageframe_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0;
+       virtual bool canvas_marker_time_axis_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerTimeAxis*) = 0;
+       virtual bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
+       virtual bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
+       virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
 
        static PublicEditor* _instance;
 };