From 5978b6967d69ba212e0c35b530a4076f24520318 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 16 Mar 2001 23:58:31 +0000 Subject: [PATCH] Fixes to not hide mouse in win32 (current implimentation caused too much confusion.) --- src/GUI/gui.cxx | 6 ------ src/GUI/gui_local.hxx | 6 ++++++ src/GUI/mouse.cxx | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index c1b86e36e..fb7f1f839 100644 --- 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 98748faa5..82698d95a 100644 --- 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 c21d680bb..9abd2a213 100644 --- 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 ---------------------------------------------------------------------*/ -- 2.39.5