Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: xfa/fwl/core/cfwl_datetimepicker.cpp

Issue 2530993002: Cleanup FWL Event and Message code. (Closed)
Patch Set: Review feedback Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fwl/core/cfwl_datetimepicker.cpp
diff --git a/xfa/fwl/core/cfwl_datetimepicker.cpp b/xfa/fwl/core/cfwl_datetimepicker.cpp
index 35b038d6cef4df4b3e5a242ead8c90a1260d5d6e..28f174c374c5f28cfa2f2ca24ce886de7fcf2a1b 100644
--- a/xfa/fwl/core/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/core/cfwl_datetimepicker.cpp
@@ -10,7 +10,7 @@
#include <utility>
#include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_evteditchanged.h"
+#include "xfa/fwl/core/cfwl_event.h"
#include "xfa/fwl/core/cfwl_evtselectchanged.h"
#include "xfa/fwl/core/cfwl_formproxy.h"
#include "xfa/fwl/core/cfwl_msgmouse.h"
@@ -192,7 +192,7 @@ void CFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) {
m_pEdit->SetText(wsText);
Repaint(&m_rtClient);
- CFWL_EvtEditChanged ev;
+ CFWL_Event ev(CFWL_Event::Type::EditChanged);
DispatchEvent(&ev);
}
@@ -347,8 +347,7 @@ void CFWL_DateTimePicker::ProcessSelChanged(int32_t iYear,
m_pEdit->Update();
Repaint(&m_rtClient);
- CFWL_EvtSelectChanged ev;
- ev.m_pSrcTarget = this;
+ CFWL_EvtSelectChanged ev(this);
ev.iYear = m_iYear;
ev.iMonth = m_iMonth;
ev.iDay = m_iDay;
@@ -399,9 +398,7 @@ void CFWL_DateTimePicker::DisForm_ShowMonthCalendar(bool bActivate) {
m_pMonthCal->SetStates(FWL_WGTSTATE_Invisible, !bActivate);
if (bActivate) {
- CFWL_MsgSetFocus msg;
- msg.m_pDstTarget = m_pMonthCal.get();
- msg.m_pSrcTarget = m_pEdit.get();
+ CFWL_MsgSetFocus msg(m_pEdit.get(), m_pMonthCal.get());
m_pEdit->GetDelegate()->OnProcessMessage(&msg);
}
@@ -520,14 +517,14 @@ void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) {
if (!pMessage)
return;
- switch (pMessage->GetClassID()) {
- case CFWL_MessageType::SetFocus:
+ switch (pMessage->GetType()) {
+ case CFWL_Message::Type::SetFocus:
OnFocusChanged(pMessage, true);
break;
- case CFWL_MessageType::KillFocus:
+ case CFWL_Message::Type::KillFocus:
OnFocusChanged(pMessage, false);
break;
- case CFWL_MessageType::Mouse: {
+ case CFWL_Message::Type::Mouse: {
CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
switch (pMouse->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -547,7 +544,7 @@ void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) {
}
break;
}
- case CFWL_MessageType::Key: {
+ case CFWL_Message::Type::Key: {
if (m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
m_pEdit->GetDelegate()->OnProcessMessage(pMessage);
return;

Powered by Google App Engine
This is Rietveld 408576698