Merge branch 'maint' into next

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

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 81f7bc3a83c59dfe7171671db5cf9cda2e17e35c..58c1eed4a0e5190208af5a3ee2cb2386c839205a 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -30,10 +30,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <osg/ref_ptr>
 #include <osg/StateSet>
 #include <osg/Texture2D>
@@ -54,8 +50,8 @@
 #include <Input/input.hxx>
 #include <Instrumentation/dclgps.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
+using std::vector;
+using std::map;
 
 
 class FGPanelInstrument;
@@ -75,7 +71,9 @@ class FGPanelInstrument;
 class FGTextureManager
 {
 public:
-  static osg::Texture2D* createTexture(const string &relativePath);
+  static osg::Texture2D* createTexture(const string &relativePath,
+                                       bool staticTexture = true);
+  static void addTexture(const string &relativePath, osg::Texture2D* texture);
 private:
   static map<string,osg::ref_ptr<osg::Texture2D> > _textureMap;
 };
@@ -190,6 +188,9 @@ public:
 
   virtual void setDepthTest (bool enable);
 
+  bool getAutohide(void) const { return _autohide; };
+  void setAutohide(bool enable) { _autohide = enable; };
+
 private:
   void setupVirtualCockpit();
   void cleanupVirtualCockpit();
@@ -217,6 +218,7 @@ private:
                                // List of instruments in panel.
   instrument_list_type _instruments;
   bool _enable_depth_test;
+  bool _autohide;
 };
 
 
@@ -250,7 +252,7 @@ public:
                                // Setters.
 
                                // transfer pointer ownership
-  virtual void addBinding (FGBinding * binding, int updown);
+  virtual void addBinding (SGBinding * binding, int updown);
   virtual void setButton (int button) { _button = button; }
   virtual void setX (int x) { _x = x; }
   virtual void setY (int y) { _y = y; }
@@ -271,7 +273,7 @@ public:
   virtual bool doAction (int updown);
 
 private:
-  typedef vector<FGBinding *> binding_list_t;
+  typedef vector<SGBinding *> binding_list_t;
 
   int _button;
   int _x;