convert property_foo().set_value(bar) to property_foo() = bar

[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 a125e188bab88967efe7821b076e56e07223fa55..59bb6c58eaac4227df7e182a7539e2f38808bb9d 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -24,8 +24,7 @@
 #include <vector>
 #include <list>
 
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <gtkmm.h>
 
 #include <ardour/types.h>
 #include <ardour/region.h>
@@ -34,6 +33,7 @@
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
+#include "canvas.h"
 
 namespace ARDOUR {
        class Session;
@@ -74,7 +74,7 @@ class TimeAxisView : public virtual AxisView
                Small = 21
        };
 
-       TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, Gtk::Widget *canvas);
+       TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
        virtual ~TimeAxisView ();
 
        /* public data: XXX create accessor/mutators for these ?? */
@@ -87,7 +87,7 @@ class TimeAxisView : public virtual AxisView
        int     order;
 
        
-       GtkCanvasItem   *canvas_display;
+       ArdourCanvas::Group   *canvas_display;
        Gtk::VBox       *control_parent;
 
        /* The Standard LHS Controls */
@@ -168,7 +168,7 @@ class TimeAxisView : public virtual AxisView
                return 0;
        }
 
-       void order_selection_trims (GtkCanvasItem *item, bool put_start_on_top);
+       void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
 
        virtual void get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results);
        virtual void get_inverted_selectables (Selection&, list<Selectable *>& results);
@@ -195,14 +195,14 @@ class TimeAxisView : public virtual AxisView
         *
         * @param ev the event
         */
-       virtual gint name_entry_button_press (GdkEventButton *ev);
+       virtual bool name_entry_button_press (GdkEventButton *ev);
 
        /**
         * Handle mouse relaese on our LHS control name entry.
         * 
         *@ param ev the event
         */
-       virtual gint name_entry_button_release (GdkEventButton *ev);
+       virtual bool name_entry_button_release (GdkEventButton *ev);
 
        /**
         * Handle mouse relaese on our LHS control name ebox.
@@ -229,7 +229,7 @@ class TimeAxisView : public virtual AxisView
          * Do anything that needs to be done to dynamically reset
         * the LHS control menu.
         */
-       virtual gint handle_display_menu_map_event (GdkEventAny *ev) { return FALSE; }
+       virtual bool handle_display_menu_map_event (GdkEventAny *ev) { return false; }
 
        /**
         * Build the standard LHS control size menu for the default TrackHeight options.
@@ -272,7 +272,7 @@ class TimeAxisView : public virtual AxisView
 
        /* selection display */
 
-       GtkCanvasItem      *selection_group;
+       ArdourCanvas::Group      *selection_group;
 
        list<SelectionRect*> free_selection_rects;
        list<SelectionRect*> used_selection_rects;