X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Foutline.h;h=474501c8c78c1a38711a388abb0069ffa6d96cda;hb=f694b867c1eaa8b959db2f17a894900d0a972738;hp=9272f8138521bb65737626ae2225d9d370391467;hpb=b880a381523b2cfdb7ebd17c27fff1adf90fa028;p=ardour.git diff --git a/libs/canvas/canvas/outline.h b/libs/canvas/canvas/outline.h index 9272f81385..474501c8c7 100644 --- a/libs/canvas/canvas/outline.h +++ b/libs/canvas/canvas/outline.h @@ -22,17 +22,20 @@ #include +#include + #include "canvas/visibility.h" #include "canvas/types.h" -#include "canvas/item.h" namespace ArdourCanvas { -class LIBCANVAS_API Outline : virtual public Item +class Item; + +class LIBCANVAS_API Outline : public boost::noncopyable { public: - Outline (Group *); - virtual ~Outline () {} + Outline (Item& self); + virtual ~Outline() {} Color outline_color () const { return _outline_color; @@ -52,39 +55,14 @@ public: virtual void set_outline (bool); -#ifdef CANVAS_COMPATIBILITY - int& property_first_arrowhead () { - return _foo_int; - } - int& property_last_arrowhead () { - return _foo_int; - } - int& property_arrow_shape_a () { - return _foo_int; - } - int& property_arrow_shape_b () { - return _foo_int; - } - int& property_arrow_shape_c () { - return _foo_int; - } - bool& property_draw () { - return _foo_bool; - } -#endif - protected: void setup_outline_context (Cairo::RefPtr) const; - - Color _outline_color; - Distance _outline_width; - bool _outline; -#ifdef CANVAS_COMPATIBILITY - int _foo_int; - bool _foo_bool; -#endif + Item& _self; + Color _outline_color; + Distance _outline_width; + bool _outline; }; }