Off-by-one error in the OSG_VERSION_LESS_THAN macro

[simgear.git] / simgear / canvas / CanvasWindow.hxx

diff --git a/simgear/canvas/CanvasWindow.hxx b/simgear/canvas/CanvasWindow.hxx
index 57068a84e914b66fba986e648e1e187804780dc3..330b6fb8ced6ef53d95fac6533ae9d1e1eb78f09 100644 (file)
--- a/simgear/canvas/CanvasWindow.hxx
+++ b/simgear/canvas/CanvasWindow.hxx
@@ -20,6 +20,7 @@
 #define CANVAS_WINDOW_HXX_
 
 #include <simgear/canvas/elements/CanvasImage.hxx>
+#include <simgear/canvas/layout/Layout.hxx>
 #include <simgear/canvas/events/MouseEvent.hxx>
 #include <simgear/props/PropertyBasedElement.hxx>
 #include <simgear/props/propertyObject.hxx>
@@ -34,7 +35,8 @@ namespace canvas
 {
 
   class Window:
-    public Image
+    public Image,
+    public LayoutItem
   {
     public:
       static const std::string TYPE_NAME;
@@ -75,11 +77,16 @@ namespace canvas
       void setCanvasContent(CanvasPtr canvas);
       simgear::canvas::CanvasWeakPtr getCanvasContent() const;
 
+      void setLayout(const LayoutRef& layout);
+
       CanvasPtr getCanvasDecoration() const;
 
       bool isResizable() const;
       bool isCapturingEvents() const;
 
+      virtual void setVisible(bool visible);
+      virtual bool isVisible() const;
+
       /**
        * Moves window on top of all other windows with the same z-index.
        *
@@ -101,6 +108,7 @@ namespace canvas
 
       CanvasPtr        _canvas_decoration;
       CanvasWeakPtr    _canvas_content;
+      LayoutRef        _layout;
 
       ImagePtr _image_content,
                _image_shadow;