Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 6e659e47a73677ce8caf5ce6851c29620183c382..7dc3ba9494b96403d86bbd79210ba3efbff9bf59 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -44,7 +44,6 @@
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
-#include "canvas.h"
 
 namespace ARDOUR {
        class Session;
@@ -58,6 +57,12 @@ namespace Gtk {
        class Menu;
 }
 
+namespace ArdourCanvas {
+       class Canvas;
+       class Group;
+       class Item;
+}
+
 class PublicEditor;
 class RegionSelection;
 class TimeSelection;
@@ -100,7 +105,6 @@ class TimeAxisView : public virtual AxisView
         virtual void leave_internal_edit_mode () {}
 
        ArdourCanvas::Group* canvas_display () { return _canvas_display; }
-       ArdourCanvas::Group* canvas_background () { return _canvas_background; }
        ArdourCanvas::Group* ghost_group () { return _ghost_group; }
 
        /** @return effective height (taking children into account) in canvas units, or
@@ -120,8 +124,6 @@ class TimeAxisView : public virtual AxisView
        virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
        virtual void hide ();
 
-       void clip_to_viewport ();
-
        bool touched (double top, double bot);
 
        /** @return true if hidden, otherwise false */
@@ -149,7 +151,7 @@ class TimeAxisView : public virtual AxisView
        virtual ARDOUR::RouteGroup* route_group() const { return 0; }
        virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
 
-       virtual void set_samples_per_unit (double);
+       virtual void set_samples_per_pixel (double);
        virtual void show_selection (TimeSelection&);
        virtual void hide_selection ();
        virtual void reshow_selection (TimeSelection&);
@@ -224,8 +226,8 @@ class TimeAxisView : public virtual AxisView
 
        bool name_entry_key_release (GdkEventKey *ev);
        bool name_entry_key_press (GdkEventKey *ev);
+       bool name_entry_focus_out (GdkEventFocus *ev);
 
-        ArdourDialog* name_editor;
         Gtk::Entry* name_entry;
         void begin_name_edit ();
         void end_name_edit (int);
@@ -276,7 +278,6 @@ class TimeAxisView : public virtual AxisView
        void build_size_menu ();
 
 private:
-       ArdourCanvas::Group* _canvas_background;
        Gtk::VBox*            control_parent;
        int                  _order;
        uint32_t             _effective_height;