Bug 1699792 - Make nsStandaloneNativeMenu not inherit from nsMenuObjectX. r=harry

Differential Revision: https://phabricator.services.mozilla.com/D109128
This commit is contained in:
Markus Stange 2021-03-23 13:40:29 +00:00
parent 9badbf6ad6
commit 743d168998
2 changed files with 1 additions and 8 deletions

View File

@ -13,7 +13,6 @@ enum nsMenuObjectTypeX {
eMenuBarObjectType,
eSubmenuObjectType,
eMenuItemObjectType,
eStandaloneNativeMenuObjectType,
};
// All menu objects subclass this.

View File

@ -11,8 +11,7 @@
#include "nsMenuX.h"
#include "nsIStandaloneNativeMenu.h"
class nsStandaloneNativeMenu : public nsMenuObjectX,
public nsIStandaloneNativeMenu,
class nsStandaloneNativeMenu : public nsIStandaloneNativeMenu,
public nsMenuItemIconX::Listener {
public:
nsStandaloneNativeMenu();
@ -20,11 +19,6 @@ class nsStandaloneNativeMenu : public nsMenuObjectX,
NS_DECL_ISUPPORTS
NS_DECL_NSISTANDALONENATIVEMENU
// nsMenuObjectX
nsMenuObjectTypeX MenuObjectType() override {
return eStandaloneNativeMenuObjectType;
}
// nsMenuItemIconX::Listener
void IconUpdated() override;