nsMenuX and nsMenuItemX don't need to implement nsIWeakReference. b=400548 r=smorgan sr=roc a=dsicore

This commit is contained in:
joshmoz@gmail.com 2007-11-09 11:51:27 -08:00
parent 214e9739d8
commit 2d706e30f5
4 changed files with 4 additions and 8 deletions

View File

@ -42,7 +42,6 @@
#include "nsIMenuItem.h"
#include "nsString.h"
#include "nsIChangeManager.h"
#include "nsWeakReference.h"
#include "nsIWidget.h"
#include "nsAutoPtr.h"
@ -56,8 +55,7 @@ class nsMenuItemIconX;
*/
class nsMenuItemX : public nsIMenuItem,
public nsIChangeObserver,
public nsSupportsWeakReference
public nsIChangeObserver
{
public:
nsMenuItemX();

View File

@ -57,7 +57,7 @@
#include "nsGUIEvent.h"
NS_IMPL_ISUPPORTS3(nsMenuItemX, nsIMenuItem, nsIChangeObserver, nsISupportsWeakReference)
NS_IMPL_ISUPPORTS2(nsMenuItemX, nsIMenuItem, nsIChangeObserver)
nsMenuItemX::nsMenuItemX()

View File

@ -43,7 +43,6 @@
#include "nsAutoPtr.h"
#include "nsIMenu.h"
#include "nsIChangeManager.h"
#include "nsWeakReference.h"
#include "nsMenuBarX.h"
#import <Carbon/Carbon.h>
@ -68,8 +67,7 @@ class nsMenuItemIconX;
class nsMenuX : public nsIMenu,
public nsIChangeObserver,
public nsSupportsWeakReference
public nsIChangeObserver
{
public:

View File

@ -83,7 +83,7 @@ static PRBool gConstructingMenu = PR_FALSE;
static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID);
NS_IMPL_ISUPPORTS3(nsMenuX, nsIMenu, nsIChangeObserver, nsISupportsWeakReference)
NS_IMPL_ISUPPORTS2(nsMenuX, nsIMenu, nsIChangeObserver)
nsMenuX::nsMenuX()