| Index: xfa/fwl/basewidget/fwl_monthcalendarimp.cpp
|
| diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp
|
| index d55144a805cc5b5c7e378d2a1dda32a97c7c6189..fd1f0ed82225df53d006445a151792658259802c 100644
|
| --- a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp
|
| +++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp
|
| @@ -922,25 +922,28 @@ FX_BOOL CFWL_MonthCalendarImp::GetDayRect(int32_t iDay, CFX_RectF& rtDay) {
|
| rtDay = pDateInfo->rect;
|
| return TRUE;
|
| }
|
| +
|
| CFWL_MonthCalendarImpDelegate::CFWL_MonthCalendarImpDelegate(
|
| CFWL_MonthCalendarImp* pOwner)
|
| : m_pOwner(pOwner) {}
|
| +
|
| int32_t CFWL_MonthCalendarImpDelegate::OnProcessMessage(
|
| CFWL_Message* pMessage) {
|
| if (!pMessage)
|
| return 0;
|
| - uint32_t dwMsgCode = pMessage->GetClassID();
|
| +
|
| + CFWL_MessageType dwMsgCode = pMessage->GetClassID();
|
| int32_t iRet = 1;
|
| switch (dwMsgCode) {
|
| - case FWL_MSGHASH_SetFocus:
|
| - case FWL_MSGHASH_KillFocus: {
|
| - OnFocusChanged(pMessage, dwMsgCode == FWL_MSGHASH_SetFocus);
|
| + case CFWL_MessageType::SetFocus:
|
| + case CFWL_MessageType::KillFocus: {
|
| + OnFocusChanged(pMessage, dwMsgCode == CFWL_MessageType::SetFocus);
|
| break;
|
| }
|
| - case FWL_MSGHASH_Key: {
|
| + case CFWL_MessageType::Key: {
|
| break;
|
| }
|
| - case FWL_MSGHASH_Mouse: {
|
| + case CFWL_MessageType::Mouse: {
|
| CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
|
| uint32_t dwCmd = pMouse->m_dwCmd;
|
| switch (dwCmd) {
|
| @@ -960,7 +963,8 @@ int32_t CFWL_MonthCalendarImpDelegate::OnProcessMessage(
|
| OnMouseLeave(pMouse);
|
| break;
|
| }
|
| - default: { break; }
|
| + default:
|
| + break;
|
| }
|
| break;
|
| }
|
| @@ -972,6 +976,7 @@ int32_t CFWL_MonthCalendarImpDelegate::OnProcessMessage(
|
| CFWL_WidgetImpDelegate::OnProcessMessage(pMessage);
|
| return iRet;
|
| }
|
| +
|
| FWL_ERR CFWL_MonthCalendarImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
|
| const CFX_Matrix* pMatrix) {
|
| return m_pOwner->DrawWidget(pGraphics, pMatrix);
|
|
|