Index: xfa/fwl/basewidget/ifwl_edit.h |
diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h |
index 531323e5640781751ec528c2f79f52d2d18626c5..ac2ca3110fed00febcc7a72aee184e66fd6e4dba 100644 |
--- a/xfa/fwl/basewidget/ifwl_edit.h |
+++ b/xfa/fwl/basewidget/ifwl_edit.h |
@@ -54,39 +54,37 @@ enum FWL_EDT_TEXTCHANGED { |
FWL_EDT_TEXTCHANGED_Replace, |
}; |
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, CFWL_EventType::TextChanged) |
-int32_t nChangeType; |
-CFX_WideString wsInsert; |
-CFX_WideString wsDelete; |
-CFX_WideString wsPrevText; |
-END_FWL_EVENT_DEF |
- |
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextFull, CFWL_EventType::TextFull) |
-END_FWL_EVENT_DEF |
- |
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtPreSelfAdaption, CFWL_EventType::PreSelfAdaption) |
-FX_BOOL bHSelfAdaption; |
-FX_BOOL bVSelfAdaption; |
-CFX_RectF rtAfterChange; |
-END_FWL_EVENT_DEF |
- |
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtValidate, CFWL_EventType::Validate) |
-IFWL_Widget* pDstWidget; |
-CFX_WideString wsInsert; |
-FX_BOOL bValidate; |
-END_FWL_EVENT_DEF |
- |
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtCheckWord, CFWL_EventType::CheckWord) |
-CFX_ByteString bsWord; |
-FX_BOOL bCheckWord; |
-END_FWL_EVENT_DEF |
- |
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtGetSuggestWords, |
- CFWL_EventType::GetSuggestedWords) |
-FX_BOOL bSuggestWords; |
-CFX_ByteString bsWord; |
-std::vector<CFX_ByteString> bsArraySuggestWords; |
-END_FWL_EVENT_DEF |
+FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, |
+ CFWL_EventType::TextChanged, |
+ int32_t nChangeType; |
+ CFX_WideString wsInsert; |
+ CFX_WideString wsDelete; |
+ CFX_WideString wsPrevText;) |
+ |
+FWL_EVENT_DEF(CFWL_EvtEdtTextFull, CFWL_EventType::TextFull) |
+ |
+FWL_EVENT_DEF(CFWL_EvtEdtPreSelfAdaption, |
+ CFWL_EventType::PreSelfAdaption, |
+ FX_BOOL bHSelfAdaption; |
+ FX_BOOL bVSelfAdaption; |
+ CFX_RectF rtAfterChange;) |
+ |
+FWL_EVENT_DEF(CFWL_EvtEdtValidate, |
+ CFWL_EventType::Validate, |
+ IFWL_Widget* pDstWidget; |
+ CFX_WideString wsInsert; |
+ FX_BOOL bValidate;) |
+ |
+FWL_EVENT_DEF(CFWL_EvtEdtCheckWord, |
+ CFWL_EventType::CheckWord, |
+ CFX_ByteString bsWord; |
+ FX_BOOL bCheckWord;) |
+ |
+FWL_EVENT_DEF(CFWL_EvtEdtGetSuggestWords, |
+ CFWL_EventType::GetSuggestedWords, |
+ FX_BOOL bSuggestWords; |
+ CFX_ByteString bsWord; |
+ std::vector<CFX_ByteString> bsArraySuggestWords;) |
class CFWL_WidgetImpProperties; |
class IFDE_TxtEdtDoRecord; |
@@ -115,7 +113,6 @@ class IFWL_Edit : public IFWL_Widget { |
int32_t GetLimit(); |
FWL_Error SetLimit(int32_t nLimit); |
FWL_Error SetAliasChar(FX_WCHAR wAlias); |
- FWL_Error SetFormatString(const CFX_WideString& wsFormat); |
FWL_Error Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen); |
FWL_Error DeleteSelections(); |
FWL_Error DeleteRange(int32_t nStart, int32_t nCount = -1); |