7 files changed, 8 insertions, 29 deletions
diff --git a/xfa/fwl/basewidget/ifwl_checkbox.h b/xfa/fwl/basewidget/ifwl_checkbox.h
index 3b634553d0..355121ac1e 100644
--- a/xfa/fwl/basewidget/ifwl_checkbox.h
+++ b/xfa/fwl/basewidget/ifwl_checkbox.h
@@ -59,7 +59,8 @@
 #define FWL_PARTSTATE_CKB_Focused (1L << 4)
 #define FWL_PARTSTATE_CKB_Mask1 (3L << 0)
 #define FWL_PARTSTATE_CKB_Mask2 (3L << 2)
-#define FWL_EVT_CKB_CheckStateChanged L"FWL_EVENT_CKB_CheckStateChanged"
+
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_CKB_CheckStateChanged 2503252963
 
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCkbCheckStateChanged,
diff --git a/xfa/fwl/basewidget/ifwl_combobox.h b/xfa/fwl/basewidget/ifwl_combobox.h
index 98a6750278..c5a30cf115 100644
--- a/xfa/fwl/basewidget/ifwl_combobox.h
+++ b/xfa/fwl/basewidget/ifwl_combobox.h
@@ -50,13 +50,7 @@ class IFWL_ComboBox;
 #define FWL_PARTSTATE_CMB_Disabled (3L << 0)
 #define FWL_PARTSTATE_CMB_Selected (1L << 2)
 #define FWL_WGTCAPACITY_CMB_ComboFormHandler (FWL_WGTCAPACITY_MAX + 7)
-#define FWL_EVT_CMB_DropDown L"FWL_EVENT_CMB_PreDropDown"
-#define FWL_EVT_CMB_PostDropDown L"FWL_EVENT_CMB_PostDropDown"
-#define FWL_EVT_CMB_CloseUp L"FWL_EVENT_CMB_CloseUp"
-#define FWL_EVT_CMB_EditChanged L"FWL_EVENT_CMB_EditChanged"
-#define FWL_EVT_CMB_SelChanged L"FWL_EVENT_CMB_SelChanged"
-#define FWL_EVT_CMB_HoverChanged L"FWL_EVENT_CMB_HoverChanged"
-#define FWL_EVT_CMB_DrawItem L"FWL_EVENT_CMB_DrawItem"
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_CMB_PreDropDown 1357646798
 #define FWL_EVTHASH_CMB_PostDropDown 3677010285
 #define FWL_EVTHASH_CMB_CloseUp 2871271190
@@ -65,12 +59,6 @@ class IFWL_ComboBox;
 #define FWL_EVTHASH_CMB_HoverChanged 944325448
 #define FWL_EVTHASH_CMB_DrawItem 917354551
 
-enum FWL_CMB_TEXTCHANGED {
-  FWL_CMB_TEXTCHANGED_Insert = 0,
-  FWL_CMB_TEXTCHANGED_Delete,
-  FWL_CMB_TEXTCHANGED_Replace,
-};
-
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbPreDropDown, FWL_EVTHASH_CMB_PreDropDown)
 END_FWL_EVENT_DEF
 
diff --git a/xfa/fwl/basewidget/ifwl_datetimepicker.h b/xfa/fwl/basewidget/ifwl_datetimepicker.h
index f2a91aba64..f73aa73490 100644
--- a/xfa/fwl/basewidget/ifwl_datetimepicker.h
+++ b/xfa/fwl/basewidget/ifwl_datetimepicker.h
@@ -38,15 +38,11 @@
 #define FWL_PARTSTATE_DTP_Hovered (1L << 0)
 #define FWL_PARTSTATE_DTP_Pressed (2L << 0)
 #define FWL_PARTSTATE_DTP_Disabled (3L << 0)
-#define FWL_EVT_DTP_DropDown L"FWL_EVENT_DTP_DropDown"
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_DTP_DropDown 264728733
-#define FWL_EVT_DTP_CloseUp L"FWL_EVENT_DTP_CloseUp"
 #define FWL_EVTHASH_DTP_CloseUp 4280973803
-#define FWL_EVT_DTP_EditChanged L"FWL_EVENT_DTP_EditChanged"
 #define FWL_EVTHASH_DTP_EditChanged 4009610944
-#define FWL_EVT_DTP_HoverChanged L"FWL_EVENT_DTP_HoverChanged"
 #define FWL_EVTHASH_DTP_HoverChanged 686674750
-#define FWL_EVT_DTP_SelectChanged L"FWL_EVENT_DTP_SelectChanged"
 #define FWL_EVTHASH_DTP_SelectChanged 1589616858
 
 BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpDropDown, FWL_EVTHASH_DTP_DropDown)
diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h
index b27f8b4898..90df9d959c 100644
--- a/xfa/fwl/basewidget/ifwl_edit.h
+++ b/xfa/fwl/basewidget/ifwl_edit.h
@@ -57,17 +57,12 @@
 #define FWL_PARTSTATE_EDT_Normal (0L << 0)
 #define FWL_PARTSTATE_EDT_ReadOnly (1L << 0)
 #define FWL_PARTSTATE_EDT_Disable (2L << 0)
-#define FWL_EVT_EDT_TextChanged L"FWL_EVENT_EDT_TextChanged"
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_EDT_TextChanged 1064022132
-#define FWL_EVT_EDT_PreSelfAdaption L"FWL_EVENT_PreSelfAdaption"
 #define FWL_EVTHASH_EDT_PreSelfAdaption 1001979178
-#define FWL_EVT_EDT_Validate L"FWL_EVTHASH_EDT_Validate"
 #define FWL_EVTHASH_EDT_Validate 3373308608
-#define FWL_EVT_EDT_CheckWord L"FWL_EVTHASH_EDT_CheckWord"
 #define FWL_EVTHASH_EDT_CheckWord 2897181520
-#define FWL_EVT_EDT_GetSuggestWords L"FWL_EVTHASH_EDT_GetSuggestWords"
 #define FWL_EVTHASH_EDT_GetSuggestWords 315782791
-#define FWL_EVT_EDT_TextFull L"FWL_EVTHASH_EDT_TextFull"
 #define FWL_EVTHASH_EDT_TextFull 2158580174
 #define FWL_EDT_FIND_FLAGS_Prev (0L << 0)
 #define FWL_EDT_FIND_FLAGS_Next (1L << 0)
diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h
index 1225eafcba..d73ca0f38d 100644
--- a/xfa/fwl/basewidget/ifwl_listbox.h
+++ b/xfa/fwl/basewidget/ifwl_listbox.h
@@ -46,8 +46,7 @@
 #define FWL_WGTHITTEST_LTB_Item FWL_WGTHITTEST_MAX + 1
 #define FWL_WGTHITTEST_LTB_HScrollBar FWL_WGTHITTEST_MAX + 2
 #define FWL_WGTHITTEST_LTB_VScrollBar FWL_WGTHITTEST_MAX + 3
-#define FWL_EVT_LTB_SelChanged L"FWL_EVENT_LTB_SelChanged"
-#define FWL_EVT_LTB_DrawItem L"FWL_EVENT_LTB_DrawItem"
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_LTB_SelChanged 1701781688
 #define FWL_EVTHASH_LTB_DrawItem 1050853991
 
diff --git a/xfa/fwl/basewidget/ifwl_monthcalendar.h b/xfa/fwl/basewidget/ifwl_monthcalendar.h
index 8f9ab9ae3e..8ac9c36f4d 100644
--- a/xfa/fwl/basewidget/ifwl_monthcalendar.h
+++ b/xfa/fwl/basewidget/ifwl_monthcalendar.h
@@ -97,8 +97,8 @@
 #define FWL_MCCAPACITY_December FWL_WGTCAPACITY_MAX + 23
 #define FWL_MCCAPACITY_Today FWL_WGTCAPACITY_MAX + 24
 #define FWL_EVENT_MCD_DATESELECTED L"FWL_EVENT_MCD_DateSelected"
-#define FWL_EVT_MCD_DateChanged L"FWL_EVENT_MCD_DateChanged"
 #define FWL_NOTEHASH_MCD_DATASELECTED 1085596932
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_MCD_DateChanged 54212227
 
 BEGIN_FWL_EVENT_DEF(CFWL_Event_McdDateSelected, FWL_NOTEHASH_MCD_DATASELECTED)
diff --git a/xfa/fwl/basewidget/ifwl_spinbutton.h b/xfa/fwl/basewidget/ifwl_spinbutton.h
index f68ab0f251..87f38b4d5f 100644
--- a/xfa/fwl/basewidget/ifwl_spinbutton.h
+++ b/xfa/fwl/basewidget/ifwl_spinbutton.h
@@ -22,7 +22,7 @@
 #define FWL_PARTSTATE_SPB_Disabled (3L << 0)
 #define FWL_WGTHITTEST_SPB_UpButton (FWL_WGTHITTEST_MAX + 1)
 #define FWL_WGTHITTEST_SPB_DownButton (FWL_WGTHITTEST_MAX + 2)
-#define FWL_EVT_SPB_Click L"FWL_EVENT_SPB_Click"
+// TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474
 #define FWL_EVTHASH_SPB_Click 2927651187
 
 BEGIN_FWL_EVENT_DEF(CFWL_EvtSpbClick, FWL_EVTHASH_SPB_Click)