From a4ebf6625d9d4fc51509a9ba25367263bf1e838a Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Thu, 28 Feb 2002 23:22:55 +0000 Subject: [PATCH] implement new attribute nsIBaseWindow::enabled. bug 126786 r=hyatt,rginda a=asa git-svn-id: svn://10.0.0.236/trunk@115519 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 14 ++++++++++++++ .../browser/webBrowser/nsDocShellTreeOwner.cpp | 12 ++++++++++++ .../browser/webBrowser/nsWebBrowser.cpp | 14 ++++++++++++++ .../webshell/tests/viewer/nsBrowserWindow.cpp | 16 ++++++++++++++++ mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp | 10 ++++++++++ mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp | 10 ++++++++++ 6 files changed, 76 insertions(+) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index d57d0ca4b4f..4dac8b06ca9 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -2777,6 +2777,20 @@ nsDocShell::SetVisibility(PRBool aVisibility) return NS_OK; } +NS_IMETHODIMP +nsDocShell::GetEnabled(PRBool *aEnabled) +{ + NS_ENSURE_ARG_POINTER(aEnabled); + *aEnabled = PR_TRUE; + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsDocShell::SetEnabled(PRBool aEnabled) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP nsDocShell::GetMainWidget(nsIWidget ** aMainWidget) { diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index 49ac304e4a6..45efd1eac6b 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -617,6 +617,18 @@ NS_IMETHODIMP nsDocShellTreeOwner::SetVisibility(PRBool aVisibility) return NS_ERROR_NULL_POINTER; } +NS_IMETHODIMP nsDocShellTreeOwner::GetEnabled(PRBool *aEnabled) +{ + NS_ENSURE_ARG_POINTER(aEnabled); + *aEnabled = PR_TRUE; + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP nsDocShellTreeOwner::SetEnabled(PRBool aEnabled) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP nsDocShellTreeOwner::GetMainWidget(nsIWidget** aMainWidget) { return NS_ERROR_NULL_POINTER; diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp index 8c8ad1a5fdb..f48274fd1a6 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -1306,6 +1306,20 @@ NS_IMETHODIMP nsWebBrowser::SetVisibility(PRBool aVisibility) return NS_OK; } +NS_IMETHODIMP nsWebBrowser::GetEnabled(PRBool *aEnabled) +{ + if (mInternalWidget) + return mInternalWidget->IsEnabled(aEnabled); + return NS_ERROR_FAILURE; +} + +NS_IMETHODIMP nsWebBrowser::SetEnabled(PRBool aEnabled) +{ + if (mInternalWidget) + return mInternalWidget->Enable(aEnabled); + return NS_ERROR_FAILURE; +} + NS_IMETHODIMP nsWebBrowser::GetMainWidget(nsIWidget** mainWidget) { NS_ENSURE_ARG_POINTER(mainWidget); diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index f2280fd1829..f5a5e93ae36 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -380,6 +380,22 @@ NS_IMETHODIMP nsBrowserWindow::SetVisibility(PRBool aVisibility) return NS_OK; } +NS_IMETHODIMP nsBrowserWindow::GetEnabled(PRBool *aEnabled) +{ + NS_ENSURE_ARG_POINTER(aEnabled); + *aEnabled = PR_TRUE; + if (mWindow) + mWindow->IsEnabled(aEnabled); + return NS_OK; +} + +NS_IMETHODIMP nsBrowserWindow::SetEnabled(PRBool aEnabled) +{ + if (mWindow) + mWindow->Enable(aEnabled); + return NS_OK; +} + NS_IMETHODIMP nsBrowserWindow::GetMainWidget(nsIWidget** aMainWidget) { NS_ENSURE_ARG_POINTER(aMainWidget); diff --git a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp index 9770d0498b9..97177b0d504 100644 --- a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp @@ -298,6 +298,16 @@ NS_IMETHODIMP nsChromeTreeOwner::SetVisibility(PRBool aVisibility) return mXULWindow->SetVisibility(aVisibility); } +NS_IMETHODIMP nsChromeTreeOwner::GetEnabled(PRBool *aEnabled) +{ + return mXULWindow->GetEnabled(aEnabled); +} + +NS_IMETHODIMP nsChromeTreeOwner::SetEnabled(PRBool aEnable) +{ + return mXULWindow->SetEnabled(aEnable); +} + NS_IMETHODIMP nsChromeTreeOwner::GetMainWidget(nsIWidget** aMainWidget) { NS_ENSURE_ARG_POINTER(aMainWidget); diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp index 7abf3f4cc1a..0768453160f 100644 --- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -545,6 +545,16 @@ NS_IMETHODIMP nsContentTreeOwner::SetVisibility(PRBool aVisibility) return mXULWindow->SetVisibility(aVisibility); } +NS_IMETHODIMP nsContentTreeOwner::GetEnabled(PRBool *aEnabled) +{ + return mXULWindow->GetEnabled(aEnabled); +} + +NS_IMETHODIMP nsContentTreeOwner::SetEnabled(PRBool aEnable) +{ + return mXULWindow->SetEnabled(aEnable); +} + NS_IMETHODIMP nsContentTreeOwner::GetMainWidget(nsIWidget** aMainWidget) { NS_ENSURE_ARG_POINTER(aMainWidget);