Added a target to DoGetURL so shack can dispatch correctly.

This commit is contained in:
pinkerton%netscape.com 1998-08-05 02:55:07 +00:00
Родитель 0e2ee7c7f4
Коммит d3191edb44
2 изменённых файлов: 7 добавлений и 2 удалений

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

@ -2619,6 +2619,7 @@ Boolean CFrontApp::ObeyCommand(CommandT inCommand, void* ioParam)
CNavCenterWindow* navCenter = dynamic_cast<CNavCenterWindow*>(URobustCreateWindow::CreateWindow(CNavCenterWindow::res_ID, this));
navCenter->BringPaneToFront ( HT_VIEW_HISTORY );
navCenter->Show();
}
break;
@ -2626,6 +2627,7 @@ Boolean CFrontApp::ObeyCommand(CommandT inCommand, void* ioParam)
{
CNavCenterWindow* navCenter = dynamic_cast<CNavCenterWindow*>(URobustCreateWindow::CreateWindow(CNavCenterWindow::res_ID, this));
navCenter->BringPaneToFront ( HT_VIEW_BOOKMARK );
navCenter->Show();
}
break;
@ -2945,7 +2947,7 @@ void CFrontApp::DoWindowsMenu(CommandT inCommand)
// DoGetURL loads the given url into the frontmost window, or new one if there is no frontmost
// Provides a bottleneck for UI generated requests to load a URL
void CFrontApp::DoGetURL( const cstring& url )
void CFrontApp::DoGetURL( const cstring & url, const char* inTarget )
{
// Check for kiosk mode and bail if it's set so that the user can't manually
// go to a different URL. Note that this does NOT prevent dispatching to a different
@ -2959,6 +2961,7 @@ void CFrontApp::DoGetURL( const cstring& url )
// URDFUtilities::LaunchNode(). Both are quick. (pinkerton)
if ( !URDFUtilities::LaunchURL(url) ) {
URL_Struct* theURL = NET_CreateURLStruct(url, NET_DONT_RELOAD);
theURL->window_target = const_cast<char*>(inTarget);
if (theURL)
CURLDispatcher::DispatchURL(theURL, NULL);
}

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

@ -156,7 +156,9 @@ public:
static void DoHelpMenuItem( short itemNum );
// ¥¥ Command handling
static void DoGetURL (const cstring& url); // DoGetURL loads the given url into the frontmost window, or new one if there is no frontmost
static void DoGetURL (const cstring& url, const char* inTarget = NULL);
// loads the given url into the frontmost window, or new one if there
// is no frontmost
static void DoOpenDirectoryURL( CommandT menuCommand );
static void DoOpenLogoURL( CommandT menuCommand );
void OpenLocalURL( FSSpec* inFileSpec,