Merge branch 'maint' into next

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

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index af113c977649df4794d9dbe569e3dc1071be800c..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,8 @@ 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;