projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redisplay is now also on the work list instead of handled separately
[freeglut]
/
src
/
fg_menu.c
diff --git
a/src/fg_menu.c
b/src/fg_menu.c
index
f302cdd
..
bbae132
100644
(file)
--- a/
src/fg_menu.c
+++ b/
src/fg_menu.c
@@
-207,7
+207,7
@@
static GLboolean fghCheckMenuStatus( SFG_Menu* menu )
if( menuEntry != menu->ActiveEntry )
{
if( menuEntry != menu->ActiveEntry )
{
- menu->Window->State.Redisplay = GL_TRUE;
+ menu->Window->State.WorkMask |= GLUT_DISPLAY_WORK;
if( menu->ActiveEntry )
menu->ActiveEntry->IsActive = GL_FALSE;
}
if( menu->ActiveEntry )
menu->ActiveEntry->IsActive = GL_FALSE;
}
@@
-277,7
+277,7
@@
static GLboolean fghCheckMenuStatus( SFG_Menu* menu )
( !menu->ActiveEntry->SubMenu ||
!menu->ActiveEntry->SubMenu->IsActive ) )
{
( !menu->ActiveEntry->SubMenu ||
!menu->ActiveEntry->SubMenu->IsActive ) )
{
- menu->Window->State.Redisplay = GL_TRUE;
+ menu->Window->State.WorkMask |= GLUT_DISPLAY_WORK;
menu->ActiveEntry->IsActive = GL_FALSE;
menu->ActiveEntry = NULL;
}
menu->ActiveEntry->IsActive = GL_FALSE;
menu->ActiveEntry = NULL;
}