From e63bd2182b66a43b8cd6ec6b1d8c8e004b1c1fd4 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Thu, 24 Jan 2002 03:54:49 +0000 Subject: [PATCH] removing unused ShowModally method. code=mbosch@lorentz.leidenuniv.nl r=me git-svn-id: svn://10.0.0.236/trunk@112646 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/tests/viewer/nsBrowserWindow.cpp | 7 ------- mozilla/webshell/tests/viewer/nsBrowserWindow.h | 1 - mozilla/xpfe/appshell/src/nsWebShellWindow.cpp | 11 ----------- mozilla/xpfe/appshell/src/nsWebShellWindow.h | 1 - 4 files changed, 20 deletions(-) diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index e848cf2a5cf..30c82f9c358 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1891,13 +1891,6 @@ nsBrowserWindow::GetWindowBounds(nsRect& aBounds) return NS_OK; } -NS_IMETHODIMP -nsBrowserWindow::ShowModally(PRBool aPrepare) -{ - // unsupported by viewer - return NS_ERROR_FAILURE; -} - NS_IMETHODIMP nsBrowserWindow::SetChrome(PRUint32 aChromeMask) { diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h index 7c5b0207ba3..fd1f5c2124d 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h @@ -117,7 +117,6 @@ public: PRBool aWidthTransient, PRBool aHeightTransient); NS_IMETHOD GetContentBounds(nsRect& aBounds); NS_IMETHOD GetWindowBounds(nsRect& aBounds); - NS_IMETHOD ShowModally(PRBool aPrepare); NS_IMETHOD SetChrome(PRUint32 aNewChromeMask); NS_IMETHOD GetChrome(PRUint32& aChromeMaskResult); NS_IMETHOD SetProgress(PRInt32 aProgress, PRInt32 aProgressMax); diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 7ea1467ae3e..11395b2cffb 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -1101,17 +1101,6 @@ nsWebShellWindow::ShowModal() return nsXULWindow::ShowModal(); } - -// yes, this one's name and ShowModal are a confusing pair. plan is to merge -// the two someday. -NS_IMETHODIMP -nsWebShellWindow::ShowModally(PRBool aPrepare) -{ - NS_ERROR("Can't use this anymore"); - return NS_ERROR_FAILURE; -} - - /* return the main, outermost webshell in this window */ NS_IMETHODIMP nsWebShellWindow::GetWebShell(nsIWebShell *& aWebShell) diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h index 624f0813709..a6af39e0a45 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h @@ -95,7 +95,6 @@ public: // nsIWebShellWindow methods... NS_IMETHOD Show(PRBool aShow); NS_IMETHOD ShowModal(); - NS_IMETHOD ShowModally(PRBool aPrepare); NS_IMETHOD Toolbar(); NS_IMETHOD Close(); NS_IMETHOD GetWebShell(nsIWebShell *& aWebShell);