X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Frectangle.h;h=5c6b66fbb644be0d8ff6a70b77faa6a89afe951e;hb=585fa45b628b0b3e6ef2c29c1a2610859e74d942;hp=ff2ff994b7917bc943b96cad73578c192de18446;hpb=36c233fe6ce570ce85224626ce7aba4a2607537f;p=ardour.git

diff --git a/libs/canvas/canvas/rectangle.h b/libs/canvas/canvas/rectangle.h
index ff2ff994b7..5c6b66fbb6 100644
--- a/libs/canvas/canvas/rectangle.h
+++ b/libs/canvas/canvas/rectangle.h
@@ -23,17 +23,17 @@
 #include "canvas/visibility.h"
 #include "canvas/item.h"
 #include "canvas/types.h"
-#include "canvas/outline.h"
-#include "canvas/fill.h"
 
 namespace ArdourCanvas
 {
 
-class LIBCANVAS_API Rectangle : virtual public Item, public Outline, public Fill
+class LIBCANVAS_API Rectangle : public Item
 {
 public:
-	Rectangle (Group *);
-	Rectangle (Group *, Rect const &);
+	Rectangle (Canvas*);
+	Rectangle (Canvas*, Rect const &);
+	Rectangle (Item*);
+	Rectangle (Item*, Rect const &);
 	
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
@@ -72,7 +72,12 @@ public:
 	};
 
 	void set_outline_what (What);
-	void set_outline_what (int);
+	void set_outline_all () {
+		set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::TOP|
+								 ArdourCanvas::Rectangle::LEFT|
+								 ArdourCanvas::Rectangle::RIGHT|
+								 ArdourCanvas::Rectangle::BOTTOM));
+	}
 
 private:
 	/** Our rectangle; note that x0 may not always be less than x1