Tweaks.

layout/xul/base/src/nsMenuFrame.cpp

@@ -78,7 +78,7 @@ NS_IMETHODIMP nsMenuFrame::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 // nsMenuFrame cntr
 //
 nsMenuFrame::nsMenuFrame()
-:mMenuOpen(PR_FALSE), mIsMenu(PR_FALSE), mMenuParent(nsnull)
+:mMenuOpen(PR_FALSE), mIsMenu(PR_FALSE), mMenuParent(nsnull), mOpenTimer(nsnull)
 {
 
 } // cntr
@@ -271,8 +271,12 @@ nsMenuFrame::OpenMenu(PRBool aActivateFlag)
   if (aActivateFlag) {
     // XXX Execute the oncreate handler
     // Sync up the view.
+    PRBool onMenuBar = PR_TRUE;
+    if (mMenuParent)
+      mMenuParent->IsMenuBar(onMenuBar);
+
     if (menuPopup)
-      menuPopup->SyncViewWithFrame(PR_TRUE);
+      menuPopup->SyncViewWithFrame(onMenuBar);
       
     // Open the menu.
     mContent->SetAttribute(kNameSpaceID_None, nsXULAtoms::open, "true", PR_TRUE);

layout/xul/base/src/nsMenuFrame.h

@@ -33,6 +33,7 @@
 
 nsresult NS_NewMenuFrame(nsIFrame** aResult, PRUint32 aFlags) ;
 
+class nsITimer;
 class nsMenuBarFrame;
 class nsMenuPopupFrame;
 
@@ -101,6 +102,7 @@ protected:
   PRBool mIsMenu; // Whether or not we can even have children or not.
   PRBool mMenuOpen;
   nsIMenuParent* mMenuParent; // Our parent menu.
+  nsITimer* mOpenTimer;
 }; // class nsMenuFrame
 
 #endif