diff --git a/mozilla/xpfe/appshell/macbuild/AppShell.mcp b/mozilla/xpfe/appshell/macbuild/AppShell.mcp index 982ad3bedb3..3e218557a1d 100644 Binary files a/mozilla/xpfe/appshell/macbuild/AppShell.mcp and b/mozilla/xpfe/appshell/macbuild/AppShell.mcp differ diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index 26c56970565..d3a44e6b4d9 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/xpfe/appshell/src/Makefile.in @@ -37,7 +37,6 @@ CPPSRCS = \ nsChromeTreeOwner.cpp \ nsContentTreeOwner.cpp \ nsXULWindow.cpp \ - nsXULCommand.cpp \ nsAppShellService.cpp \ nsWebShellWindow.cpp \ nsCommandLineService.cpp \ diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win index 78a31c0caba..ac68b8d8f56 100644 --- a/mozilla/xpfe/appshell/src/makefile.win +++ b/mozilla/xpfe/appshell/src/makefile.win @@ -31,7 +31,6 @@ CPP_OBJS= \ .\$(OBJDIR)\nsChromeTreeOwner.obj \ .\$(OBJDIR)\nsContentTreeOwner.obj \ .\$(OBJDIR)\nsXULWindow.obj \ - .\$(OBJDIR)\nsXULCommand.obj \ .\$(OBJDIR)\nsAppShellService.obj \ .\$(OBJDIR)\nsWebShellWindow.obj \ .\$(OBJDIR)\nsAppShellFactory.obj \ diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 22351ccb015..02000ef2beb 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -58,7 +58,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIAppShellService.h" #include "nsAppShellCIDs.h" -#include "nsXULCommand.h" #include "nsIDOMCharacterData.h" #include "nsIDOMNodeList.h" @@ -560,6 +559,7 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent) return result; } +#if 0 //---------------------------------------- NS_IMETHODIMP nsWebShellWindow::CreateMenu(nsIMenuBar * aMenuBar, nsIDOMNode * aMenuNode, @@ -849,6 +849,7 @@ void nsWebShellWindow::LoadSubMenu( NS_RELEASE(pnsMenu); } } +#endif //---------------------------------------- void nsWebShellWindow::DynamicLoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWindow) @@ -935,6 +936,7 @@ void nsWebShellWindow::DynamicLoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aP } // end if (menuBar) } // nsWebShellWindow::DynamicLoadMenus +#if 0 //---------------------------------------- void nsWebShellWindow::LoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWindow) { @@ -1045,6 +1047,7 @@ void nsWebShellWindow::DoContextMenu( } } // end if (aMenuNode) } +#endif //------------------------------------------------------------------------------ NS_IMETHODIMP @@ -1571,6 +1574,7 @@ nsWebShellWindow::AttributeChanged(nsIDocument *aDocument, nsIAtom* aAttribute, PRInt32 aHint) { +#if 0 //printf("AttributeChanged\n"); PRInt32 i; for (i=0;i FindNamedDOMNode(const nsString &aName, nsIDOMNode * aParent, PRInt32 & aCount, PRInt32 aEndCount); nsCOMPtr GetNamedDOMDoc(const nsString & aWebShellName); + void DynamicLoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWindow); +#if 0 + void LoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWindow); NS_IMETHOD CreateMenu(nsIMenuBar * aMenuBar, nsIDOMNode * aMenuNode, nsString & aMenuName); void LoadSubMenu(nsIMenu * pParentMenu, nsIDOMElement * menuElement,nsIDOMNode * menuNode); NS_IMETHOD LoadMenuItem(nsIMenu * pParentMenu, nsIDOMElement * menuitemElement, nsIDOMNode * menuitemNode); +#endif nsCOMPtr GetDOMNodeFromWebShell(nsIWebShell *aShell); void ExecuteStartupCode();