Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XMLterm changes only; NOT PART OF DEFAULT SEAMONKEY BUILD.

Browse Source 
Migrated from WebShell to DocShell; compiles with Feb12 tree.
(WebShell still used by mozSimpleContainer, as in viewer/nsBrowserWindow.cpp)


git-svn-id: svn://10.0.0.236/trunk@60671 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
svn%xmlterm.org
2000-02-14 01:17:55 +00:00
parent 32a405424b
commit af05cfd052
21 changed files with 277 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp
View File

@@ -823,6 +823,7 @@ NS_IMETHODIMP mozXMLTermSession::DisplayInput(const nsString& aString,
return NS_ERROR_FAILURE;
if ((cursorCol > 0) || (mPromptHTML.Length() > 0)) {
// Collapse selection to new cursor location
result = selection->Collapse(mInputTextNode, cursorCol);
} else {
@@ -981,13 +982,13 @@ NS_IMETHODIMP mozXMLTermSession::InitStream(const nsString& streamURL,
return result;
nsCOMPtr<nsIWebShell> webShell;
result = mXMLTerminal->GetWebShell(getter_AddRefs(webShell));
nsCOMPtr<nsIDocShell> webShell;
result = mXMLTerminal->GetDocShell(getter_AddRefs(webShell));
if (NS_FAILED(result) || !webShell)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> outerDOMWindow;
result = mozXMLTermUtils::ConvertWebShellToDOMWindow(webShell,
result = mozXMLTermUtils::ConvertDocShellToDOMWindow(webShell,
getter_AddRefs(outerDOMWindow));
if (NS_FAILED(result) || !outerDOMWindow) {
@@ -997,8 +998,12 @@ NS_IMETHODIMP mozXMLTermSession::InitStream(const nsString& streamURL,
}
// Initialize markup handling
nsCAutoString iframeName = "iframet";
//iframeName.Append(mCurrentEntryNumber,10);
nsCAutoString iframeName = "iframe";
#if 0
iframeName.Append("t");
#else
iframeName.Append(mCurrentEntryNumber,10);
#endif
nsCAutoString contentType;
switch (streamMarkupType) {