X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_menu.c;h=9e20d5dc894faa887f555c0510de2e0f82adb16a;hb=6f3bd48bd40bdc0777208aea2dcfd954c7b3a915;hp=f302cdd6dbbca49d3472bdee24fadb3c035c6f6c;hpb=39de8f8682808d020ebc7eb7f13fe49bdc07406a;p=freeglut diff --git a/src/fg_menu.c b/src/fg_menu.c index f302cdd..9e20d5d 100644 --- a/src/fg_menu.c +++ b/src/fg_menu.c @@ -207,7 +207,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) 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; } @@ -277,7 +277,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) ( !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; } @@ -607,7 +607,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, fgSetWindow( parent_window ); fgStructure.CurrentMenu = active_menu; - /* Deactivate menu and then call callback (we don't want menu to stay in view while callback is executing) */ + /* Deactivate menu and then call callback (we don't want menu to stay in view while callback is executing, and user should be able to change menus in callback) */ fgDeactivateMenu( parent_window ); active_menu->Callback( active_entry->ID );