Corretta abilitazione items
git-svn-id: svn://10.65.10.50/trunk@2532 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
363c2b2615
commit
53164b6587
@ -230,10 +230,11 @@ bool TMenu_application::module_enabled(const char * program) const
|
|||||||
{
|
{
|
||||||
bool found = FALSE;
|
bool found = FALSE;
|
||||||
const int nmod = _modules.items();
|
const int nmod = _modules.items();
|
||||||
|
|
||||||
for (int aut = 0; aut < nmod; aut++)
|
for (int aut = 0; aut < nmod; aut++)
|
||||||
{
|
{
|
||||||
const TString& s = (const TString&) _modules[aut];
|
const TString& s = (const TString&) _modules[aut];
|
||||||
if (s.compare(program, 2) == 0) { found = TRUE; break; }
|
if (isdigit(program[2]) && s.compare(program, 2) == 0) { found = TRUE; break; }
|
||||||
}
|
}
|
||||||
return (!found) || has_module(aut);
|
return (!found) || has_module(aut);
|
||||||
}
|
}
|
||||||
@ -289,7 +290,8 @@ void TMenu_application::load_menu()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
_enabled.set(last, module_enabled(action));
|
_enabled.set(last, TRUE);
|
||||||
|
// _enabled.set(last, module_enabled(action));
|
||||||
}
|
}
|
||||||
_first[++_max] = _menu.items();
|
_first[++_max] = _menu.items();
|
||||||
}
|
}
|
||||||
@ -642,6 +644,7 @@ bool TMenu_application::menu(MENU_TAG)
|
|||||||
set_firm();
|
set_firm();
|
||||||
prefix().set(NULL); // Chiude prefix
|
prefix().set(NULL); // Chiude prefix
|
||||||
TExternal_app a(option);
|
TExternal_app a(option);
|
||||||
|
|
||||||
a.run();
|
a.run();
|
||||||
prefix().set("DEF"); // Aggiorna prefix
|
prefix().set("DEF"); // Aggiorna prefix
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user