mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix after akkana's changes: nsISelection -> nsIDOMSelection

This commit is contained in:
sfraser%netscape.com 1999-02-12 00:55:46 +00:00
Родитель 3758bddef4
Коммит 4832e6f185
2 изменённых файлов: 14 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
layout/base/nsCaret.cpp
Просмотреть файл

@ -22,7 +22,7 @@
#include "nsITimer.h"
#include "nsITimerCallback.h"
#include "nsISelection.h"
#include "nsIFrameSelection.h"
#include "nsIFrame.h"
#include "nsIDOMNode.h"
#include "nsIDOMRange.h"
@ -80,14 +80,10 @@ NS_METHOD nsCaret::Init(nsIPresShell *inPresShell, nsCaretProperties *inCaretPro
// get the selection from the pres shell, and set ourselves up as a selection
// listener
nsCOMPtr<nsISelection> selection;
if (NS_SUCCEEDED(mPresShell->GetSelection(getter_AddRefs(selection))))
nsCOMPtr<nsIDOMSelection> domSelection;
if (NS_SUCCEEDED(mPresShell->GetSelection(getter_AddRefs(domSelection))))
{
nsCOMPtr<nsIDOMSelection> domSelection(selection);
if (domSelection)
{
domSelection->AddSelectionListener(this);
}
domSelection->AddSelectionListener(this);
}
// set up the blink timer
@ -219,13 +215,11 @@ void nsCaret::DrawCaret()
if (PR_TRUE || !mDrawn)
{
nsCOMPtr<nsISelection> selection;
nsresult err = mPresShell->GetSelection(getter_AddRefs(selection));
if (!NS_SUCCEEDED(err) || (nsnull == selection))
nsCOMPtr<nsIDOMSelection> domSelection;
nsresult err = mPresShell->GetSelection(getter_AddRefs(domSelection));
if (!NS_SUCCEEDED(err) || (nsnull == domSelection))
return;
nsCOMPtr<nsIDOMSelection> domSelection(selection);
PRBool isCollapsed;
if (domSelection && NS_SUCCEEDED(domSelection->IsCollapsed(&isCollapsed)) && isCollapsed)

20
layout/base/src/nsCaret.cpp
Просмотреть файл

@ -22,7 +22,7 @@
#include "nsITimer.h"
#include "nsITimerCallback.h"
#include "nsISelection.h"
#include "nsIFrameSelection.h"
#include "nsIFrame.h"
#include "nsIDOMNode.h"
#include "nsIDOMRange.h"
@ -80,14 +80,10 @@ NS_METHOD nsCaret::Init(nsIPresShell *inPresShell, nsCaretProperties *inCaretPro
// get the selection from the pres shell, and set ourselves up as a selection
// listener
nsCOMPtr<nsISelection> selection;
if (NS_SUCCEEDED(mPresShell->GetSelection(getter_AddRefs(selection))))
nsCOMPtr<nsIDOMSelection> domSelection;
if (NS_SUCCEEDED(mPresShell->GetSelection(getter_AddRefs(domSelection))))
{
nsCOMPtr<nsIDOMSelection> domSelection(selection);
if (domSelection)
{
domSelection->AddSelectionListener(this);
}
domSelection->AddSelectionListener(this);
}
// set up the blink timer
@ -219,13 +215,11 @@ void nsCaret::DrawCaret()
if (PR_TRUE || !mDrawn)
{
nsCOMPtr<nsISelection> selection;
nsresult err = mPresShell->GetSelection(getter_AddRefs(selection));
if (!NS_SUCCEEDED(err) || (nsnull == selection))
nsCOMPtr<nsIDOMSelection> domSelection;
nsresult err = mPresShell->GetSelection(getter_AddRefs(domSelection));
if (!NS_SUCCEEDED(err) || (nsnull == domSelection))
return;
nsCOMPtr<nsIDOMSelection> domSelection(selection);
PRBool isCollapsed;
if (domSelection && NS_SUCCEEDED(domSelection->IsCollapsed(&isCollapsed)) && isCollapsed)