Fix NSGLView invalidation

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

diff --git a/libs/canvas/canvas/flag.h b/libs/canvas/canvas/flag.h
index ed7bc7cacba9346e1651b3dd4394aec9f65c4a0b..ac77cc759f7f22a96da157eeb53e4af8556321ec 100644 (file)
--- a/libs/canvas/canvas/flag.h
+++ b/libs/canvas/canvas/flag.h
@@ -17,6 +17,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __CANVAS_FLAG_H__
+#define __CANVAS_FLAG_H__
+
 #include <pangomm/fontdescription.h>
 
 #include "canvas/visibility.h"
@@ -32,21 +35,23 @@ class Rectangle;
 class LIBCANVAS_API Flag : public Container
 {
 public:
-       Flag (Canvas *, Distance, Color, Color, Duple, bool invert=false);
-       Flag (Item*, Distance, Color, Color, Duple, bool invert=false);
+       Flag (Canvas *, Distance, Gtkmm2ext::Color, Gtkmm2ext::Color, Duple, bool invert=false);
+       Flag (Item*, Distance, Gtkmm2ext::Color, Gtkmm2ext::Color, Duple, bool invert=false);
 
        void set_text (std::string const &);
        void set_height (Distance);
 
        void set_font_description (Pango::FontDescription);
 
-        bool covers (Duple const &) const;
+       bool covers (Duple const &) const;
+
+       double width() const;
 
 private:
        void setup (Distance height, Duple position);
 
-       Color _outline_color;
-       Color _fill_color;
+       Gtkmm2ext::Color _outline_color;
+       Gtkmm2ext::Color _fill_color;
        Text* _text;
        Line* _line;
        Rectangle* _rectangle;
@@ -54,3 +59,5 @@ private:
 };
 
 }
+
+#endif // __CANVAS_FLAG_H__