projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup joystick deallocation.
[freeglut]
/
freeglut-1.3
/
freeglut_callbacks.c
diff --git
a/freeglut-1.3/freeglut_callbacks.c
b/freeglut-1.3/freeglut_callbacks.c
index
196b054
..
129a4cd
100644
(file)
--- a/
freeglut-1.3/freeglut_callbacks.c
+++ b/
freeglut-1.3/freeglut_callbacks.c
@@
-182,8
+182,8
@@
void FGAPIENTRY glutJoystickFunc( void (* callback)( unsigned int, int, int, int
fgStructure.Window->State.JoystickLastPoll =
fgElapsedTime() - fgStructure.Window->State.JoystickPollRate;
fgStructure.Window->State.JoystickLastPoll =
fgElapsedTime() - fgStructure.Window->State.JoystickPollRate;
- if( fgStructure.Window->State.JoystickLastPoll < 0.0 )
- fgStructure.Window->State.JoystickLastPoll = 0.0;
+ if( fgStructure.Window->State.JoystickLastPoll < 0 )
+ fgStructure.Window->State.JoystickLastPoll = 0;
}
/*
}
/*
@@
-219,11
+219,26
@@
void FGAPIENTRY glutEntryFunc( void (* callback)( int ) )
}
/*
}
/*
+ * Window destruction callbacks
+ */
+void FGAPIENTRY glutCloseFunc( void (* callback)( void ) )
+{
+ SET_CALLBACK( Destroy );
+}
+
+void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) )
+{
+ glutCloseFunc( callback );
+}
+
+/*
* Deprecated version of glutMenuStatusFunc callback setting method
*/
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
{
* Deprecated version of glutMenuStatusFunc callback setting method
*/
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
{
- SET_CALLBACK( MenuState );
+ freeglut_assert_ready;
+
+ fgState.MenuStateCallback = callback;
}
/*
}
/*
@@
-231,7
+246,9
@@
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
*/
void FGAPIENTRY glutMenuStatusFunc( void (* callback)( int, int, int ) )
{
*/
void FGAPIENTRY glutMenuStatusFunc( void (* callback)( int, int, int ) )
{
- SET_CALLBACK( MenuStatus );
+ freeglut_assert_ready;
+
+ fgState.MenuStatusCallback = callback;
}
/*
}
/*