diff --git a/dom/src/base/nsBarProps.cpp b/dom/src/base/nsBarProps.cpp index a2e07fd851b0..94ebe1603369 100644 --- a/dom/src/base/nsBarProps.cpp +++ b/dom/src/base/nsBarProps.cpp @@ -129,24 +129,12 @@ MenubarPropImpl::~MenubarPropImpl() { NS_IMETHODIMP MenubarPropImpl::GetVisible(PRBool *aVisible) { -#if 1 return BarPropImpl::GetVisibleByFlag(aVisible, NS_CHROME_MENU_BAR_ON); -#else - if (mBrowser) - return mBrowser->IsMenuBarVisible(aVisible); - return NS_ERROR_FAILURE; -#endif } NS_IMETHODIMP MenubarPropImpl::SetVisible(PRBool aVisible) { -#if 1 return BarPropImpl::SetVisibleByFlag(aVisible, NS_CHROME_MENU_BAR_ON); -#else - if (mBrowser) - return mBrowser->ShowMenuBar(aVisible); - return NS_ERROR_FAILURE; -#endif } // diff --git a/webshell/embed/ActiveX/WebShellContainer.cpp b/webshell/embed/ActiveX/WebShellContainer.cpp index f94d4c07f516..44223f25daea 100644 --- a/webshell/embed/ActiveX/WebShellContainer.cpp +++ b/webshell/embed/ActiveX/WebShellContainer.cpp @@ -240,15 +240,6 @@ CWebShellContainer::ShowMenuBar(PRBool aShow) } -NS_IMETHODIMP -CWebShellContainer::IsMenuBarVisible(PRBool *aVisible) -{ - NG_TRACE_METHOD(CWebShellContainer::IsMenuBarVisible); - *aVisible = PR_FALSE; - return NS_OK; -} - - NS_IMETHODIMP CWebShellContainer::GetWebShell(nsIWebShell*& aResult) { diff --git a/webshell/embed/ActiveX/WebShellContainer.h b/webshell/embed/ActiveX/WebShellContainer.h index 99db15b0bf5c..82f27dcee641 100644 --- a/webshell/embed/ActiveX/WebShellContainer.h +++ b/webshell/embed/ActiveX/WebShellContainer.h @@ -69,7 +69,6 @@ public: NS_IMETHOD GetStatus(const PRUnichar** aResult); NS_IMETHOD SetProgress(PRInt32 aProgress, PRInt32 aProgressMax); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD GetWebShell(nsIWebShell*& aResult); NS_IMETHOD GetContentWebShell(nsIWebShell **aResult); diff --git a/webshell/public/nsIBrowserWindow.h b/webshell/public/nsIBrowserWindow.h index 18d99a4b8cc2..ae5f116f34d5 100644 --- a/webshell/public/nsIBrowserWindow.h +++ b/webshell/public/nsIBrowserWindow.h @@ -98,7 +98,6 @@ public: NS_IMETHOD SetProgress(PRInt32 aProgress, PRInt32 aProgressMax) = 0; NS_IMETHOD ShowMenuBar(PRBool aShow) = 0; - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible) = 0; NS_IMETHOD GetWebShell(nsIWebShell*& aResult) = 0; NS_IMETHOD GetContentWebShell(nsIWebShell **aResult) = 0; diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp index b084ed15ca13..cf1a48a18542 100644 --- a/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1688,13 +1688,6 @@ nsBrowserWindow::ShowMenuBar(PRBool aShow) return NS_OK; } -NS_IMETHODIMP -nsBrowserWindow::IsMenuBarVisible(PRBool *aVisible) -{ - *aVisible = PR_TRUE; - return NS_OK; -} - NS_IMETHODIMP nsBrowserWindow::WillLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, nsLoadType aReason) diff --git a/webshell/tests/viewer/nsBrowserWindow.h b/webshell/tests/viewer/nsBrowserWindow.h index dd222358349d..3ef8b488e603 100644 --- a/webshell/tests/viewer/nsBrowserWindow.h +++ b/webshell/tests/viewer/nsBrowserWindow.h @@ -104,7 +104,6 @@ public: NS_IMETHOD GetStatus(const PRUnichar** aResult); NS_IMETHOD SetProgress(PRInt32 aProgress, PRInt32 aProgressMax); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD GetWebShell(nsIWebShell*& aResult); NS_IMETHOD GetContentWebShell(nsIWebShell **aResult); diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h index e1efda18ed37..4caedfe53d33 100644 --- a/widget/public/nsIWidget.h +++ b/widget/public/nsIWidget.h @@ -551,14 +551,6 @@ class nsIWidget : public nsISupports { NS_IMETHOD ShowMenuBar(PRBool aShow) = 0; - /** - * Query whether the widget's MenuBar is visible - * - * @param aVisible PR_TRUE if currently visible, PR_FALSE if not - */ - - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible) = 0; - /** * Set the collection of tooltip rectangles. * A NS_SHOW_TOOLTIP event is generated when the mouse hovers over one diff --git a/widget/src/beos/nsWindow.cpp b/widget/src/beos/nsWindow.cpp index 67ef1104ce3d..025555eacea8 100644 --- a/widget/src/beos/nsWindow.cpp +++ b/widget/src/beos/nsWindow.cpp @@ -2462,12 +2462,6 @@ printf("nsWindow::ShowMenuBar - FIXME: not implemented!\n"); return NS_OK; } -NS_METHOD nsWindow::IsMenuBarVisible(PRBool *aVisible) -{ - *aVisible = PR_TRUE; - return NS_ERROR_FAILURE; // todo: (maybe. method isn't actually used yet.) -} - NS_METHOD nsWindow::GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) { aWidth = mPreferredWidth; diff --git a/widget/src/beos/nsWindow.h b/widget/src/beos/nsWindow.h index 0f177d8220f0..2a5d3b2f10ec 100644 --- a/widget/src/beos/nsWindow.h +++ b/widget/src/beos/nsWindow.h @@ -118,8 +118,7 @@ public: NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect); NS_IMETHOD SetTitle(const nsString& aTitle); NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar); - NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); + NS_IMETHOD ShowMenuBar(PRBool aShow); NS_IMETHOD SetTooltips(PRUint32 aNumberOfTips,nsRect* aTooltipAreas[]); NS_IMETHOD RemoveTooltips(); NS_IMETHOD UpdateTooltips(nsRect* aNewTips[]); diff --git a/widget/src/gtk/nsWidget.cpp b/widget/src/gtk/nsWidget.cpp index 215d80ae9ed8..6f5c5e898dec 100644 --- a/widget/src/gtk/nsWidget.cpp +++ b/widget/src/gtk/nsWidget.cpp @@ -767,13 +767,6 @@ NS_METHOD nsWidget::ShowMenuBar(PRBool aShow) return NS_OK; } -NS_METHOD nsWidget::IsMenuBarVisible(PRBool *aVisible) -{ - g_print("bleh\n"); - NS_NOTYETIMPLEMENTED("nsWidget::IsMenuBarvisible"); - return NS_OK; -} - nsresult nsWidget::CreateWidget(nsIWidget *aParent, const nsRect &aRect, EVENT_CALLBACK aHandleEventFunction, diff --git a/widget/src/gtk/nsWidget.h b/widget/src/gtk/nsWidget.h index 6f61a703615d..63a895bf368c 100644 --- a/widget/src/gtk/nsWidget.h +++ b/widget/src/gtk/nsWidget.h @@ -132,7 +132,6 @@ class nsWidget : public nsBaseWidget NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect); NS_IMETHOD SetMenuBar(nsIMenuBar *aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD Invalidate(PRBool aIsSynchronous); NS_IMETHOD Invalidate(const nsRect &aRect, PRBool aIsSynchronous); diff --git a/widget/src/gtk/nsWindow.cpp b/widget/src/gtk/nsWindow.cpp index b2abde0443ce..f86bc80892c1 100644 --- a/widget/src/gtk/nsWindow.cpp +++ b/widget/src/gtk/nsWindow.cpp @@ -663,12 +663,6 @@ NS_METHOD nsWindow::ShowMenuBar(PRBool aShow) return NS_OK; } -NS_METHOD nsWindow::IsMenuBarVisible(PRBool *aVisible) -{ - *aVisible = PR_TRUE; - return NS_ERROR_FAILURE; // todo: (maybe. method isn't actually used yet.) -} - NS_METHOD nsWindow::Move(PRUint32 aX, PRUint32 aY) { // not implimented for toplevel windows diff --git a/widget/src/gtk/nsWindow.h b/widget/src/gtk/nsWindow.h index 451a1ed0769a..8d928cd9e9d0 100644 --- a/widget/src/gtk/nsWindow.h +++ b/widget/src/gtk/nsWindow.h @@ -63,7 +63,6 @@ public: NS_IMETHOD Show(PRBool aShow); NS_IMETHOD ShowMenuBar(PRBool aShow); NS_IMETHOD Move(PRUint32 aX, PRUint32 aY); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD Resize(PRUint32 aWidth, PRUint32 aHeight, PRBool aRepaint); NS_IMETHOD Resize(PRUint32 aX, PRUint32 aY, PRUint32 aWidth, diff --git a/widget/src/mac/nsWindow.cpp b/widget/src/mac/nsWindow.cpp index 054789a8b435..2f3d674dfb66 100644 --- a/widget/src/mac/nsWindow.cpp +++ b/widget/src/mac/nsWindow.cpp @@ -430,12 +430,6 @@ NS_IMETHODIMP nsWindow::ShowMenuBar(PRBool aShow) return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsWindow::IsMenuBarVisible(PRBool *aVisible) -{ - *aVisible = PR_TRUE; // likely to be true - return NS_OK; -} - //------------------------------------------------------------------------- // // Get the widget's MenuBar. diff --git a/widget/src/mac/nsWindow.h b/widget/src/mac/nsWindow.h index 4f9e9c849854..bf9a138ebecf 100644 --- a/widget/src/mac/nsWindow.h +++ b/widget/src/mac/nsWindow.h @@ -122,7 +122,6 @@ public: NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); virtual nsIMenuBar* GetMenuBar(); NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight); NS_IMETHOD SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight); diff --git a/widget/src/motif/nsWindow.cpp b/widget/src/motif/nsWindow.cpp index 837f301d039c..2c304ba1be4e 100644 --- a/widget/src/motif/nsWindow.cpp +++ b/widget/src/motif/nsWindow.cpp @@ -1624,12 +1624,6 @@ NS_METHOD nsWindow::ShowMenuBar(PRBool aShow) return NS_ERROR_FAILURE; } -NS_METHOD nsWindow::IsMenuBarVisible(PRBool *aVisible) -{ - *aVisible = PR_TRUE; - return NS_ERROR_FAILURE; -} - NS_METHOD nsWindow::GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) { aWidth = mPreferredWidth; diff --git a/widget/src/motif/nsWindow.h b/widget/src/motif/nsWindow.h index 4e2bb062465d..1ebaaa61d891 100644 --- a/widget/src/motif/nsWindow.h +++ b/widget/src/motif/nsWindow.h @@ -118,7 +118,6 @@ public: NS_IMETHOD EndResizingChildren(void); NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight); NS_IMETHOD SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight); NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus); diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp index eab28686b168..cdaaf1aaff80 100644 --- a/widget/src/os2/nsWindow.cpp +++ b/widget/src/os2/nsWindow.cpp @@ -1124,23 +1124,6 @@ nsresult nsWindow::ShowMenuBar( PRBool bShow) return NS_OK; } -nsresult nsWindow::IsMenuBarVisible( PRBool *aVisible) -{ - if( !aVisible) - return NS_ERROR_NULL_POINTER; - - *aVisible = PR_FALSE; - - if( mMenuBar) - { - void *hwndMenu = 0; - mMenuBar->GetNativeData( hwndMenu); - *aVisible = WinIsWindowVisible( (HWND)hwndMenu); - } - - return NS_OK; -} - void nsWindow::SetContextMenu( nsContextMenu *aMenu) { mActiveMenu = aMenu; diff --git a/widget/src/os2/nsWindow.h b/widget/src/os2/nsWindow.h index 702461923aa7..1989fd9a4381 100644 --- a/widget/src/os2/nsWindow.h +++ b/widget/src/os2/nsWindow.h @@ -72,7 +72,6 @@ class nsWindow : public nsBaseWidget, // Strangely misplaced menubar methods NS_IMETHOD SetMenuBar( nsIMenuBar *aMenuBar); NS_IMETHOD ShowMenuBar( PRBool bShow); - NS_IMETHOD IsMenuBarVisible( PRBool *aVisible); // Physical properties NS_IMETHOD Show( PRBool bState); diff --git a/widget/src/photon/nsWidget.cpp b/widget/src/photon/nsWidget.cpp index b1ca02db687e..c4e8c8b9e71e 100644 --- a/widget/src/photon/nsWidget.cpp +++ b/widget/src/photon/nsWidget.cpp @@ -967,12 +967,6 @@ NS_METHOD nsWidget::ShowMenuBar( PRBool aShow) return NS_ERROR_FAILURE; } -NS_METHOD nsWidget::IsMenuBarVisible( PRBool *aVisible ) -{ - PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::IsMenuBarVisible - Not Implemented \n")); - return NS_ERROR_FAILURE; -} - nsresult nsWidget::CreateWidget(nsIWidget *aParent, const nsRect &aRect, EVENT_CALLBACK aHandleEventFunction, diff --git a/widget/src/photon/nsWidget.h b/widget/src/photon/nsWidget.h index 5a897e5ba069..39e26990b6cc 100644 --- a/widget/src/photon/nsWidget.h +++ b/widget/src/photon/nsWidget.h @@ -115,7 +115,6 @@ class nsWidget : public nsBaseWidget NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect); NS_IMETHOD SetMenuBar(nsIMenuBar *aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD Invalidate(PRBool aIsSynchronous); NS_IMETHOD Invalidate(const nsRect &aRect, PRBool aIsSynchronous); diff --git a/widget/src/photon/nsWindow.cpp b/widget/src/photon/nsWindow.cpp index ff2a69cde50e..6159d84f06a4 100644 --- a/widget/src/photon/nsWindow.cpp +++ b/widget/src/photon/nsWindow.cpp @@ -759,14 +759,6 @@ NS_METHOD nsWindow::ShowMenuBar( PRBool aShow) } -NS_METHOD nsWindow::IsMenuBarVisible( PRBool *aVisible ) -{ - PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::IsMenuBarVisible - Not Implemented\n")); - *aVisible = PR_TRUE; - return NS_ERROR_FAILURE; -} - - //------------------------------------------------------------------------- // // Process all nsWindows messages diff --git a/widget/src/photon/nsWindow.h b/widget/src/photon/nsWindow.h index e87b377bf5b7..f4db85b9f786 100644 --- a/widget/src/photon/nsWindow.h +++ b/widget/src/photon/nsWindow.h @@ -59,7 +59,6 @@ public: NS_IMETHOD SetTitle(const nsString& aTitle); NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD GetBounds( nsRect &aRect ); NS_IMETHOD GetClientBounds( nsRect &aRect ); NS_IMETHOD SetTooltips(PRUint32 aNumberOfTips,nsRect* aTooltipAreas[]); diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 3113a4a09f9a..75a073d4bfb6 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -3478,13 +3478,6 @@ NS_METHOD nsWindow::ShowMenuBar(PRBool aShow) return rv; } -NS_METHOD nsWindow::IsMenuBarVisible(PRBool *aVisible) -{ - HMENU menu = ::GetMenu(mWnd); - *aVisible = menu ? PR_TRUE : PR_FALSE; - return NS_OK; -} - NS_METHOD nsWindow::GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) { aWidth = mPreferredWidth; diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h index cd629f5e6cea..588288f70e9d 100644 --- a/widget/src/windows/nsWindow.h +++ b/widget/src/windows/nsWindow.h @@ -115,7 +115,6 @@ public: NS_IMETHOD SetTitle(const nsString& aTitle); NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD SetTooltips(PRUint32 aNumberOfTips,nsRect* aTooltipAreas[]); NS_IMETHOD RemoveTooltips(); NS_IMETHOD UpdateTooltips(nsRect* aNewTips[]); diff --git a/widget/src/xlib/nsWidget.cpp b/widget/src/xlib/nsWidget.cpp index cebd46134d74..9423149c7b3a 100644 --- a/widget/src/xlib/nsWidget.cpp +++ b/widget/src/xlib/nsWidget.cpp @@ -312,11 +312,6 @@ NS_IMETHODIMP nsWidget::ShowMenuBar(PRBool aShow) return NS_OK; } -NS_IMETHODIMP nsWidget::IsMenuBarVisible(PRBool *aVisible) -{ - return NS_OK; -} - void * nsWidget::GetNativeData(PRUint32 aDataType) { switch (aDataType) { diff --git a/widget/src/xlib/nsWidget.h b/widget/src/xlib/nsWidget.h index 440551043d38..283b40b4cf40 100644 --- a/widget/src/xlib/nsWidget.h +++ b/widget/src/xlib/nsWidget.h @@ -90,7 +90,6 @@ public: NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect); NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_IMETHOD SetTooltips(PRUint32 aNumberOfTips,nsRect* aTooltipAreas[]); NS_IMETHOD RemoveTooltips(); NS_IMETHOD UpdateTooltips(nsRect* aNewTips[]); diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index 377a56860324..22738ca6247f 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -2735,13 +2735,6 @@ nsWebShellWindow::ShowMenuBar(PRBool aShow) return mWindow->ShowMenuBar(aShow); } -NS_IMETHODIMP -nsWebShellWindow::IsMenuBarVisible(PRBool *aVisible) -{ - return mWindow->IsMenuBarVisible(aVisible); -} - - //nsIUrlDispatcher methods NS_IMETHODIMP diff --git a/xpfe/appshell/src/nsWebShellWindow.h b/xpfe/appshell/src/nsWebShellWindow.h index c04373a89dfa..87ac2a651812 100644 --- a/xpfe/appshell/src/nsWebShellWindow.h +++ b/xpfe/appshell/src/nsWebShellWindow.h @@ -244,7 +244,6 @@ public: NS_IMETHOD GetStatus(const PRUnichar** aResult); NS_IMETHOD SetProgress(PRInt32 aProgress, PRInt32 aProgressMax); NS_IMETHOD ShowMenuBar(PRBool aShow); - NS_IMETHOD IsMenuBarVisible(PRBool *aVisible); NS_DECL_IURLDISPATCHER