Fixes to not hide mouse in win32 (current implimentation caused too much

confusion.)

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index c1b86e36eeeb4b55d18232ca312ee70338578b7c..fb7f1f839f76bb8f1e4323ceb14567fad7e3cdd1 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -92,12 +92,6 @@ FG_USING_STD(string);
 FG_USING_STD(cout);
 #endif
 
-#if defined(WIN32) || defined(__CYGWIN32__)
-#define WIN32_CURSOR_TWEAKS
-#elif (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-#define X_CURSOR_TWEAKS
-#endif
-
 // main.cxx hack, should come from an include someplace
 extern void fgInitVisuals( void );
 extern void fgReshape( int width, int height );

diff --git a/src/GUI/gui_local.hxx b/src/GUI/gui_local.hxx
index 98748faa587047fa1df560a9ff8e27ca1379af27..82698d95a7cf4656f68dc8ae01778cac78512042 100644 (file)
--- a/src/GUI/gui_local.hxx
+++ b/src/GUI/gui_local.hxx
@@ -1,5 +1,11 @@
 #include "trackball.h"
 
+#if defined(WIN32) || defined(__CYGWIN32__)
+#define WIN32_CURSOR_TWEAKS
+#elif (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+#define X_CURSOR_TWEAKS
+#endif
+
 typedef enum {
        MOUSE_POINTER,
        MOUSE_YOKE,

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index c21d680bbf35eaaac5ccd768086b55b45f808e59..9abd2a213a072a1359e51b2d9ed35a89028d75e4 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -84,12 +84,6 @@ FG_USING_STD(string);
 FG_USING_STD(cout);
 #endif
 
-#if defined(WIN32) || defined(__CYGWIN32__)
-#define WIN32_CURSOR_TWEAKS
-#elif (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-#define X_CURSOR_TWEAKS
-#endif
-
 /* --------------------------------------------------------------------
 Mouse stuff
 ---------------------------------------------------------------------*/