i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes, fixed a possible leak in Uninstall()

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16773 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-03-13 20:36:04 +00:00
parent 3417ac5629
commit deab92e7ed
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuItem.cpp
+2 -6
View File
@@ -625,8 +625,7 @@ BMenuItem::Uninstall()
if (Target() == fWindow) if (Target() == fWindow)
SetTarget(BMessenger()); SetTarget(BMessenger());
// TODO: I'm not sure about B_COMMAND_KEY if (fShortcutChar != 0 && fModifiers != 0 && fWindow != NULL)
if (fShortcutChar != 0 && (fModifiers & B_COMMAND_KEY) && fWindow != NULL)
fWindow->RemoveShortcut(fShortcutChar, fModifiers); fWindow->RemoveShortcut(fShortcutChar, fModifiers);
fWindow = NULL; fWindow = NULL;
@@ -652,10 +651,7 @@ BMenuItem::Select(bool selected)
if (fSelected == selected) if (fSelected == selected)
return; return;
if (Submenu()) { if (Submenu() || IsEnabled()) {
fSelected = selected;
Highlight(selected);
} else if (IsEnabled()) {
fSelected = selected; fSelected = selected;
Highlight(selected); Highlight(selected);
} }