projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freeglut_assert_ready is going to have to go at some point.
[freeglut]
/
src
/
freeglut_callbacks.c
diff --git
a/src/freeglut_callbacks.c
b/src/freeglut_callbacks.c
index
dfabb90
..
2c3f436
100644
(file)
--- a/
src/freeglut_callbacks.c
+++ b/
src/freeglut_callbacks.c
@@
-42,7
+42,6
@@
if( fgStructure.Window == NULL ) \
return; \
FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
if( fgStructure.Window == NULL ) \
return; \
FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
- /* fgStructure.Window->Callbacks.a = callback; */
/*
* Sets the Display callback for the current window
/*
* Sets the Display callback for the current window
@@
-53,7
+52,7
@@
void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
fgError( "Fatal error in program. NULL display callback not "
"permitted in GLUT 3.0+ or freeglut 2.0.1+\n" );
SET_CALLBACK( Display );
fgError( "Fatal error in program. NULL display callback not "
"permitted in GLUT 3.0+ or freeglut 2.0.1+\n" );
SET_CALLBACK( Display );
- fgStructure.Window->State.Redisplay = TRUE;
+ fgStructure.Window->State.Redisplay = GL_TRUE;
}
/*
}
/*
@@
-116,25
+115,14
@@
void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
*/
static void fghVisibility( int status )
{
*/
static void fghVisibility( int status )
{
- FGCBVisibility vis;
- int glut_status;
+ int glut_status = GLUT_VISIBLE;
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window );
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window );
- vis = FETCH_WCB( ( *( fgStructure.Window ) ), Visibility );
- freeglut_return_if_fail( vis );
- /* Callbacks.Visibility ); */
- if( status == GLUT_HIDDEN || status == GLUT_FULLY_COVERED )
+ if( ( GLUT_HIDDEN == status ) || ( GLUT_FULLY_COVERED == status ) )
glut_status = GLUT_NOT_VISIBLE;
glut_status = GLUT_NOT_VISIBLE;
- else
- glut_status = GLUT_VISIBLE;
- vis( glut_status );
- /*
- fgStructure.Window->Callbacks.Visibility( GLUT_NOT_VISIBLE );
- else
- fgStructure.Window->Callbacks.Visibility( GLUT_VISIBLE );
- */
+ INVOKE_WCB( *( fgStructure.Window ), Visibility, ( glut_status ) );
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
@@
-239,9
+227,8
@@
void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) )
/* A. Donev: Destruction callback for menus */
void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
{
/* A. Donev: Destruction callback for menus */
void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
{
- if( fgStructure.Menu == NULL )
- return;
- fgStructure.Menu->Destroy = callback;
+ if( fgStructure.Menu )
+ fgStructure.Menu->Destroy = callback;
}
/*
}
/*