[haiku-commits] r37442 - haiku/trunk/src/kits/interface
- From: stefano.ceccherini@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 9 Jul 2010 19:13:35 +0200 (CEST)
Author: jackburton
Date: 2010-07-09 19:13:34 +0200 (Fri, 09 Jul 2010)
New Revision: 37442
Changeset: http://dev.haiku-os.org/changeset/37442/haiku
Modified:
haiku/trunk/src/kits/interface/Menu.cpp
Log:
Renamed attachAborted to addAborted
Use fAttachAborted in AttachedToWindow().
Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp 2010-07-09 15:52:35 UTC (rev
37441)
+++ haiku/trunk/src/kits/interface/Menu.cpp 2010-07-09 17:13:34 UTC (rev
37442)
@@ -369,9 +369,9 @@
_GetIsAltCommandKey(sAltAsCommandKey);
- bool attachAborted = _AddDynamicItems();
+ fAttachAborted = _AddDynamicItems();
- if (!attachAborted) {
+ if (!fAttachAborted) {
_CacheFontInfo();
_LayoutItems(0);
_UpdateWindowViewSize(false);
@@ -1466,11 +1466,11 @@
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 @@
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;
}
Other related posts:
