FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hm. I thought that I already hit this file for style normalization.

Browse Source 
Oh well...  Should be no functional changes.  Should be pretty
close to in-line with the style of changes that I've been making else-
where.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@331 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-10 10:00:21 +00:00
parent 1023b7eb84
commit 9623350767
1 changed files with 133 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
freeglut/freeglut/src/freeglut_structure.c
View File

@ -282,10 +282,10 @@ void fgDestroyWindow( SFG_Window* window, GLboolean needToClose )
SFG_Window* subWindow; SFG_Window* subWindow;
int menu_index ; int menu_index ;
assert( window != NULL ); assert( window );
freeglut_assert_ready; freeglut_assert_ready;
while ( (subWindow = (SFG_Window *)window->Children.First) != NULL ) while( subWindow = ( SFG_Window * )window->Children.First )
fgDestroyWindow( subWindow, needToClose ); fgDestroyWindow( subWindow, needToClose );
/* /*
@ -300,12 +300,12 @@ void fgDestroyWindow( SFG_Window* window, GLboolean needToClose )
fgSetWindow ( activeWindow ) ; fgSetWindow ( activeWindow ) ;
} }
if ( window->Parent != NULL ) if( window->Parent )
fgListRemove( &window->Parent->Children, &window->Node ); fgListRemove( &window->Parent->Children, &window->Node );
else else
fgListRemove( &fgStructure.Windows, &window->Node ); fgListRemove( &fgStructure.Windows, &window->Node );
if ( window->ActiveMenu != NULL ) if( window->ActiveMenu )
fgDeactivateMenu( window ); fgDeactivateMenu( window );
for ( menu_index = 0; menu_index < 3; menu_index ++ ) for ( menu_index = 0; menu_index < 3; menu_index ++ )
@ -342,7 +342,8 @@ static void fghRemoveMenuFromWindow( SFG_Window* window, SFG_Menu* menu )
/* /*
* Call this function for all of the window's children recursively: * Call this function for all of the window's children recursively:
*/ */
for( subWindow = (SFG_Window *)window->Children.First; subWindow; for( subWindow = (SFG_Window *)window->Children.First;
subWindow;
subWindow = (SFG_Window *)subWindow->Node.Next) subWindow = (SFG_Window *)subWindow->Node.Next)
fghRemoveMenuFromWindow( subWindow, menu ); fghRemoveMenuFromWindow( subWindow, menu );
} }
@ -372,7 +373,7 @@ void fgDestroyMenu( SFG_Menu* menu )
SFG_Menu *from; SFG_Menu *from;
SFG_MenuEntry *entry; SFG_MenuEntry *entry;
assert( menu != NULL ); assert( menu );
freeglut_assert_ready; freeglut_assert_ready;
/* /*
@ -395,7 +396,7 @@ void fgDestroyMenu( SFG_Menu* menu )
* If the programmer defined a destroy callback, call it * If the programmer defined a destroy callback, call it
* A. Donev: But first make this the active menu * A. Donev: But first make this the active menu
*/ */
if ( menu->Destroy != NULL ) if( menu->Destroy )
{ {
SFG_Menu *activeMenu=fgStructure.Menu; SFG_Menu *activeMenu=fgStructure.Menu;
fgStructure.Menu = menu; fgStructure.Menu = menu;
@ -407,7 +408,7 @@ void fgDestroyMenu( SFG_Menu* menu )
* Now we are pretty sure the menu is not used anywhere * Now we are pretty sure the menu is not used anywhere
* and that we can remove all of its entries * and that we can remove all of its entries
*/ */
while( (entry = (SFG_MenuEntry *)menu->Entries.First) != NULL ) while( entry = ( SFG_MenuEntry * )menu->Entries.First )
{ {
fgListRemove( &menu->Entries, &entry->Node ); fgListRemove( &menu->Entries, &entry->Node );
@ -462,10 +463,10 @@ void fgDestroyStructure( void )
/* /*
* Make sure all windows and menus have been deallocated * Make sure all windows and menus have been deallocated
*/ */
while( (menu = (SFG_Menu *)fgStructure.Menus.First) != NULL ) while( menu = ( SFG_Menu * )fgStructure.Menus.First )
fgDestroyMenu( menu ); fgDestroyMenu( menu );
while( (window = (SFG_Window *)fgStructure.Windows.First) != NULL ) while( window = ( SFG_Window * )fgStructure.Windows.First )
fgDestroyWindow( window, TRUE ); fgDestroyWindow( window, TRUE );
} }
@ -476,7 +477,7 @@ void fgEnumWindows( FGCBenumerator enumCallback, SFG_Enumerator* enumerator )
{ {
SFG_Window *window; SFG_Window *window;
assert( (enumCallback != NULL) && (enumerator != NULL) ); assert( enumCallback && enumerator );
freeglut_assert_ready; freeglut_assert_ready;
/* /*
@ -501,7 +502,7 @@ void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
{ {
SFG_Window *child; SFG_Window *child;
assert( (enumCallback != NULL) && (enumerator != NULL) ); assert( enumCallback && enumerator );
freeglut_assert_ready; freeglut_assert_ready;
for( child = ( SFG_Window * )window->Children.First; for( child = ( SFG_Window * )window->Children.First;
@ -673,9 +674,9 @@ void fgListRemove(SFG_List *list, SFG_Node *node)
{ {
SFG_Node *ln; SFG_Node *ln;
if ( (ln = (SFG_Node *)node->Next) != NULL ) if( ln = (SFG_Node *)node->Next )
ln->Prev = node->Prev; ln->Prev = node->Prev;
if ( (ln = (SFG_Node *)node->Prev) != NULL ) if( ln = (SFG_Node *)node->Prev )
ln->Next = node->Next; ln->Next = node->Next;
if( ( ln = (SFG_Node *)list->First ) == node ) if( ( ln = (SFG_Node *)list->First ) == node )
list->First = node->Next; list->First = node->Next;
@ -688,7 +689,9 @@ int fgListLength(SFG_List *list)
SFG_Node *node; SFG_Node *node;
int length = 0; int length = 0;
for( node = (SFG_Node *)list->First; node; node = (SFG_Node *)node->Next ) for( node =( SFG_Node * )list->First;
node;
node = ( SFG_Node * )node->Next )
++length; ++length;
return length; return length;