don't use nsIDOMNode, use nsIContent. r=saari/sr=sfraser.
git-svn-id: svn://10.0.0.236/trunk@90074 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
b74db57a0f
commit
44be2822e6
@ -25,8 +25,6 @@
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsString.h"
|
||||
#include "nsIDOMNode.h"
|
||||
#include "nsIDOMElement.h"
|
||||
#include "nsIWebShell.h"
|
||||
|
||||
class nsIMenuBar;
|
||||
@ -34,6 +32,7 @@ class nsIMenu;
|
||||
class nsIMenuItem;
|
||||
class nsIMenuListener;
|
||||
class nsIChangeManager;
|
||||
class nsIContent;
|
||||
|
||||
// {ab6cea83-00ff-11d5-bb6f-f432a43ead7c}
|
||||
#define NS_IMENU_IID \
|
||||
@ -54,7 +53,7 @@ class nsIMenu : public nsISupports {
|
||||
*
|
||||
*/
|
||||
NS_IMETHOD Create ( nsISupports * aParent, const nsAReadableString &aLabel, const nsAReadableString &aAccessKey,
|
||||
nsIChangeManager* aManager, nsIWebShell* aShell, nsIDOMNode* aNode ) = 0;
|
||||
nsIChangeManager* aManager, nsIWebShell* aShell, nsIContent* aNode ) = 0;
|
||||
|
||||
/**
|
||||
* Get the Menu's Parent
|
||||
@ -171,10 +170,10 @@ class nsIMenu : public nsISupports {
|
||||
NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
|
||||
|
||||
/**
|
||||
* Get DOMNode
|
||||
* Get GetMenuContent
|
||||
*
|
||||
*/
|
||||
NS_IMETHOD GetDOMNode(nsIDOMNode ** aMenuNode) = 0;
|
||||
NS_IMETHOD GetMenuContent(nsIContent ** aMenuContent) = 0;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ class nsIMenuItem : public nsISupports {
|
||||
*/
|
||||
NS_IMETHOD Create ( nsIMenu* aParent, const nsString & aLabel, PRBool isSeparator,
|
||||
EMenuItemType aItemType, PRBool aEnabled,
|
||||
nsIChangeManager* aManager, nsIWebShell* aShell, nsIDOMNode* aNode ) = 0;
|
||||
nsIChangeManager* aManager, nsIWebShell* aShell, nsIContent* aNode ) = 0;
|
||||
|
||||
/**
|
||||
* Get the MenuItem label
|
||||
|
||||
@ -64,17 +64,9 @@ class nsIMenuListener : public nsISupports {
|
||||
*/
|
||||
virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent) = 0;
|
||||
|
||||
virtual nsEventStatus MenuConstruct(
|
||||
|
||||
const nsMenuEvent & aMenuEvent,
|
||||
|
||||
nsIWidget * aParentWindow,
|
||||
|
||||
void * menubarNode,
|
||||
|
||||
void * aWebShell) = 0;
|
||||
|
||||
|
||||
virtual nsEventStatus MenuConstruct( const nsMenuEvent & aMenuEvent,
|
||||
nsIWidget* aParentWindow, void* aNode,
|
||||
void* aWebShell) = 0;
|
||||
|
||||
virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent) = 0;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user