summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
de0e01c)
another window, submenu didn't close and root menu's activate state
wasn't reset. Fixed.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1351
7f0cb862-5218-0410-a997-
914c9d46530a
SFG_Menu* menu = window->Menu[ button ];
SFG_Window* current_window = fgStructure.CurrentWindow;
SFG_Menu* menu = window->Menu[ button ];
SFG_Window* current_window = fgStructure.CurrentWindow;
- /* If the menu is already active in another window, deactivate it there */
+ /* If the menu is already active in another window, deactivate it (and any submenu's) there */
if ( menu->ParentWindow )
if ( menu->ParentWindow )
- menu->ParentWindow->ActiveMenu = NULL ;
+ fgDeactivateMenu(menu->ParentWindow);
/* Mark the menu as active, so that it gets displayed: */
window->ActiveMenu = menu;
/* Mark the menu as active, so that it gets displayed: */
window->ActiveMenu = menu;