projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Notes
[freeglut]
/
src
/
freeglut_structure.c
diff --git
a/src/freeglut_structure.c
b/src/freeglut_structure.c
index
03c1a8f
..
ecb4f10
100644
(file)
--- a/
src/freeglut_structure.c
+++ b/
src/freeglut_structure.c
@@
-165,7
+165,7
@@
void fgAddToWindowDestroyList( SFG_Window* window )
* to ensure that they are no longer called after this point.
*/
{
* to ensure that they are no longer called after this point.
*/
{
- FGCBDestroy destroy = FETCH_WCB( *window, Destroy );
+ FGCBDestroy destroy = (FGCBDestroy)FETCH_WCB( *window, Destroy );
fghClearCallBacks( window );
SET_WCB( *window, Destroy, destroy );
}
fghClearCallBacks( window );
SET_WCB( *window, Destroy, destroy );
}
@@
-236,7
+236,7
@@
static void fghRemoveMenuFromWindow( SFG_Window* window, SFG_Menu* menu )
* Check if the menu is attached to the current window,
* if so, have it detached (by overwriting with a NULL):
*/
* Check if the menu is attached to the current window,
* if so, have it detached (by overwriting with a NULL):
*/
- for( i = 0; i < 3; i++ )
+ for( i = 0; i < FREEGLUT_MAX_MENUS; i++ )
if( window->Menu[ i ] == menu )
window->Menu[ i ] = NULL;
if( window->Menu[ i ] == menu )
window->Menu[ i ] = NULL;
@@
-342,6
+342,13
@@
void fgCreateStructure( void )
fgListInit(&fgStructure.Windows);
fgListInit(&fgStructure.Menus);
fgListInit(&fgStructure.WindowsToDestroy);
fgListInit(&fgStructure.Windows);
fgListInit(&fgStructure.Menus);
fgListInit(&fgStructure.WindowsToDestroy);
+
+ fgStructure.CurrentWindow = NULL;
+ fgStructure.CurrentMenu = NULL;
+ fgStructure.MenuContext = NULL;
+ fgStructure.GameMode = NULL;
+ fgStructure.WindowID = 0;
+ fgStructure.MenuID = 0;
}
/*
}
/*