fix merge errors with master

[ardour.git] / libs / canvas / canvas / poly_line.h

diff --git a/libs/canvas/canvas/poly_line.h b/libs/canvas/canvas/poly_line.h
index e870e51876690df8ed95c60e8966ebfe943e1bfe..72c20e06748ff8cb0235bc24e6791c0d50edd23f 100644 (file)
--- a/libs/canvas/canvas/poly_line.h
+++ b/libs/canvas/canvas/poly_line.h
@@ -1,19 +1,39 @@
+/*
+    Copyright (C) 2011-2013 Paul Davis
+    Author: Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #ifndef __CANVAS_POLY_LINE_H__
 #define __CANVAS_POLY_LINE_H__
 
+#include "canvas/visibility.h"
 #include "canvas/poly_item.h"
 #include "canvas/outline.h"
 
 namespace ArdourCanvas {
 
-class PolyLine : public PolyItem
+class LIBCANVAS_API PolyLine : public PolyItem
 {
 public:
        PolyLine (Group *);
 
        void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
-       XMLNode* get_state () const;
-       void set_state (XMLNode const *);
+
+        bool covers (Duple const &) const;
 };
        
 }