Fix windows build

[flightgear.git] / src / GUI / CanvasWidget.hxx

diff --git a/src/GUI/CanvasWidget.hxx b/src/GUI/CanvasWidget.hxx
index 7f4552cd155d35ee0a64621f0db4ccaa79ed18dd..a91193814eb6973998f3b5a3e069eac23782ba9c 100644 (file)
--- a/src/GUI/CanvasWidget.hxx
+++ b/src/GUI/CanvasWidget.hxx
@@ -11,6 +11,8 @@
 #include <Main/fg_props.hxx>
 #include <plib/pu.h>
 
+#include <simgear/canvas/canvas_fwd.hxx>
+
 class CanvasMgr;
 
 class CanvasWidget:
@@ -24,7 +26,7 @@ class CanvasWidget:
     virtual ~CanvasWidget();
 
     virtual void doHit (int button, int updown, int x, int y);
-    virtual int  checkKey(int key   , int updown);
+    virtual int checkKey(int key, int updown);
 
     virtual void setSize ( int w, int h );
     virtual void draw(int dx, int dy);
@@ -34,14 +36,13 @@ class CanvasWidget:
     CanvasMgr  *_canvas_mgr; // TODO maybe we should store this in some central
                              // location or make it static...
 
-    GLuint              _tex_id;    //<! OpenGL texture id if canvas
-    size_t              _no_tex_cnt;//<! Count since how many frames we were not
-                                    //   able to get the texture (for debugging)
-    SGPropertyNode_ptr  _canvas;    //<! Canvas root property node
-    SGPropertyNode     *_mouse_x,
-                       *_mouse_y,
-                       *_mouse_down,
-                       *_mouse_drag;
+    simgear::canvas::CanvasPtr _canvas;
+
+    float _last_x,
+          _last_y;
+
+    static SGPropertyNode_ptr _time,
+                              _view_height;
 };
 
 #endif /* CANVASWIDGET_HXX_ */