open a new widow if there aren't any available for us to use

This commit is contained in:
pinkerton%netscape.com 2002-04-26 19:13:38 +00:00
Родитель b3b8884b90
Коммит af6ff5ba17
4 изменённых файлов: 16 добавлений и 4 удалений

Просмотреть файл

@ -41,8 +41,11 @@
if ( prefService ) if ( prefService )
prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow); prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
// reuse the main window if there is one. The user may have closed all of
// them or we may get this event at startup before we've had time to load
// our window.
BrowserWindowController* controller = nsnull; BrowserWindowController* controller = nsnull;
if ( reuseWindow ) { if ( reuseWindow && [NSApp mainWindow] ) {
controller = [[NSApp mainWindow] windowController]; controller = [[NSApp mainWindow] windowController];
[controller loadURLString:[self directParameter]]; [controller loadURLString:[self directParameter]];
[[[controller getBrowserWrapper] getBrowserView] setActive: YES]; [[[controller getBrowserWrapper] getBrowserView] setActive: YES];

Просмотреть файл

@ -41,8 +41,11 @@
if ( prefService ) if ( prefService )
prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow); prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
// reuse the main window if there is one. The user may have closed all of
// them or we may get this event at startup before we've had time to load
// our window.
BrowserWindowController* controller = nsnull; BrowserWindowController* controller = nsnull;
if ( reuseWindow ) { if ( reuseWindow && [NSApp mainWindow] ) {
controller = [[NSApp mainWindow] windowController]; controller = [[NSApp mainWindow] windowController];
[controller loadURLString:[self directParameter]]; [controller loadURLString:[self directParameter]];
[[[controller getBrowserWrapper] getBrowserView] setActive: YES]; [[[controller getBrowserWrapper] getBrowserView] setActive: YES];

Просмотреть файл

@ -41,8 +41,11 @@
if ( prefService ) if ( prefService )
prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow); prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
// reuse the main window if there is one. The user may have closed all of
// them or we may get this event at startup before we've had time to load
// our window.
BrowserWindowController* controller = nsnull; BrowserWindowController* controller = nsnull;
if ( reuseWindow ) { if ( reuseWindow && [NSApp mainWindow] ) {
controller = [[NSApp mainWindow] windowController]; controller = [[NSApp mainWindow] windowController];
[controller loadURLString:[self directParameter]]; [controller loadURLString:[self directParameter]];
[[[controller getBrowserWrapper] getBrowserView] setActive: YES]; [[[controller getBrowserWrapper] getBrowserView] setActive: YES];

Просмотреть файл

@ -41,8 +41,11 @@
if ( prefService ) if ( prefService )
prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow); prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
// reuse the main window if there is one. The user may have closed all of
// them or we may get this event at startup before we've had time to load
// our window.
BrowserWindowController* controller = nsnull; BrowserWindowController* controller = nsnull;
if ( reuseWindow ) { if ( reuseWindow && [NSApp mainWindow] ) {
controller = [[NSApp mainWindow] windowController]; controller = [[NSApp mainWindow] windowController];
[controller loadURLString:[self directParameter]]; [controller loadURLString:[self directParameter]];
[[[controller getBrowserWrapper] getBrowserView] setActive: YES]; [[[controller getBrowserWrapper] getBrowserView] setActive: YES];