TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-08 13:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo TorqueLab changes until it works properly

Browse source
This commit is contained in:
Duion 2015-09-06 23:14:36 +02:00
parent 683a11e384
commit 9b8114d4e1
8 changed files with 12 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/gui/editor/guiMenuBar.cpp
View file

@ -1000,15 +1000,12 @@ GuiMenuBar::MenuItem* GuiMenuBar::findSubmenuItem(MenuItem *menuItem, const char
// Add a menuitem to the given submenu
void GuiMenuBar::addSubmenuItem(Menu *menu, MenuItem *submenu, const char *text, U32 id, const char *accelerator, S32 checkGroup)
{
// Check that the given menu item supports a submenu
//TorqueLab isSubmenu check removed and simply validate the submenu object
//if(submenu && !submenu->isSubmenu)
if (!submenu)
{
Con::errorf("GuiMenuBar::addSubmenuItem: Attempting to add menuitem '%s' to an invalid submenu", text);
return;
}
submenu->isSubmenu = true;//TorqueLab => Force isSubmenu to true (hack)
// Check that the given menu item supports a submenu
if(submenu && !submenu->isSubmenu)
{
Con::errorf("GuiMenuBar::addSubmenuItem: Attempting to add menuitem '%s' to an invalid submenu",text);
return;
}
// allocate the new menu item
MenuItem *newMenuItem = new MenuItem;
@ -1032,13 +1029,6 @@ void GuiMenuBar::addSubmenuItem(Menu *menu, MenuItem *submenu, const char *text,
// Point back to the submenu's menu
newMenuItem->submenuParentMenu = menu;
//TorqueLab : Added to make sure there's a menu to add the item
if (!submenu->submenu){
Menu *newMenu = sCreateMenu(submenu->text, submenu->id);
submenu->submenu = newMenu;
}
//TorqueLab end
// link it into the menu's menu item list
MenuItem **walk = &submenu->submenu->firstMenuItem;
while(*walk)