summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/cfwl_comboedit.cpp2
-rw-r--r--xfa/fwl/cfwl_edit.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fwl/cfwl_comboedit.cpp b/xfa/fwl/cfwl_comboedit.cpp
index 22ad6bff32..e7a2c6eb8f 100644
--- a/xfa/fwl/cfwl_comboedit.cpp
+++ b/xfa/fwl/cfwl_comboedit.cpp
@@ -28,7 +28,7 @@ void CFWL_ComboEdit::ClearSelected() {
void CFWL_ComboEdit::SetSelected() {
FlagFocus(true);
- GetTxtEdtEngine()->MoveCaretPos(MC_End);
+ GetTxtEdtEngine()->MoveCaretPos(MC_End, false, false);
AddSelRange(0);
}
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 526275313f..92d8c0266b 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -348,7 +348,7 @@ bool CFWL_Edit::Cut(CFX_WideString& wsCut) {
wsCut += wsTemp;
wsTemp.clear();
}
- m_EdtEngine.Delete(0);
+ m_EdtEngine.Delete(0, false);
return true;
}
@@ -623,13 +623,13 @@ void CFWL_Edit::RenderText(CFX_RenderDevice* pRenderDev,
if (!rtDocClip.IntersectWith(pTextSet->GetRect(pText)))
continue;
- int32_t iCount = pTextSet->GetDisplayPos(pText, nullptr, false);
+ int32_t iCount = pTextSet->GetDisplayPos(pText, nullptr);
if (iCount < 1)
continue;
if (char_pos.size() < static_cast<size_t>(iCount))
char_pos.resize(iCount, FXTEXT_CHARPOS());
- iCount = pTextSet->GetDisplayPos(pText, char_pos.data(), false);
+ iCount = pTextSet->GetDisplayPos(pText, char_pos.data());
CFDE_TextOut::DrawString(pRenderDev, pTextSet->GetFontColor(), pFont,
char_pos.data(), iCount, pTextSet->GetFontSize(),
&mt);
@@ -1432,7 +1432,7 @@ void CFWL_Edit::OnKeyDown(CFWL_MessageKey* pMsg) {
#if (_FX_OS_ == _FX_MACOSX_)
m_EdtEngine.Delete(nCaret, true);
#else
- m_EdtEngine.Delete(nCaret);
+ m_EdtEngine.Delete(nCaret, false);
#endif
break;
}