| Index: xfa/fxfa/app/xfa_fftextedit.cpp
|
| diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
|
| index 07324cb358b19c4de27c1059c031b9f5c015556b..e470dcd0c4aa2dd2afceb85da21ff1d186fcd1a0 100644
|
| --- a/xfa/fxfa/app/xfa_fftextedit.cpp
|
| +++ b/xfa/fxfa/app/xfa_fftextedit.cpp
|
| @@ -332,7 +332,8 @@ FX_BOOL CXFA_FFTextEdit::Delete() {
|
| return ((CFWL_Edit*)m_pNormalWidget)->Delete();
|
| }
|
| FX_BOOL CXFA_FFTextEdit::DeSelect() {
|
| - return ((CFWL_Edit*)m_pNormalWidget)->ClearSelections();
|
| + return ((CFWL_Edit*)m_pNormalWidget)->ClearSelections() ==
|
| + FWL_Error::Succeeded;
|
| }
|
| FX_BOOL CXFA_FFTextEdit::GetSuggestWords(
|
| CFX_PointF pointf,
|
| @@ -404,7 +405,7 @@ int32_t CXFA_FFTextEdit::OnProcessMessage(CFWL_Message* pMessage) {
|
| return m_pOldDelegate->OnProcessMessage(pMessage);
|
| }
|
|
|
| -FWL_ERR CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| +FWL_Error CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| CXFA_FFField::OnProcessEvent(pEvent);
|
| switch (pEvent->GetClassID()) {
|
| case CFWL_EventType::TextChanged: {
|
| @@ -435,8 +436,8 @@ FWL_ERR CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| return m_pOldDelegate->OnProcessEvent(pEvent);
|
| }
|
|
|
| -FWL_ERR CXFA_FFTextEdit::OnDrawWidget(CFX_Graphics* pGraphics,
|
| - const CFX_Matrix* pMatrix) {
|
| +FWL_Error CXFA_FFTextEdit::OnDrawWidget(CFX_Graphics* pGraphics,
|
| + const CFX_Matrix* pMatrix) {
|
| return m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
|
| }
|
| CXFA_FFNumericEdit::CXFA_FFNumericEdit(CXFA_FFPageView* pPageView,
|
| @@ -486,12 +487,12 @@ void CXFA_FFNumericEdit::UpdateWidgetProperty() {
|
| m_pNormalWidget->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
|
| }
|
|
|
| -FWL_ERR CXFA_FFNumericEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| +FWL_Error CXFA_FFNumericEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| if (pEvent->GetClassID() == CFWL_EventType::Validate) {
|
| CFWL_EvtEdtValidate* event = (CFWL_EvtEdtValidate*)pEvent;
|
| CFX_WideString wsChange = event->wsInsert;
|
| event->bValidate = OnValidate(m_pNormalWidget->GetWidget(), wsChange);
|
| - return event->bValidate;
|
| + return event->bValidate ? FWL_Error::Succeeded : FWL_Error::Indefinite;
|
| }
|
| return CXFA_FFTextEdit::OnProcessEvent(pEvent);
|
| }
|
| @@ -788,12 +789,12 @@ void CXFA_FFDateTimeEdit::OnSelectChanged(IFWL_Widget* pWidget,
|
| m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Change, &eParam);
|
| }
|
|
|
| -FWL_ERR CXFA_FFDateTimeEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| +FWL_Error CXFA_FFDateTimeEdit::OnProcessEvent(CFWL_Event* pEvent) {
|
| if (pEvent->GetClassID() == CFWL_EventType::SelectChanged) {
|
| CFWL_Event_DtpSelectChanged* event = (CFWL_Event_DtpSelectChanged*)pEvent;
|
| OnSelectChanged(m_pNormalWidget->GetWidget(), event->iYear, event->iMonth,
|
| event->iDay);
|
| - return TRUE;
|
| + return FWL_Error::Succeeded;
|
| }
|
| return CXFA_FFTextEdit::OnProcessEvent(pEvent);
|
| }
|
|
|