toggle fullscreen: also adapt GUI plane when resizing

[flightgear.git] / src / Cockpit / od_gauge.hxx

diff --git a/src/Cockpit/od_gauge.hxx b/src/Cockpit/od_gauge.hxx
index 8c0810401568d65054d080181f4860177af7b3cc..528e0c81475ee450bd36c9ae936d7c75927b6554 100644 (file)
--- a/src/Cockpit/od_gauge.hxx
+++ b/src/Cockpit/od_gauge.hxx
@@ -22,9 +22,9 @@
 #define _OD_GAUGE_HXX
 
 #include <Canvas/canvas_fwd.hpp>
-#include <Canvas/placement.hxx>
 
 #include <simgear/canvas/ODGauge.hxx>
+#include <simgear/canvas/CanvasPlacement.hxx>
 
 class SGPropertyNode;
 
@@ -32,7 +32,7 @@ class SGPropertyNode;
  * Owner Drawn Gauge helper class
  */
 class FGODGauge:
-  public simgear::ODGauge
+  public simgear::canvas::ODGauge
 {
   public:
     FGODGauge();
@@ -46,8 +46,8 @@ class FGODGauge:
      * @return A list of groups which override the given texture
      */
     static
-    canvas::Placements set_texture( const char * name,
-                                    osg::Texture2D* new_texture );
+    simgear::canvas::Placements set_texture( const char * name,
+                                             osg::Texture2D* new_texture );
 
     /**
      * Replace an opengl texture name inside the aircraft scene graph.
@@ -64,9 +64,10 @@ class FGODGauge:
      * @return A list of groups which override the given texture
      */
     static
-    canvas::Placements set_texture( const SGPropertyNode* placement,
-                                    osg::Texture2D* new_texture,
-                                    osg::NodeCallback* cull_callback = 0 );
+    simgear::canvas::Placements
+    set_texture( const SGPropertyNode* placement,
+                 osg::Texture2D* new_texture,
+                 osg::NodeCallback* cull_callback = 0 );
 
 };