nsMenu inherits from nsIMenuListener

git-svn-id: svn://10.0.0.236/trunk@19661 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com
1999-02-04 07:25:39 +00:00
parent 3b2bec70bf
commit dd4e2d038c
2 changed files with 7 additions and 4 deletions

View File

@@ -35,7 +35,6 @@
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID);
static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID);
//NS_IMPL_ISUPPORTS(nsMenu, kIMenuIID)
nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
@@ -52,12 +51,12 @@ nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
if (aIID.Equals(kISupportsIID)) {
*aInstancePtr = (void*)this;
*aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIMenuListenerIID)) {
*aInstancePtr = (void*) ((nsIMenuListener*)this);
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
}

View File

@@ -25,12 +25,13 @@
#include "nsIMenu.h"
#include "nsVoidArray.h"
#include "nsIMenuListener.h"
/**
* Native Win32 button wrapper
*/
class nsMenu : public nsIMenu
class nsMenu : public nsIMenu, public nsIMenuListener
{
public:
@@ -39,6 +40,9 @@ public:
NS_DECL_ISUPPORTS
//nsIMenuListener interface
nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
NS_IMETHOD Create(nsIMenuBar * aParent, const nsString &aLabel);
NS_IMETHOD Create(nsIMenu * aParent, const nsString &aLabel);