i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+10 -10
View File
@@ -369,9 +369,9 @@ BMenu::AttachedToWindow()
_GetIsAltCommandKey(sAltAsCommandKey); _GetIsAltCommandKey(sAltAsCommandKey);
bool attachAborted = _AddDynamicItems(); fAttachAborted = _AddDynamicItems();
if (!attachAborted) { if (!fAttachAborted) {
_CacheFontInfo(); _CacheFontInfo();
_LayoutItems(0); _LayoutItems(0);
_UpdateWindowViewSize(false); _UpdateWindowViewSize(false);
@@ -1466,11 +1466,11 @@ BMenu::_Show(bool selectFirstItem, bool keyDown)
return false; return false;
if (window->Lock()) { if (window->Lock()) {
bool attachAborted = false; bool addAborted = false;
if (keyDown) if (keyDown)
attachAborted = _AddDynamicItems(keyDown); addAborted = _AddDynamicItems(keyDown);
if (attachAborted) { if (addAborted) {
if (ourWindow) if (ourWindow)
window->Quit(); window->Quit();
else else
@@ -2747,21 +2747,21 @@ BMenu::_UpdateWindowViewSize(const bool &move)
bool bool
BMenu::_AddDynamicItems(bool keyDown) BMenu::_AddDynamicItems(bool keyDown)
{ {
bool attachAborted = false; bool addAborted = false;
BMenuItem* superItem = Superitem();
BMenu* superMenu = Supermenu();
if (AddDynamicItem(B_INITIAL_ADD)) { if (AddDynamicItem(B_INITIAL_ADD)) {
do { do {
BMenuItem* superItem = Superitem();
BMenu* superMenu = Supermenu();
if (superMenu != NULL if (superMenu != NULL
&& !superMenu->_OkToProceed(superItem, keyDown)) { && !superMenu->_OkToProceed(superItem, keyDown)) {
AddDynamicItem(B_ABORT); AddDynamicItem(B_ABORT);
attachAborted = true; addAborted = true;
break; break;
} }
} while (AddDynamicItem(B_PROCESSING)); } while (AddDynamicItem(B_PROCESSING));
} }
return attachAborted; return addAborted;
} }