bustage fix for bug 433952 landing

widget/public/nsIWidget.h

@@ -1116,7 +1116,7 @@ class nsIWidget : public nsISupports {
      * in the native menu bar. Within that, the first item (index 0) is a
      * submenu, and we want to activate the 5th item within that submenu.
      */
-    virtual nsresult ActivateNativeMenuItemAt(const nsAString& aString) = 0;
+    virtual nsresult ActivateNativeMenuItemAt(const nsAString& indexString) = 0;
 
 protected:
     // keep the list of children.  We also keep track of our siblings.

widget/src/xpwidgets/nsBaseWidget.h

@@ -136,7 +136,7 @@ public:
   virtual void            ConvertToDeviceCoordinates(nscoord  &aX,nscoord &aY) {}
   virtual void            FreeNativeData(void * data, PRUint32 aDataType) {}
   NS_IMETHOD              BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVertical);
-  NS_IMETHOD              ActivateNativeMenuItemAt(const nsAString& indexString) { return NS_ERROR_NOT_IMPLEMENTED; }
+  virtual nsresult        ActivateNativeMenuItemAt(const nsAString& indexString) { return NS_ERROR_NOT_IMPLEMENTED; }
 
 protected: