projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added John's text-positioning modification.
[freeglut]
/
src
/
freeglut_structure.c
diff --git
a/src/freeglut_structure.c
b/src/freeglut_structure.c
index
9c515c8
..
09ad74d
100644
(file)
--- a/
src/freeglut_structure.c
+++ b/
src/freeglut_structure.c
@@
-273,6
+273,7
@@
void fgCloseWindows ()
void fgDestroyWindow( SFG_Window* window, GLboolean needToClose )
{
SFG_Window* subWindow;
void fgDestroyWindow( SFG_Window* window, GLboolean needToClose )
{
SFG_Window* subWindow;
+ int menu_index ;
assert( window != NULL );
freeglut_assert_ready;
assert( window != NULL );
freeglut_assert_ready;
@@
-309,6
+310,15
@@
void fgDestroyWindow( SFG_Window* window, GLboolean needToClose )
else
fgListRemove( &fgStructure.Windows, &window->Node );
else
fgListRemove( &fgStructure.Windows, &window->Node );
+ if ( window->ActiveMenu != NULL )
+ fgDeactivateMenu ( window ) ;
+
+ for ( menu_index = 0; menu_index < 3; menu_index ++ )
+ {
+ if ( window->Menu[menu_index] != NULL )
+ window->Menu[menu_index]->ParentWindow = NULL ;
+ }
+
/*
* OK, this window seems disconnected from the structure enough
* in order to be closed without any bigger risks...
/*
* OK, this window seems disconnected from the structure enough
* in order to be closed without any bigger risks...