Modified Files:

	fg_os_osgviewer.cxx: Enable mouse cursor change code on
	sufficiently recent osg versions.

diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx
index d33da03b6a5a3d5a32383f077c75bc5c06be28b1..3a1685ac6fb5b9635bcce636c3c1b404f11d01c7 100644 (file)
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Main/fg_os_osgviewer.cxx
@@ -8,6 +8,7 @@
 #include <osg/Group>
 #include <osg/Matrixd>
 #include <osg/Viewport>
+#include <osg/Version>
 #include <osgViewer/StatsHandler>
 #include <osgViewer/Viewer>
 #include <osgGA/MatrixManipulator>
@@ -18,6 +19,13 @@
 #include "globals.hxx"
 #include "renderer.hxx"
 
+#if ((1 == OSG_VERSION_MAJOR) && (9 == OSG_VERSION_MINOR) && \
+     (8 <= OSG_VERSION_PATCH)) || \
+    ((1 == OSG_VERSION_MAJOR) && (9 < OSG_VERSION_MINOR)) ||      \
+    (1 < OSG_VERSION_MAJOR)
+#define OSG_HAS_MOUSE_CURSOR_PATCH
+#endif
+
 // fg_os implementation using OpenSceneGraph's osgViewer::Viewer class
 // to create the graphics window and run the event/update/render loop.
 //
@@ -245,7 +253,6 @@ void fgOSFullScreen()
 {
 }
 
-// #define OSG_HAS_MOUSE_CURSOR_PATCH
 #ifdef OSG_HAS_MOUSE_CURSOR_PATCH
 static void setMouseCursor(osg::Camera* camera, int cursor)
 {