Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed attachAborted to addAborted

Browse Source 
Use fAttachAborted in AttachedToWindow().



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37442 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2010-07-09 17:13:34 +00:00
parent a9ab7e7f24
commit 821a9b0306
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kits/interface/Menu.cpp
View File

@ -369,9 +369,9 @@ BMenu::AttachedToWindow()
_GetIsAltCommandKey(sAltAsCommandKey);
bool attachAborted = _AddDynamicItems();
fAttachAborted = _AddDynamicItems();
if (!attachAborted) {
if (!fAttachAborted) {
_CacheFontInfo();
_LayoutItems(0);
_UpdateWindowViewSize(false);
@ -1466,11 +1466,11 @@ BMenu::_Show(bool selectFirstItem, bool keyDown)
return false;
if (window->Lock()) {
bool attachAborted = false;
bool addAborted = false;
if (keyDown)
attachAborted = _AddDynamicItems(keyDown);
addAborted = _AddDynamicItems(keyDown);
if (attachAborted) {
if (addAborted) {
if (ourWindow)
window->Quit();
else
@ -2747,21 +2747,21 @@ BMenu::_UpdateWindowViewSize(const bool &move)
bool
BMenu::_AddDynamicItems(bool keyDown)
{
bool attachAborted = false;
BMenuItem* superItem = Superitem();
BMenu* superMenu = Supermenu();
bool addAborted = false;
if (AddDynamicItem(B_INITIAL_ADD)) {
do {
BMenuItem* superItem = Superitem();
BMenu* superMenu = Supermenu();
if (superMenu != NULL
&& !superMenu->_OkToProceed(superItem, keyDown)) {
AddDynamicItem(B_ABORT);
attachAborted = true;
addAborted = true;
break;
}
} while (AddDynamicItem(B_PROCESSING));
}
return attachAborted;
return addAborted;
}