projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Noted by XXX comments that the XFlush() calls probably shouldn't be there.
[freeglut]
/
src
/
freeglut_menu.c
diff --git
a/src/freeglut_menu.c
b/src/freeglut_menu.c
index
c9feea2
..
f49ca52
100644
(file)
--- a/
src/freeglut_menu.c
+++ b/
src/freeglut_menu.c
@@
-861,15
+861,15
@@
void FGAPIENTRY glutChangeToSubMenu( int item, const char* label, int subMenuID
SFG_MenuEntry* menuEntry = NULL;
freeglut_assert_ready;
SFG_MenuEntry* menuEntry = NULL;
freeglut_assert_ready;
- freeglut_return_if_fail( fgStructure.Menu != NULL );
- freeglut_return_if_fail( subMenu != NULL );
+ freeglut_return_if_fail( fgStructure.Menu );
+ freeglut_return_if_fail( subMenu );
menuEntry = fghFindMenuEntry( fgStructure.Menu, item );
menuEntry = fghFindMenuEntry( fgStructure.Menu, item );
- freeglut_return_if_fail( menuEntry != NULL );
+ freeglut_return_if_fail( menuEntry );
/*
* We want it to become a sub menu entry, so:
*/
/*
* We want it to become a sub menu entry, so:
*/
- if( menuEntry->Text != NULL )
+ if( menuEntry->Text )
free( menuEntry->Text );
menuEntry->Text = strdup( label );
free( menuEntry->Text );
menuEntry->Text = strdup( label );
@@
-889,7
+889,7
@@
void FGAPIENTRY glutRemoveMenuItem( int item )
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Menu );
menuEntry = fghFindMenuEntry( fgStructure.Menu, item );
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Menu );
menuEntry = fghFindMenuEntry( fgStructure.Menu, item );
- freeglut_return_if_fail( menuEntry != NULL );
+ freeglut_return_if_fail( menuEntry );
fgListRemove( &fgStructure.Menu->Entries, &menuEntry->Node );
free( menuEntry->Text );
free( menuEntry );
fgListRemove( &fgStructure.Menu->Entries, &menuEntry->Node );
free( menuEntry->Text );
free( menuEntry );