Index: xfa/fwl/core/cfwl_edit.cpp |
diff --git a/xfa/fwl/core/cfwl_edit.cpp b/xfa/fwl/core/cfwl_edit.cpp |
index 4544ebcb824018907d75b74e0e69aaef32f6213d..44f7775ec1dbc7a1490142dd6f3b0a34e9642879 100644 |
--- a/xfa/fwl/core/cfwl_edit.cpp |
+++ b/xfa/fwl/core/cfwl_edit.cpp |
@@ -20,9 +20,9 @@ |
#include "xfa/fgas/font/cfgas_gefont.h" |
#include "xfa/fwl/core/cfwl_app.h" |
#include "xfa/fwl/core/cfwl_caret.h" |
+#include "xfa/fwl/core/cfwl_event.h" |
#include "xfa/fwl/core/cfwl_evtcheckword.h" |
#include "xfa/fwl/core/cfwl_evttextchanged.h" |
-#include "xfa/fwl/core/cfwl_evttextfull.h" |
#include "xfa/fwl/core/cfwl_evtvalidate.h" |
#include "xfa/fwl/core/cfwl_msgkey.h" |
#include "xfa/fwl/core/cfwl_msgmouse.h" |
@@ -454,9 +454,6 @@ void CFWL_Edit::On_TextChanged(CFDE_TxtEdtEngine* pEdit, |
CFWL_EvtTextChanged event; |
event.m_pSrcTarget = this; |
- event.nChangeType = ChangeInfo.nChangeType; |
- event.wsInsert = ChangeInfo.wsInsert; |
- event.wsDelete = ChangeInfo.wsDelete; |
event.wsPrevText = ChangeInfo.wsPrevText; |
DispatchEvent(&event); |
@@ -503,7 +500,6 @@ bool CFWL_Edit::On_Validate(CFDE_TxtEdtEngine* pEdit, CFX_WideString& wsText) { |
pDst = this; |
CFWL_EvtValidate event; |
- event.pDstWidget = pDst; |
event.m_pSrcTarget = this; |
event.wsInsert = wsText; |
event.bValidate = true; |
@@ -1277,7 +1273,7 @@ void CFWL_Edit::ProcessInsertError(int32_t iError) { |
if (iError != -2) |
return; |
- CFWL_EvtTextFull textFullEvent; |
+ CFWL_Event textFullEvent(CFWL_EventType::TextFull); |
textFullEvent.m_pSrcTarget = this; |
DispatchEvent(&textFullEvent); |
} |
@@ -1522,11 +1518,7 @@ void CFWL_Edit::OnKeyDown(CFWL_MsgKey* pMsg) { |
break; |
} |
case FWL_VKEY_F2: |
- break; |
- case FWL_VKEY_Tab: { |
- DispatchKeyEvent(pMsg); |
- break; |
- } |
+ case FWL_VKEY_Tab: |
default: |
break; |
} |