X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.hxx;h=58c1eed4a0e5190208af5a3ee2cb2386c839205a;hb=35396de6f87e2a8b8d0c21eb1d0908db586799f8;hp=af113c977649df4794d9dbe569e3dc1071be800c;hpb=474df2414e90e08d1eeffe57ff543dc4141b0200;p=flightgear.git diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx index af113c977..58c1eed4a 100644 --- a/src/Cockpit/panel.hxx +++ b/src/Cockpit/panel.hxx @@ -30,10 +30,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include #include @@ -54,8 +50,8 @@ #include #include -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 > _textureMap;