From 01f9b2d7b249196466d784d3a5bf08a29a99c761 Mon Sep 17 00:00:00 2001 From: frohlich Date: Fri, 8 Jun 2007 07:14:56 +0000 Subject: [PATCH] Modified Files: fg_os_osgviewer.cxx: Enable mouse cursor change code on sufficiently recent osg versions. --- src/Main/fg_os_osgviewer.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx index d33da03b6..3a1685ac6 100644 --- a/src/Main/fg_os_osgviewer.cxx +++ b/src/Main/fg_os_osgviewer.cxx @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -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) {