projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes from freeglut_portable patch. Memory leak fix from John. Return_if_fail fix.
[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
..
743077a
100644
(file)
--- a/
freeglut-1.3/freeglut_callbacks.c
+++ b/
freeglut-1.3/freeglut_callbacks.c
@@
-223,7
+223,9
@@
void FGAPIENTRY glutEntryFunc( void (* callback)( int ) )
*/
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
{
*/
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
{
- SET_CALLBACK( MenuState );
+ freeglut_assert_ready;
+
+ fgState.MenuStateCallback = callback;
}
/*
}
/*
@@
-231,7
+233,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;
}
/*
}
/*