From: Richard Rauch <rkr@olib.org>
Date: Sat, 11 Oct 2003 12:03:34 +0000 (+0000)
Subject: Three tidying-up changes to the code of freeglut_callbacks.c;
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=3cfbcf91639c23ef9be707f4942af3c8cbf15500;p=freeglut

Three tidying-up changes to the code of freeglut_callbacks.c;
none of them are Earth-shattering, but as I swept through
looking somewhat more systematically for errors, I picked
these off.  See the diff's for details.


git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@225 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 8c72805..1cfecc5 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -133,9 +133,6 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), i
 
 /*
  * Sets the Visibility callback for the current window.
- *
- * I had to peer to GLUT sources to clean up the mess.
- * Can anyone please explain me what is going on here?!?
  */
 static void fghVisibility( int status )
 {
@@ -181,9 +178,6 @@ void FGAPIENTRY glutSpecialUpFunc( void (* callback)( int, int, int ) )
 void FGAPIENTRY glutJoystickFunc( void (* callback)( unsigned int, int, int, int ), int pollInterval )
 {
     SET_CALLBACK( Joystick );
-
-    freeglut_return_if_fail( fgStructure.Window != NULL );
-
     /*
      * Do not forget setting the joystick poll rate
      */
@@ -247,7 +241,8 @@ void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) )
 /* A. Donev: Destruction callback for menus */
 void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
 {
-   if( fgStructure.Menu == NULL ) return;
+   if( fgStructure.Menu == NULL )
+       return;
    fgStructure.Menu->Destroy = callback;
 }