Bug 617539 - Merge nsIMenuBoxObject_MOZILLA_2_0_BRANCH, r=enn

layout/xul/base/public/nsIMenuBoxObject.idl

@@ -41,7 +41,7 @@
 interface nsIDOMElement;
 interface nsIDOMKeyEvent;
 
-[scriptable, uuid(F5099746-5049-4e81-A03E-945D5110FEE2)]
+[scriptable, uuid(689ebf3d-0184-450a-9bfa-5a26be0e7a8c)]
 interface nsIMenuBoxObject : nsISupports
 {
   void openMenu(in boolean openFlag);
@@ -49,13 +49,7 @@ interface nsIMenuBoxObject : nsISupports
   attribute nsIDOMElement activeChild;
 
   boolean handleKeyPress(in nsIDOMKeyEvent keyEvent);
-};
 
-// This interface is implemented by menus, but could also
-// be implemented by menubars
-[scriptable, uuid(D03150F6-92A3-4307-A73C-864C8DAD3F22)]
-interface nsIMenuBoxObject_MOZILLA_2_0_BRANCH : nsISupports
-{
   // true if the menu or menubar was opened via a keypress.
   readonly attribute boolean openedWithKey;
 };

layout/xul/base/src/nsMenuBoxObject.cpp

@@ -47,13 +47,11 @@
 #include "nsMenuPopupFrame.h"
 
 class nsMenuBoxObject : public nsIMenuBoxObject,
-                        public nsBoxObject,
+                        public nsBoxObject
-                        public nsIMenuBoxObject_MOZILLA_2_0_BRANCH
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIMENUBOXOBJECT
-  NS_DECL_NSIMENUBOXOBJECT_MOZILLA_2_0_BRANCH
 
   nsMenuBoxObject();
   virtual ~nsMenuBoxObject();
@@ -67,7 +65,7 @@ nsMenuBoxObject::~nsMenuBoxObject()
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED2(nsMenuBoxObject, nsBoxObject, nsIMenuBoxObject, nsIMenuBoxObject_MOZILLA_2_0_BRANCH)
+NS_IMPL_ISUPPORTS_INHERITED1(nsMenuBoxObject, nsBoxObject, nsIMenuBoxObject)
 
 /* void openMenu (in boolean openFlag); */
 NS_IMETHODIMP nsMenuBoxObject::OpenMenu(PRBool aOpenFlag)

toolkit/content/widgets/menu.xml

@@ -62,7 +62,8 @@
 
       <property name="openedWithKey" readonly="true">
         <getter><![CDATA[
-          return this.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject_MOZILLA_2_0_BRANCH).openedWithKey;
+          return this.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject)
+              .openedWithKey;
         ]]></getter>
       </property>