Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / gtk2_ardour / control_point.cc

diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc
index 8491534ec81bc274a23e348d4e2a019eec070ebf..9b588d1babadc97b530dcee308dbf5c7783a44a4 100644 (file)
--- a/gtk2_ardour/control_point.cc
+++ b/gtk2_ardour/control_point.cc
@@ -44,15 +44,13 @@ ControlPoint::ControlPoint (AutomationLine& al)
        _size = 4.0;
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
-       _item->property_draw() = true;
-       _item->set_fill (false);
+       _item->set_fill (true);
        _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill());
        _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline());
        _item->set_data ("control_point", this);
        _item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
 
        hide ();
-       set_visible (false);
 }
 
 ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force_special_copy_constructor*/)
@@ -71,13 +69,12 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
        _size = other._size;
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
-       _item->set_fill (false);
+       _item->set_fill (true);
        _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline());
 
        /* NOTE: no event handling in copied ControlPoints */
 
        hide ();
-       set_visible (false);
 }
 
 ControlPoint::~ControlPoint ()
@@ -105,16 +102,10 @@ ControlPoint::show()
        _item->show();
 }
 
-void
-ControlPoint::set_visible (bool yn)
-{
-       _item->property_draw() = (gboolean) yn;
-}
-
 bool
 ControlPoint::visible () const
 {
-       return _item->property_draw ();
+       return _item->visible ();
 }
 
 void