diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-21 13:12:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-21 13:12:06 -0700 |
| commit | 5d9da0c1255a75dd9b7b2005f8b7d6ae4948feaf (patch) | |
| tree | df40bedc2582cab695e7bf4b2056bfddd4969908 /xfa/fwl/basewidget/ifwl_edit.h | |
| parent | 0f6425fff33e4096b4e1fbfb954edae1349c0145 (diff) | |
| download | pdfium-5d9da0c1255a75dd9b7b2005f8b7d6ae4948feaf.tar.xz | |
Remove CFWL_Note.
This CL removes the CFWL_Note class. The two subclasses, CFWL_Event and
CFWL_Message are distinct types and should not be related by the subclass. The
code has been updated to pass the correct types as needed.
The various FWL_EVTHASH and FWL_MSGHASH defines have all been removed and turned
into an FWL_EventType and FWL_MessageType enum classes.
BUG=pdfium:474
Review URL: https://codereview.chromium.org/1901183002
Diffstat (limited to 'xfa/fwl/basewidget/ifwl_edit.h')
| -rw-r--r-- | xfa/fwl/basewidget/ifwl_edit.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h index caa2b530b8..eb8c77b8a6 100644 --- a/xfa/fwl/basewidget/ifwl_edit.h +++ b/xfa/fwl/basewidget/ifwl_edit.h @@ -9,6 +9,7 @@ #include <vector> +#include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/lightwidget/cfwl_widget.h" @@ -49,13 +50,6 @@ #define FWL_STYLEEXT_EDT_LastLineHeight (1L << 27) #define FWL_PARTDATA_EDT_Background 0 #define FWL_PARTDATA_EDT_StaticBackground 1 -// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474 -#define FWL_EVTHASH_EDT_TextChanged 1064022132 -#define FWL_EVTHASH_EDT_PreSelfAdaption 1001979178 -#define FWL_EVTHASH_EDT_Validate 3373308608 -#define FWL_EVTHASH_EDT_CheckWord 2897181520 -#define FWL_EVTHASH_EDT_GetSuggestWords 315782791 -#define FWL_EVTHASH_EDT_TextFull 2158580174 typedef struct FWL_HEDTFIND_ { void* pData; } * FWL_HEDTFIND; @@ -65,34 +59,35 @@ enum FWL_EDT_TEXTCHANGED { FWL_EDT_TEXTCHANGED_Replace, }; -BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, FWL_EVTHASH_EDT_TextChanged) +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, FWL_EVTHASH_EDT_TextFull) +BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextFull, CFWL_EventType::TextFull) END_FWL_EVENT_DEF -BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtPreSelfAdaption, FWL_EVTHASH_EDT_PreSelfAdaption) +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, FWL_EVTHASH_EDT_Validate) +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, FWL_EVTHASH_EDT_CheckWord) +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, FWL_EVTHASH_EDT_GetSuggestWords) +BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtGetSuggestWords, + CFWL_EventType::GetSuggestedWords) FX_BOOL bSuggestWords; CFX_ByteString bsWord; std::vector<CFX_ByteString> bsArraySuggestWords; |