| Index: xfa/fwl/cfwl_monthcalendar.h
|
| diff --git a/xfa/fwl/core/cfwl_monthcalendar.h b/xfa/fwl/cfwl_monthcalendar.h
|
| similarity index 93%
|
| rename from xfa/fwl/core/cfwl_monthcalendar.h
|
| rename to xfa/fwl/cfwl_monthcalendar.h
|
| index 7586a586f63798c9ecb7daf80b0b79e5ba89ba1b..0d5ce648b948118eff294a85fa9d94bd9f41d48f 100644
|
| --- a/xfa/fwl/core/cfwl_monthcalendar.h
|
| +++ b/xfa/fwl/cfwl_monthcalendar.h
|
| @@ -4,15 +4,15 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#ifndef XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
|
| -#define XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
|
| +#ifndef XFA_FWL_CFWL_MONTHCALENDAR_H_
|
| +#define XFA_FWL_CFWL_MONTHCALENDAR_H_
|
|
|
| #include <memory>
|
|
|
| #include "xfa/fgas/localization/fgas_datetime.h"
|
| -#include "xfa/fwl/core/cfwl_event.h"
|
| -#include "xfa/fwl/core/cfwl_widget.h"
|
| -#include "xfa/fwl/core/cfwl_widgetproperties.h"
|
| +#include "xfa/fwl/cfwl_event.h"
|
| +#include "xfa/fwl/cfwl_widget.h"
|
| +#include "xfa/fwl/cfwl_widgetproperties.h"
|
|
|
| #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0)
|
| #define FWL_STYLEEXT_MCD_NoToday (1L << 1)
|
| @@ -23,7 +23,7 @@
|
| #define FWL_ITEMSTATE_MCD_Selected (1L << 1)
|
| #define FWL_ITEMSTATE_MCD_Focused (1L << 2)
|
|
|
| -class CFWL_MsgMouse;
|
| +class CFWL_MessageMouse;
|
| class CFWL_Widget;
|
|
|
| class CFWL_MonthCalendar : public CFWL_Widget {
|
| @@ -158,11 +158,11 @@ class CFWL_MonthCalendar : public CFWL_Widget {
|
| CFX_WideString& wsToday);
|
| int32_t GetDayAtPoint(FX_FLOAT x, FX_FLOAT y);
|
| void GetDayRect(int32_t iDay, CFX_RectF& rtDay);
|
| - void OnLButtonDown(CFWL_MsgMouse* pMsg);
|
| - void OnLButtonUp(CFWL_MsgMouse* pMsg);
|
| - void DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg);
|
| - void OnMouseMove(CFWL_MsgMouse* pMsg);
|
| - void OnMouseLeave(CFWL_MsgMouse* pMsg);
|
| + void OnLButtonDown(CFWL_MessageMouse* pMsg);
|
| + void OnLButtonUp(CFWL_MessageMouse* pMsg);
|
| + void DisForm_OnLButtonUp(CFWL_MessageMouse* pMsg);
|
| + void OnMouseMove(CFWL_MessageMouse* pMsg);
|
| + void OnMouseLeave(CFWL_MessageMouse* pMsg);
|
|
|
| bool m_bInitialized;
|
| CFX_RectF m_rtHead;
|
| @@ -224,4 +224,4 @@ class CFWL_MonthCalendar : public CFWL_Widget {
|
| bool m_bFlag;
|
| };
|
|
|
| -#endif // XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
|
| +#endif // XFA_FWL_CFWL_MONTHCALENDAR_H_
|
|
|