6 files changed, 3 insertions, 30 deletions
diff --git a/xfa/fwl/core/cfwl_event.h b/xfa/fwl/core/cfwl_event.h
index b127603155..c0c3c3f373 100644
--- a/xfa/fwl/core/cfwl_event.h
+++ b/xfa/fwl/core/cfwl_event.h
@@ -21,11 +21,8 @@ enum class CFWL_EventType {
   CheckWord,
   Click,
   Close,
-  CloseUp,
   DrawItem,
-  DropDown,
   EditChanged,
-  HoverChanged,
   Key,
   KillFocus,
   Mouse,
diff --git a/xfa/fwl/core/ifwl_combobox.cpp b/xfa/fwl/core/ifwl_combobox.cpp
index 5221f773e5..c2f1c873ae 100644
--- a/xfa/fwl/core/ifwl_combobox.cpp
+++ b/xfa/fwl/core/ifwl_combobox.cpp
@@ -345,10 +345,6 @@ void IFWL_ComboBox::ShowDropList(bool bActivate) {
   if (!bActivate) {
     m_pComboBoxProxy->EndDoModal();
 
-    CFWL_EvtCmbCloseUp ev;
-    ev.m_pSrcTarget = this;
-    DispatchEvent(&ev);
-
     m_bLButtonDown = false;
     m_pListBox->SetNotifyOwner(true);
     SetFocus(true);
diff --git a/xfa/fwl/core/ifwl_combobox.h b/xfa/fwl/core/ifwl_combobox.h
index 065d947440..488e02addc 100644
--- a/xfa/fwl/core/ifwl_combobox.h
+++ b/xfa/fwl/core/ifwl_combobox.h
@@ -49,8 +49,6 @@ FWL_EVENT_DEF(CFWL_EvtCmbPreDropDown, CFWL_EventType::PreDropDown)
 
 FWL_EVENT_DEF(CFWL_EvtCmbPostDropDown, CFWL_EventType::PostDropDown)
 
-FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, CFWL_EventType::CloseUp)
-
 FWL_EVENT_DEF(CFWL_EvtCmbEditChanged,
               CFWL_EventType::EditChanged,
               int32_t nChangeType;
@@ -62,10 +60,6 @@ FWL_EVENT_DEF(CFWL_EvtCmbSelChanged,
               CFX_Int32Array iArraySels;
               bool bLButtonUp;)
 
-FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged,
-              CFWL_EventType::HoverChanged,
-              int32_t m_iCurHover;)
-
 FWL_EVENT_DEF(CFWL_EvtCmbDrawItem,
               CFWL_EventType::DrawItem,
               CFX_Graphics* m_pGraphics;
diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/ifwl_combolist.cpp
index be167be177..7f178fd1b7 100644
--- a/xfa/fwl/core/ifwl_combolist.cpp
+++ b/xfa/fwl/core/ifwl_combolist.cpp
@@ -171,12 +171,7 @@ void IFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
 
     IFWL_ListBoxDP* pData =
         static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
-    int32_t iSel = pData->GetItemIndex(this, hItem);
-    CFWL_EvtCmbHoverChanged event;
-    event.m_pSrcTarget = m_pOuter;
-    event.m_iCurHover = iSel;
-    DispatchEvent(&event);
-    ChangeSelected(iSel);
+    ChangeSelected(pData->GetItemIndex(this, hItem));
   } else if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
     IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
diff --git a/xfa/fwl/core/ifwl_datetimepicker.cpp b/xfa/fwl/core/ifwl_datetimepicker.cpp
index 1cd96c6925..074065b1e2 100644
--- a/xfa/fwl/core/ifwl_datetimepicker.cpp
+++ b/xfa/fwl/core/ifwl_datetimepicker.cpp
@@ -608,16 +608,11 @@ void IFWL_DateTimePicker::OnLButtonDown(CFWL_MsgMouse* pMsg) {
 
   if (IsMonthCalendarVisible()) {
     ShowMonthCalendar(false);
-    CFWL_Event_DtpCloseUp ev;
-    DispatchEvent(&ev);
     return;
   }
-
-  if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_TimeFormat)) {
+  if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_TimeFormat))
     ShowMonthCalendar(true);
-    CFWL_Event_DtpDropDown ev;
-    DispatchEvent(&ev);
-  }
+
   m_bLBtnDown = true;
   Repaint(&m_rtClient);
 }
diff --git a/xfa/fwl/core/ifwl_datetimepicker.h b/xfa/fwl/core/ifwl_datetimepicker.h
index b23fe88340..5a46bf58f5 100644
--- a/xfa/fwl/core/ifwl_datetimepicker.h
+++ b/xfa/fwl/core/ifwl_datetimepicker.h
@@ -34,10 +34,6 @@
 class IFWL_DateTimeEdit;
 class IFWL_FormProxy;
 
-FWL_EVENT_DEF(CFWL_Event_DtpDropDown, CFWL_EventType::DropDown)
-
-FWL_EVENT_DEF(CFWL_Event_DtpCloseUp, CFWL_EventType::CloseUp)
-
 FWL_EVENT_DEF(CFWL_Event_DtpEditChanged,
               CFWL_EventType::EditChanged,
               CFX_WideString m_wsText;)