Reworked BMenu::Set/IsEnabled(). I tested what happens under beos and our code seems to be finally correct
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15999 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -532,11 +532,9 @@ BMenu::SetEnabled(bool enabled)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
fEnabled = enabled;
|
fEnabled = enabled;
|
||||||
for (int32 i = 0; i < CountItems(); i++)
|
|
||||||
ItemAt(i)->SetEnabled(enabled);
|
|
||||||
|
|
||||||
if (fSuper)
|
if (fSuperitem)
|
||||||
fSuper->SetEnabled(enabled);
|
fSuperitem->SetEnabled(enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -582,7 +580,10 @@ BMenu::IsLabelFromMarked()
|
|||||||
bool
|
bool
|
||||||
BMenu::IsEnabled() const
|
BMenu::IsEnabled() const
|
||||||
{
|
{
|
||||||
return fEnabled;
|
if (!fEnabled)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return fSuper ? fSuper->IsEnabled() : true ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user