Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #7902 and #8090

Browse Source
This commit is contained in:
mcmullen%netscape.com 1999-06-17 21:35:59 +00:00
parent 4692ed820c
commit 73b8757be8
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
suite/common/pref/preftree.xul
View File

@ -53,7 +53,6 @@
{
dump("Creating prefwindow object...");
prefwindow = Components.classes['component://netscape/prefwindow'].createInstance(Components.interfaces.nsIPrefWindow);
prefwindow.showWindow("navigator.js", window, url);
dump("...created\n");
}
else

1
xpfe/components/prefwindow/resources/content/preftree.xul
View File

@ -53,7 +53,6 @@
{
dump("Creating prefwindow object...");
prefwindow = Components.classes['component://netscape/prefwindow'].createInstance(Components.interfaces.nsIPrefWindow);
prefwindow.showWindow("navigator.js", window, url);
dump("...created\n");
}
else

8
xpfe/components/prefwindow/src/nsPrefWindow.cpp
View File

@ -76,7 +76,6 @@ nsPrefWindow::nsPrefWindow()
, mPanelFrame(nsnull)
, mPrefs(nsnull)
, mSubStrings(nsnull)
, mWindow(nsnull)
{
NS_INIT_REFCNT();
@ -156,7 +155,7 @@ NS_IMETHODIMP nsPrefWindow::showWindow(
if (mPrefs)
{
#ifdef NS_DEBUG
stream << "Existing pref object reused by "
stream << "¥¥¥ showWindow called twice! Existing pref object reused by "
<< nsString(id).ToCString(buf, sizeof(buf))
<< nsEndl;
#endif
@ -179,8 +178,6 @@ NS_IMETHODIMP nsPrefWindow::showWindow(
return NS_ERROR_FAILURE;
// (code adapted from nsToolkitCore::ShowModal. yeesh.)
if (mWindow)
return NS_OK;
nsIWebShellWindow* window = nsnull;
nsCOMPtr<nsIURL> urlObj;
nsresult rv = NS_NewURL(getter_AddRefs(urlObj), "chrome://pref/content/");
@ -198,7 +195,6 @@ NS_IMETHODIMP nsPrefWindow::showWindow(
nsnull, cb, 504, 436);
if (window)
{
mWindow = window;
nsCOMPtr<nsIWidget> parentWindowWidgetThing;
nsresult gotParent
= parent ? parent->GetWidget(*getter_AddRefs(parentWindowWidgetThing)) :
@ -719,7 +715,6 @@ NS_IMETHODIMP nsPrefWindow::savePrefs()
mPrefs->SavePrefFile();
}
// Then close
mWindow = nsnull;
return Close(mPanelFrame);
} // nsPrefWindow::SavePrefs
@ -732,7 +727,6 @@ NS_IMETHODIMP nsPrefWindow::cancelPrefs()
mPrefs->DeleteBranch("temp_tree");
// Then close
mWindow = nsnull;
return Close(mPanelFrame);
}

7
xpfe/components/prefwindow/src/nsPrefWindow.h
View File

@ -26,9 +26,6 @@ class nsPrefWindow
// This class implements the nsISupports interface functions.
NS_DECL_ISUPPORTS
// // This class implements the nsIAppShellComponent interface functions.
// NS_DECL_IAPPSHELLCOMPONENT
// This class implements the nsIFindComponent interface functions.
NS_IMETHOD showWindow(
const PRUnichar *id,
@ -77,9 +74,7 @@ class nsPrefWindow
static nsPrefWindow* sPrefWindow;
static PRUint32 sInstanceCount;
nsIWebShellWindow* mWindow;
nsString mTreeScript;
nsString mTreeScript;
nsString mPanelScript;
nsIDOMWindow* mTreeFrame;