From 354115f5d6b679e78d93d4770cb4653783c49364 Mon Sep 17 00:00:00 2001
From: "saari%netscape.com" <saari%netscape.com>
Date: Fri, 30 Apr 1999 21:13:42 +0000
Subject: [PATCH] Fix for bug 5676
---
widget/src/windows/nsWindow.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 6d63070f645e5..f23076a803cad 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1420,7 +1420,7 @@ nsIMenu * nsWindow::FindMenu(nsIMenu * aMenu, HMENU aNativeMenu, PRInt32 &aDepth
return aMenu;
}
- aDepth++;
+ //aDepth++;
PRUint32 i, count;
aMenu->GetItemCount(count);
for (i=0;i<count;i++) {
@@ -1430,12 +1430,14 @@ nsIMenu * nsWindow::FindMenu(nsIMenu * aMenu, HMENU aNativeMenu, PRInt32 &aDepth
if (NS_OK == item->QueryInterface(kIMenuIID, (void **)&menu)) {
HMENU nativeMenu = ((nsMenu *)menu)->GetNativeMenu();
if (nativeMenu == aNativeMenu) {
+ aDepth++;
return menu;
} else {
nsIMenu * fndMenu = FindMenu(menu, aNativeMenu, aDepth);
if (fndMenu) {
NS_RELEASE(item);
NS_RELEASE(menu);
+ aDepth++;
return fndMenu;
}
}
--
GitLab