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

[ardour.git] / gtk2_ardour / visual_time_axis.h

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index a00deba5d249f6da839b21228856523d9cc743ad..2768a0aac017ec32382138f74d5c231448136646 100644 (file)
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -22,15 +22,13 @@
 #define __ardour_visual_time_axis_h__
 
 #include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/popup_selector.h>
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
 #include "time_axis_view.h"
-
+#include "canvas.h"
 
 namespace ARDOUR
 {
@@ -146,7 +144,7 @@ class VisualTimeAxis : public TimeAxisView
                 * @param sess the current session
                 * @param canvas the parent canvas object
                 */
-               VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget* canvas) ;
+               VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
                
                
                //---------------------------------------------------------------------------------------//
@@ -203,7 +201,7 @@ class VisualTimeAxis : public TimeAxisView
                 *
                 * @param c the new TimeAxis color
                 */
-               void set_time_axis_color(Gdk_Color c) ;
+               void set_time_axis_color(Gdk::Color c) ;
                
                
                //---------------------------------------------------------------------------------------//
@@ -221,12 +219,6 @@ class VisualTimeAxis : public TimeAxisView
                 *
                 * @see start_time_axis_rename()
                 */
-               void finish_time_axis_rename() ;
-
-               /**
-                * Handle the (re-)displaying of the TimeAxis name label
-                *
-                */
                virtual void label_view() ;