Merge the CFWL_*Imp classes into the IFWL_* classes.

xfa/fwl/core/ifwl_datetimepicker.cpp

Index: xfa/fwl/core/ifwl_datetimepicker.cpp
diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp b/xfa/fwl/core/ifwl_datetimepicker.cpp
similarity index 55%
rename from xfa/fwl/basewidget/fwl_datetimepickerimp.cpp
rename to xfa/fwl/core/ifwl_datetimepicker.cpp
index d02f8483ddfcbaeeb9956cd914dc3ae03ff6d8e4..ce5f28bf087d38c9d745f238435af8c8bc9fd40f 100644
--- a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp
+++ b/xfa/fwl/core/ifwl_datetimepicker.cpp
@@ -4,18 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/basewidget/fwl_datetimepickerimp.h"
+#include "xfa/fwl/core/ifwl_datetimepicker.h"
 
-#include "xfa/fwl/basewidget/fwl_editimp.h"
-#include "xfa/fwl/basewidget/fwl_formproxyimp.h"
-#include "xfa/fwl/basewidget/fwl_monthcalendarimp.h"
-#include "xfa/fwl/basewidget/ifwl_spinbutton.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/fwl_formimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/ifwl_datetimecalendar.h"
+#include "xfa/fwl/core/ifwl_datetimeedit.h"
+#include "xfa/fwl/core/ifwl_formproxy.h"
+#include "xfa/fwl/core/ifwl_spinbutton.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 namespace {
@@ -29,399 +27,13 @@ const int kDateTimePickerHeight = 20;
 IFWL_DateTimePicker* IFWL_DateTimePicker::Create(
     const CFWL_WidgetImpProperties& properties,
     IFWL_Widget* pOuter) {
-  IFWL_DateTimePicker* pDateTimePicker = new IFWL_DateTimePicker;
-  CFWL_DateTimePickerImp* pDateTimePickerImpl =
-      new CFWL_DateTimePickerImp(properties, pOuter);
-  pDateTimePicker->SetImpl(pDateTimePickerImpl);
-  pDateTimePickerImpl->SetInterface(pDateTimePicker);
-  return pDateTimePicker;
+  return new IFWL_DateTimePicker(properties, pOuter);
 }
 
-// Static
-IFWL_DateTimeForm* IFWL_DateTimeForm::Create(
-    const CFWL_WidgetImpProperties& properties,
-    IFWL_Widget* pOuter) {
-  IFWL_DateTimeForm* pDateTimeForm = new IFWL_DateTimeForm;
-  CFWL_FormProxyImp* pFormProxyImpl = new CFWL_FormProxyImp(properties, pOuter);
-  pDateTimeForm->SetImpl(pFormProxyImpl);
-  pFormProxyImpl->SetInterface(pDateTimeForm);
-  return pDateTimeForm;
-}
-
-// static
-IFWL_DateTimeCalender* IFWL_DateTimeCalender::Create(
-    const CFWL_WidgetImpProperties& properties,
-    IFWL_Widget* pOuter) {
-  IFWL_DateTimeCalender* pDateTimeCalendar = new IFWL_DateTimeCalender;
-  CFWL_DateTimeCalendar* pDateTimeCalendarImpl =
-      new CFWL_DateTimeCalendar(properties, pOuter);
-  pDateTimeCalendar->SetImpl(pDateTimeCalendarImpl);
-  pDateTimeCalendarImpl->SetInterface(pDateTimeCalendar);
-  return pDateTimeCalendar;
-}
-
-// static
-IFWL_DateTimeEdit* IFWL_DateTimeEdit::Create(
-    const CFWL_WidgetImpProperties& properties,
-    IFWL_Widget* pOuter) {
-  IFWL_DateTimeEdit* pDateTimeEdit = new IFWL_DateTimeEdit;
-  CFWL_DateTimeEdit* pDateTimeEditImpl =
-      new CFWL_DateTimeEdit(properties, pOuter);
-  pDateTimeEdit->SetImpl(pDateTimeEditImpl);
-  pDateTimeEditImpl->SetInterface(pDateTimeEdit);
-  return pDateTimeEdit;
-}
-
-IFWL_DateTimePicker::IFWL_DateTimePicker() {}
-int32_t IFWL_DateTimePicker::CountSelRanges() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
-      ->GetDataTimeEdit()
-      ->CountSelRanges();
-}
-int32_t IFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t& nStart) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
-      ->GetDataTimeEdit()
-      ->GetSelRange(nIndex, nStart);
-}
-FWL_Error IFWL_DateTimePicker::GetCurSel(int32_t& iYear,
-                                         int32_t& iMonth,
-                                         int32_t& iDay) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
-      ->GetCurSel(iYear, iMonth, iDay);
-}
-FWL_Error IFWL_DateTimePicker::SetCurSel(int32_t iYear,
-                                         int32_t iMonth,
-                                         int32_t iDay) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
-      ->SetCurSel(iYear, iMonth, iDay);
-}
-FWL_Error IFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->SetEditText(wsText);
-}
-FWL_Error IFWL_DateTimePicker::GetEditText(CFX_WideString& wsText,
-                                           int32_t nStart,
-                                           int32_t nCount) const {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
-      ->GetEditText(wsText, nStart, nCount);
-}
-FX_BOOL IFWL_DateTimePicker::CanUndo() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->CanUndo();
-}
-FX_BOOL IFWL_DateTimePicker::CanRedo() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->CanRedo();
-}
-FX_BOOL IFWL_DateTimePicker::Undo() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->Undo();
-}
-FX_BOOL IFWL_DateTimePicker::Redo() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->Redo();
-}
-FX_BOOL IFWL_DateTimePicker::CanCopy() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->CanCopy();
-}
-FX_BOOL IFWL_DateTimePicker::CanCut() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->CanCut();
-}
-FX_BOOL IFWL_DateTimePicker::CanSelectAll() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->CanSelectAll();
-}
-FX_BOOL IFWL_DateTimePicker::Copy(CFX_WideString& wsCopy) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->Copy(wsCopy);
-}
-FX_BOOL IFWL_DateTimePicker::Cut(CFX_WideString& wsCut) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->Cut(wsCut);
-}
-FX_BOOL IFWL_DateTimePicker::Paste(const CFX_WideString& wsPaste) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->Paste(wsPaste);
-}
-FX_BOOL IFWL_DateTimePicker::SelectAll() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->SelectAll();
-}
-FX_BOOL IFWL_DateTimePicker::Delete() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->Delete();
-}
-FX_BOOL IFWL_DateTimePicker::DeSelect() {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->DeSelect();
-}
-FWL_Error IFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->GetBBox(rect);
-}
-FWL_Error IFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->SetEditLimit(nLimit);
-}
-FWL_Error IFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded,
-                                                  uint32_t dwStylesExRemoved) {
-  return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
-      ->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved);
-}
-CFWL_DateTimeEdit::CFWL_DateTimeEdit(const CFWL_WidgetImpProperties& properties,
-                                     IFWL_Widget* pOuter)
-    : CFWL_EditImp(properties, pOuter) {}
-FWL_Error CFWL_DateTimeEdit::Initialize() {
-  m_pDelegate = new CFWL_DateTimeEditImpDelegate(this);
-  if (CFWL_EditImp::Initialize() != FWL_Error::Succeeded)
-    return FWL_Error::Indefinite;
-  return FWL_Error::Succeeded;
-}
-FWL_Error CFWL_DateTimeEdit::Finalize() {
-  delete m_pDelegate;
-  m_pDelegate = nullptr;
-  return CFWL_EditImp::Finalize();
-}
-
-CFWL_DateTimeEditImpDelegate::CFWL_DateTimeEditImpDelegate(
-    CFWL_DateTimeEdit* pOwner)
-    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {}
-
-void CFWL_DateTimeEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
-  if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
-    DisForm_OnProcessMessage(pMessage);
-    return;
-  }
-
-  CFWL_MessageType dwHashCode = pMessage->GetClassID();
-  if (dwHashCode == CFWL_MessageType::SetFocus ||
-      dwHashCode == CFWL_MessageType::KillFocus) {
-    IFWL_Widget* pOuter = m_pOwner->GetOuter();
-    IFWL_WidgetDelegate* pDelegate = pOuter->SetDelegate(nullptr);
-    pDelegate->OnProcessMessage(pMessage);
-  }
-}
-
-void CFWL_DateTimeEditImpDelegate::DisForm_OnProcessMessage(
-    CFWL_Message* pMessage) {
-  CFWL_MessageType dwHashCode = pMessage->GetClassID();
-  if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
-    if (dwHashCode == CFWL_MessageType::Mouse) {
-      CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
-      if (pMouse->m_dwCmd == FWL_MouseCommand::LeftButtonDown ||
-          pMouse->m_dwCmd == FWL_MouseCommand::RightButtonDown) {
-        if ((m_pOwner->m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0) {
-          m_pOwner->m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
-        }
-        CFWL_DateTimePickerImp* pDateTime =
-            static_cast<CFWL_DateTimePickerImp*>(m_pOwner->m_pOuter->GetImpl());
-        if (pDateTime->IsMonthCalendarShowed()) {
-          CFX_RectF rtInvalidate;
-          pDateTime->GetWidgetRect(rtInvalidate);
-          pDateTime->ShowMonthCalendar(FALSE);
-          rtInvalidate.Offset(-rtInvalidate.left, -rtInvalidate.top);
-          pDateTime->Repaint(&rtInvalidate);
-        }
-      }
-    }
-  }
-  CFWL_EditImpDelegate::OnProcessMessage(pMessage);
-}
-
-CFWL_DateTimeCalendar::CFWL_DateTimeCalendar(
-    const CFWL_WidgetImpProperties& properties,
-    IFWL_Widget* pOuter)
-    : CFWL_MonthCalendarImp(properties, pOuter) {}
-FWL_Error CFWL_DateTimeCalendar::Initialize() {
-  if (CFWL_MonthCalendarImp::Initialize() != FWL_Error::Succeeded)
-    return FWL_Error::Indefinite;
-  delete m_pDelegate;
-  m_pDelegate = new CFWL_DateTimeCalendarImpDelegate(this);
-  return FWL_Error::Succeeded;
-}
-FWL_Error CFWL_DateTimeCalendar::Finalize() {
-  delete m_pDelegate;
-  m_pDelegate = nullptr;
-  return CFWL_MonthCalendarImp::Finalize();
-}
-
-CFWL_DateTimeCalendarImpDelegate::CFWL_DateTimeCalendarImpDelegate(
-    CFWL_DateTimeCalendar* pOwner)
-    : CFWL_MonthCalendarImpDelegate(pOwner), m_pOwner(pOwner) {
-  m_bFlag = FALSE;
-}
-
-void CFWL_DateTimeCalendarImpDelegate::OnProcessMessage(
-    CFWL_Message* pMessage) {
-  CFWL_MessageType dwCode = pMessage->GetClassID();
-  if (dwCode == CFWL_MessageType::SetFocus ||
-      dwCode == CFWL_MessageType::KillFocus) {
-    IFWL_Widget* pOuter = m_pOwner->GetOuter();
-    IFWL_WidgetDelegate* pDelegate = pOuter->SetDelegate(nullptr);
-    pDelegate->OnProcessMessage(pMessage);
-    return;
-  }
-  if (dwCode == CFWL_MessageType::Mouse) {
-    CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
-    if (pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown)
-      OnLButtonDownEx(pMsg);
-    else if (pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonUp)
-      OnLButtonUpEx(pMsg);
-    return;
-  }
-  CFWL_MonthCalendarImpDelegate::OnProcessMessage(pMessage);
-}
-
-void CFWL_DateTimeCalendarImpDelegate::OnLButtonDownEx(CFWL_MsgMouse* pMsg) {
-  if (m_pOwner->m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    m_pOwner->m_iLBtnPartStates = CFWL_PartState_Pressed;
-    m_pOwner->PrevMonth();
-    m_pOwner->Repaint(&m_pOwner->m_rtClient);
-  } else if (m_pOwner->m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    m_pOwner->m_iRBtnPartStates |= CFWL_PartState_Pressed;
-    m_pOwner->NextMonth();
-    m_pOwner->Repaint(&m_pOwner->m_rtClient);
-  } else if (m_pOwner->m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    if ((m_pOwner->m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_NoToday) ==
-        0) {
-      m_pOwner->JumpToToday();
-      m_pOwner->Repaint(&m_pOwner->m_rtClient);
-    }
-  } else {
-    IFWL_DateTimePicker* pIPicker =
-        static_cast<IFWL_DateTimePicker*>(m_pOwner->m_pOuter);
-    CFWL_DateTimePickerImp* pPicker =
-        static_cast<CFWL_DateTimePickerImp*>(pIPicker->GetImpl());
-    if (pPicker->IsMonthCalendarShowed()) {
-      m_bFlag = 1;
-    }
-  }
-}
-void CFWL_DateTimeCalendarImpDelegate::OnLButtonUpEx(CFWL_MsgMouse* pMsg) {
-  if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
-    return DisForm_OnLButtonUpEx(pMsg);
-  }
-  if (m_pOwner->m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    m_pOwner->m_iLBtnPartStates = 0;
-    m_pOwner->Repaint(&m_pOwner->m_rtLBtn);
-    return;
-  }
-  if (m_pOwner->m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    m_pOwner->m_iRBtnPartStates = 0;
-    m_pOwner->Repaint(&m_pOwner->m_rtRBtn);
-    return;
-  }
-  if (m_pOwner->m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    return;
-  }
-  int32_t iOldSel = 0;
-  if (m_pOwner->m_arrSelDays.GetSize() > 0) {
-    iOldSel = m_pOwner->m_arrSelDays[0];
-  }
-  int32_t iCurSel = m_pOwner->GetDayAtPoint(pMsg->m_fx, pMsg->m_fy);
-  CFX_RectF rt;
-  IFWL_DateTimePicker* pIPicker =
-      static_cast<IFWL_DateTimePicker*>(m_pOwner->m_pOuter);
-  CFWL_DateTimePickerImp* pPicker =
-      static_cast<CFWL_DateTimePickerImp*>(pIPicker->GetImpl());
-  pPicker->m_pForm->GetWidgetRect(rt);
-  rt.Set(0, 0, rt.width, rt.height);
-  if (iCurSel > 0) {
-    FWL_DATEINFO* lpDatesInfo = m_pOwner->m_arrDates.GetAt(iCurSel - 1);
-    CFX_RectF rtInvalidate(lpDatesInfo->rect);
-    if (iOldSel > 0 && iOldSel <= m_pOwner->m_arrDates.GetSize()) {
-      lpDatesInfo = m_pOwner->m_arrDates.GetAt(iOldSel - 1);
-      rtInvalidate.Union(lpDatesInfo->rect);
-    }
-    m_pOwner->AddSelDay(iCurSel);
-    if (!m_pOwner->m_pOuter)
-      return;
-    pPicker->ProcessSelChanged(m_pOwner->m_iCurYear, m_pOwner->m_iCurMonth,
-                               iCurSel);
-    pPicker->ShowMonthCalendar(FALSE);
-  } else if (m_bFlag && (!rt.Contains(pMsg->m_fx, pMsg->m_fy))) {
-    pPicker->ShowMonthCalendar(FALSE);
-  }
-  m_bFlag = 0;
-}
-void CFWL_DateTimeCalendarImpDelegate::OnMouseMoveEx(CFWL_MsgMouse* pMsg) {
-  if (m_pOwner->m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect) {
-    return;
-  }
-  FX_BOOL bRepaint = FALSE;
-  CFX_RectF rtInvalidate;
-  rtInvalidate.Set(0, 0, 0, 0);
-  if (m_pOwner->m_rtDates.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    int32_t iHover = m_pOwner->GetDayAtPoint(pMsg->m_fx, pMsg->m_fy);
-    bRepaint = m_pOwner->m_iHovered != iHover;
-    if (bRepaint) {
-      if (m_pOwner->m_iHovered > 0) {
-        m_pOwner->GetDayRect(m_pOwner->m_iHovered, rtInvalidate);
-      }
-      if (iHover > 0) {
-        CFX_RectF rtDay;
-        m_pOwner->GetDayRect(iHover, rtDay);
-        if (rtInvalidate.IsEmpty()) {
-          rtInvalidate = rtDay;
-        } else {
-          rtInvalidate.Union(rtDay);
-        }
-      }
-    }
-    m_pOwner->m_iHovered = iHover;
-    CFWL_Event_DtpHoverChanged ev;
-    ev.hoverday = iHover;
-    m_pOwner->DispatchEvent(&ev);
-  } else {
-    bRepaint = m_pOwner->m_iHovered > 0;
-    if (bRepaint) {
-      m_pOwner->GetDayRect(m_pOwner->m_iHovered, rtInvalidate);
-    }
-    m_pOwner->m_iHovered = -1;
-  }
-  if (bRepaint && !rtInvalidate.IsEmpty()) {
-    m_pOwner->Repaint(&rtInvalidate);
-  }
-}
-
-void CFWL_DateTimeCalendarImpDelegate::DisForm_OnProcessMessage(
-    CFWL_Message* pMessage) {
-  if (pMessage->GetClassID() == CFWL_MessageType::Mouse) {
-    CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
-    if (pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonUp) {
-      DisForm_OnLButtonUpEx(pMsg);
-      return;
-    }
-  }
-  CFWL_MonthCalendarImpDelegate::OnProcessMessage(pMessage);
-}
-
-void CFWL_DateTimeCalendarImpDelegate::DisForm_OnLButtonUpEx(
-    CFWL_MsgMouse* pMsg) {
-  if (m_pOwner->m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    m_pOwner->m_iLBtnPartStates = 0;
-    m_pOwner->Repaint(&(m_pOwner->m_rtLBtn));
-    return;
-  }
-  if (m_pOwner->m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    m_pOwner->m_iRBtnPartStates = 0;
-    m_pOwner->Repaint(&(m_pOwner->m_rtRBtn));
-    return;
-  }
-  if (m_pOwner->m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    return;
-  }
-  int32_t iOldSel = 0;
-  if (m_pOwner->m_arrSelDays.GetSize() > 0) {
-    iOldSel = m_pOwner->m_arrSelDays[0];
-  }
-  int32_t iCurSel = m_pOwner->GetDayAtPoint(pMsg->m_fx, pMsg->m_fy);
-  if (iCurSel > 0) {
-    FWL_DATEINFO* lpDatesInfo = m_pOwner->m_arrDates.GetAt(iCurSel - 1);
-    CFX_RectF rtInvalidate(lpDatesInfo->rect);
-    if (iOldSel > 0 && iOldSel <= m_pOwner->m_arrDates.GetSize()) {
-      lpDatesInfo = m_pOwner->m_arrDates.GetAt(iOldSel - 1);
-      rtInvalidate.Union(lpDatesInfo->rect);
-    }
-    m_pOwner->AddSelDay(iCurSel);
-    CFWL_DateTimePickerImp* pDateTime =
-        static_cast<CFWL_DateTimePickerImp*>(m_pOwner->m_pOuter->GetImpl());
-    pDateTime->ProcessSelChanged(m_pOwner->m_iCurYear, m_pOwner->m_iCurMonth,
-                                 iCurSel);
-    pDateTime->ShowMonthCalendar(FALSE);
-  }
-}
-
-CFWL_DateTimePickerImp::CFWL_DateTimePickerImp(
+IFWL_DateTimePicker::IFWL_DateTimePicker(
     const CFWL_WidgetImpProperties& properties,
     IFWL_Widget* pOuter)
-    : CFWL_WidgetImp(properties, pOuter),
+    : IFWL_Widget(properties, pOuter),
       m_iBtnState(1),
       m_iYear(-1),
       m_iMonth(-1),
@@ -430,19 +42,19 @@ CFWL_DateTimePickerImp::CFWL_DateTimePickerImp(
   m_rtBtn.Set(0, 0, 0, 0);
 }
 
-CFWL_DateTimePickerImp::~CFWL_DateTimePickerImp() {}
+IFWL_DateTimePicker::~IFWL_DateTimePicker() {}
 
-FWL_Error CFWL_DateTimePickerImp::GetClassName(CFX_WideString& wsClass) const {
+FWL_Error IFWL_DateTimePicker::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_DateTimePicker;
   return FWL_Error::Succeeded;
 }
 
-FWL_Type CFWL_DateTimePickerImp::GetClassID() const {
+FWL_Type IFWL_DateTimePicker::GetClassID() const {
   return FWL_Type::DateTimePicker;
 }
 
-FWL_Error CFWL_DateTimePickerImp::Initialize() {
-  if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded)
+FWL_Error IFWL_DateTimePicker::Initialize() {
+  if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
     return FWL_Error::Indefinite;
 
   m_pDelegate = new CFWL_DateTimePickerImpDelegate(this);
@@ -451,25 +63,25 @@ FWL_Error CFWL_DateTimePickerImp::Initialize() {
   propMonth.m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
   propMonth.m_dwStates = FWL_WGTSTATE_Invisible;
   propMonth.m_pDataProvider = &m_MonthCalendarDP;
-  propMonth.m_pParent = m_pInterface;
+  propMonth.m_pParent = this;
   propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider;
-  m_pMonthCal.reset(IFWL_DateTimeCalender::Create(propMonth, m_pInterface));
+  m_pMonthCal.reset(IFWL_DateTimeCalendar::Create(propMonth, this));
   m_pMonthCal->Initialize();
   CFX_RectF rtMonthCal;
   m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE);
   rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtMonthCal);
   CFWL_WidgetImpProperties propEdit;
-  propEdit.m_pParent = m_pInterface;
+  propEdit.m_pParent = this;
   propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
-  m_pEdit.reset(IFWL_DateTimeEdit::Create(propEdit, m_pInterface));
+  m_pEdit.reset(IFWL_DateTimeEdit::Create(propEdit, this));
   m_pEdit->Initialize();
   RegisterEventTarget(m_pMonthCal.get());
   RegisterEventTarget(m_pEdit.get());
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_DateTimePickerImp::Finalize() {
+FWL_Error IFWL_DateTimePicker::Finalize() {
   if (m_pEdit) {
     m_pEdit->Finalize();
   }
@@ -482,22 +94,24 @@ FWL_Error CFWL_DateTimePickerImp::Finalize() {
   UnregisterEventTarget();
   delete m_pDelegate;
   m_pDelegate = nullptr;
-  return CFWL_WidgetImp::Finalize();
+  return IFWL_Widget::Finalize();
 }
-FWL_Error CFWL_DateTimePickerImp::GetWidgetRect(CFX_RectF& rect,
-                                                FX_BOOL bAutoSize) {
+
+FWL_Error IFWL_DateTimePicker::GetWidgetRect(CFX_RectF& rect,
+                                             FX_BOOL bAutoSize) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_GetWidgetRect(rect, bAutoSize);
   }
   if (bAutoSize) {
     rect.Set(0, 0, kDateTimePickerWidth, kDateTimePickerHeight);
-    CFWL_WidgetImp::GetWidgetRect(rect, TRUE);
+    IFWL_Widget::GetWidgetRect(rect, TRUE);
   } else {
     rect = m_pProperties->m_rtWidget;
   }
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::Update() {
+
+FWL_Error IFWL_DateTimePicker::Update() {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_Update();
   }
@@ -528,7 +142,7 @@ FWL_Error CFWL_DateTimePickerImp::Update() {
   if (m_pProperties->m_pDataProvider) {
     IFWL_DateTimePickerDP* pData =
         static_cast<IFWL_DateTimePickerDP*>(m_pProperties->m_pDataProvider);
-    pData->GetToday(m_pInterface, m_MonthCalendarDP.m_iCurYear,
+    pData->GetToday(this, m_MonthCalendarDP.m_iCurYear,
                     m_MonthCalendarDP.m_iCurMonth, m_MonthCalendarDP.m_iCurDay);
   }
   CFX_RectF rtMonthCal;
@@ -540,7 +154,16 @@ FWL_Error CFWL_DateTimePickerImp::Update() {
   m_pMonthCal->Update();
   return FWL_Error::Succeeded;
 }
-FWL_WidgetHit CFWL_DateTimePickerImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
+
+int32_t IFWL_DateTimePicker::CountSelRanges() {
+  return GetDataTimeEdit()->CountSelRanges();
+}
+
+int32_t IFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t& nStart) {
+  return GetDataTimeEdit()->GetSelRange(nIndex, nStart);
+}
+
+FWL_WidgetHit IFWL_DateTimePicker::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_HitTest(fx, fy);
   if (m_rtClient.Contains(fx, fy))
@@ -553,8 +176,9 @@ FWL_WidgetHit CFWL_DateTimePickerImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   }
   return FWL_WidgetHit::Unknown;
 }
-FWL_Error CFWL_DateTimePickerImp::DrawWidget(CFX_Graphics* pGraphics,
-                                             const CFX_Matrix* pMatrix) {
+
+FWL_Error IFWL_DateTimePicker::DrawWidget(CFX_Graphics* pGraphics,
+                                          const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return FWL_Error::Indefinite;
   if (!m_pProperties->m_pThemeProvider)
@@ -574,22 +198,25 @@ FWL_Error CFWL_DateTimePickerImp::DrawWidget(CFX_Graphics* pGraphics,
   }
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::SetThemeProvider(IFWL_ThemeProvider* pTP) {
+
+FWL_Error IFWL_DateTimePicker::SetThemeProvider(IFWL_ThemeProvider* pTP) {
   m_pProperties->m_pThemeProvider = pTP;
   m_pMonthCal->SetThemeProvider(pTP);
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::GetCurSel(int32_t& iYear,
-                                            int32_t& iMonth,
-                                            int32_t& iDay) {
+
+FWL_Error IFWL_DateTimePicker::GetCurSel(int32_t& iYear,
+                                         int32_t& iMonth,
+                                         int32_t& iDay) {
   iYear = m_iYear;
   iMonth = m_iMonth;
   iDay = m_iDay;
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::SetCurSel(int32_t iYear,
-                                            int32_t iMonth,
-                                            int32_t iDay) {
+
+FWL_Error IFWL_DateTimePicker::SetCurSel(int32_t iYear,
+                                         int32_t iMonth,
+                                         int32_t iDay) {
   if (iYear <= 0 || iYear >= 3000)
     return FWL_Error::Indefinite;
   if (iMonth <= 0 || iMonth >= 13)
@@ -603,7 +230,7 @@ FWL_Error CFWL_DateTimePickerImp::SetCurSel(int32_t iYear,
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_DateTimePickerImp::SetEditText(const CFX_WideString& wsText) {
+FWL_Error IFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) {
   if (!m_pEdit)
     return FWL_Error::Indefinite;
 
@@ -615,59 +242,73 @@ FWL_Error CFWL_DateTimePickerImp::SetEditText(const CFX_WideString& wsText) {
   return iRet;
 }
 
-FWL_Error CFWL_DateTimePickerImp::GetEditText(CFX_WideString& wsText,
-                                              int32_t nStart,
-                                              int32_t nCount) const {
+FWL_Error IFWL_DateTimePicker::GetEditText(CFX_WideString& wsText,
+                                           int32_t nStart,
+                                           int32_t nCount) const {
   if (m_pEdit) {
     return m_pEdit->GetText(wsText, nStart, nCount);
   }
   return FWL_Error::Indefinite;
 }
-FX_BOOL CFWL_DateTimePickerImp::CanUndo() {
+
+FX_BOOL IFWL_DateTimePicker::CanUndo() {
   return m_pEdit->CanUndo();
 }
-FX_BOOL CFWL_DateTimePickerImp::CanRedo() {
+
+FX_BOOL IFWL_DateTimePicker::CanRedo() {
   return m_pEdit->CanRedo();
 }
-FX_BOOL CFWL_DateTimePickerImp::Undo() {
+
+FX_BOOL IFWL_DateTimePicker::Undo() {
   return m_pEdit->Undo();
 }
-FX_BOOL CFWL_DateTimePickerImp::Redo() {
+
+FX_BOOL IFWL_DateTimePicker::Redo() {
   return m_pEdit->Redo();
 }
-FX_BOOL CFWL_DateTimePickerImp::CanCopy() {
+
+FX_BOOL IFWL_DateTimePicker::CanCopy() {
   int32_t nCount = m_pEdit->CountSelRanges();
   return nCount > 0;
 }
-FX_BOOL CFWL_DateTimePickerImp::CanCut() {
+
+FX_BOOL IFWL_DateTimePicker::CanCut() {
   if (m_pEdit->GetStylesEx() & FWL_STYLEEXT_EDT_ReadOnly) {
     return FALSE;
   }
   int32_t nCount = m_pEdit->CountSelRanges();
   return nCount > 0;
 }
-FX_BOOL CFWL_DateTimePickerImp::CanSelectAll() {
+
+FX_BOOL IFWL_DateTimePicker::CanSelectAll() {
   return m_pEdit->GetTextLength() > 0;
 }
-FX_BOOL CFWL_DateTimePickerImp::Copy(CFX_WideString& wsCopy) {
+
+FX_BOOL IFWL_DateTimePicker::Copy(CFX_WideString& wsCopy) {
   return m_pEdit->Copy(wsCopy);
 }
-FX_BOOL CFWL_DateTimePickerImp::Cut(CFX_WideString& wsCut) {
+
+FX_BOOL IFWL_DateTimePicker::Cut(CFX_WideString& wsCut) {
   return m_pEdit->Cut(wsCut);
 }
-FX_BOOL CFWL_DateTimePickerImp::Paste(const CFX_WideString& wsPaste) {
+
+FX_BOOL IFWL_DateTimePicker::Paste(const CFX_WideString& wsPaste) {
   return m_pEdit->Paste(wsPaste);
 }
-FX_BOOL CFWL_DateTimePickerImp::SelectAll() {
+
+FX_BOOL IFWL_DateTimePicker::SelectAll() {
   return m_pEdit->AddSelRange(0) == FWL_Error::Succeeded;
 }
-FX_BOOL CFWL_DateTimePickerImp::Delete() {
+
+FX_BOOL IFWL_DateTimePicker::Delete() {
   return m_pEdit->ClearText() == FWL_Error::Succeeded;
 }
-FX_BOOL CFWL_DateTimePickerImp::DeSelect() {
+
+FX_BOOL IFWL_DateTimePicker::DeSelect() {
   return m_pEdit->ClearSelections() == FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::GetBBox(CFX_RectF& rect) {
+
+FWL_Error IFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_GetBBox(rect);
   }
@@ -681,28 +322,30 @@ FWL_Error CFWL_DateTimePickerImp::GetBBox(CFX_RectF& rect) {
   }
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::SetEditLimit(int32_t nLimit) {
+
+FWL_Error IFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {
   return m_pEdit->SetLimit(nLimit);
 }
-FWL_Error CFWL_DateTimePickerImp::ModifyEditStylesEx(
-    uint32_t dwStylesExAdded,
-    uint32_t dwStylesExRemoved) {
+
+FWL_Error IFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded,
+                                                  uint32_t dwStylesExRemoved) {
   return m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
 }
-void CFWL_DateTimePickerImp::DrawDropDownButton(CFX_Graphics* pGraphics,
-                                                IFWL_ThemeProvider* pTheme,
-                                                const CFX_Matrix* pMatrix) {
+
+void IFWL_DateTimePicker::DrawDropDownButton(CFX_Graphics* pGraphics,
+                                             IFWL_ThemeProvider* pTheme,
+                                             const CFX_Matrix* pMatrix) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_Spin) ==
       FWL_STYLEEXT_DTP_Spin) {
     CFWL_WidgetImpProperties prop;
     prop.m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert;
-    prop.m_pParent = m_pInterface;
+    prop.m_pParent = this;
     prop.m_rtWidget = m_rtBtn;
-    IFWL_SpinButton* pSpin = IFWL_SpinButton::Create(prop, m_pInterface);
+    IFWL_SpinButton* pSpin = IFWL_SpinButton::Create(prop, this);
     pSpin->Initialize();
   } else {
     CFWL_ThemeBackground param;
-    param.m_pWidget = m_pInterface;
+    param.m_pWidget = this;
     param.m_iPart = CFWL_Part::DropDownButton;
     param.m_dwStates = m_iBtnState;
     param.m_pGraphics = pGraphics;
@@ -713,10 +356,11 @@ void CFWL_DateTimePickerImp::DrawDropDownButton(CFX_Graphics* pGraphics,
     pTheme->DrawBackground(&param);
   }
 }
-void CFWL_DateTimePickerImp::FormatDateString(int32_t iYear,
-                                              int32_t iMonth,
-                                              int32_t iDay,
-                                              CFX_WideString& wsText) {
+
+void IFWL_DateTimePicker::FormatDateString(int32_t iYear,
+                                           int32_t iMonth,
+                                           int32_t iDay,
+                                           CFX_WideString& wsText) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat) ==
       FWL_STYLEEXT_DTP_ShortDateFormat) {
     wsText.Format(L"%d-%d-%d", iYear, iMonth, iDay);
@@ -727,7 +371,8 @@ void CFWL_DateTimePickerImp::FormatDateString(int32_t iYear,
              FWL_STYLEEXT_DTP_TimeFormat) {
   }
 }
-void CFWL_DateTimePickerImp::ShowMonthCalendar(FX_BOOL bActivate) {
+
+void IFWL_DateTimePicker::ShowMonthCalendar(FX_BOOL bActivate) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_ShowMonthCalendar(bActivate);
   }
@@ -754,7 +399,8 @@ void CFWL_DateTimePickerImp::ShowMonthCalendar(FX_BOOL bActivate) {
     m_pForm->EndDoModal();
   }
 }
-FX_BOOL CFWL_DateTimePickerImp::IsMonthCalendarShowed() {
+
+FX_BOOL IFWL_DateTimePicker::IsMonthCalendarShowed() {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_IsMonthCalendarShowed();
   }
@@ -762,7 +408,8 @@ FX_BOOL CFWL_DateTimePickerImp::IsMonthCalendarShowed() {
     return FALSE;
   return !(m_pForm->GetStates() & FWL_WGTSTATE_Invisible);
 }
-void CFWL_DateTimePickerImp::ReSetEditAlignment() {
+
+void IFWL_DateTimePicker::ReSetEditAlignment() {
   if (!m_pEdit)
     return;
   uint32_t dwStylExes = m_pProperties->m_dwStyleExes;
@@ -799,9 +446,10 @@ void CFWL_DateTimePickerImp::ReSetEditAlignment() {
                                      FWL_STYLEEXT_EDT_HAlignModeMask |
                                      FWL_STYLEEXT_EDT_VAlignMask);
 }
-void CFWL_DateTimePickerImp::ProcessSelChanged(int32_t iYear,
-                                               int32_t iMonth,
-                                               int32_t iDay) {
+
+void IFWL_DateTimePicker::ProcessSelChanged(int32_t iYear,
+                                            int32_t iMonth,
+                                            int32_t iDay) {
   m_iYear = iYear;
   m_iMonth = iMonth;
   m_iDay = iDay;
@@ -811,13 +459,14 @@ void CFWL_DateTimePickerImp::ProcessSelChanged(int32_t iYear,
   m_pEdit->Update();
   Repaint(&m_rtClient);
   CFWL_Event_DtpSelectChanged ev;
-  ev.m_pSrcTarget = m_pInterface;
+  ev.m_pSrcTarget = this;
   ev.iYear = m_iYear;
   ev.iMonth = m_iMonth;
   ev.iDay = m_iDay;
   DispatchEvent(&ev);
 }
-void CFWL_DateTimePickerImp::InitProxyForm() {
+
+void IFWL_DateTimePicker::InitProxyForm() {
   if (m_pForm)
     return;
   if (!m_pMonthCal)
@@ -825,15 +474,17 @@ void CFWL_DateTimePickerImp::InitProxyForm() {
   CFWL_WidgetImpProperties propForm;
   propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
   propForm.m_dwStates = FWL_WGTSTATE_Invisible;
-  propForm.m_pOwner = m_pInterface;
-  m_pForm.reset(IFWL_DateTimeForm::Create(propForm, m_pMonthCal.get()));
+  propForm.m_pOwner = this;
+  m_pForm.reset(IFWL_FormProxy::Create(propForm, m_pMonthCal.get()));
   m_pForm->Initialize();
   m_pMonthCal->SetParent(m_pForm.get());
 }
-IFWL_DateTimeEdit* CFWL_DateTimePickerImp::GetDataTimeEdit() {
+
+IFWL_DateTimeEdit* IFWL_DateTimePicker::GetDataTimeEdit() {
   return m_pEdit.get();
 }
-FWL_Error CFWL_DateTimePickerImp::DisForm_Initialize() {
+
+FWL_Error IFWL_DateTimePicker::DisForm_Initialize() {
   m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
   DisForm_InitDateTimeCalendar();
   DisForm_InitDateTimeEdit();
@@ -841,7 +492,8 @@ FWL_Error CFWL_DateTimePickerImp::DisForm_Initialize() {
   RegisterEventTarget(m_pEdit.get());
   return FWL_Error::Succeeded;
 }
-void CFWL_DateTimePickerImp::DisForm_InitDateTimeCalendar() {
+
+void IFWL_DateTimePicker::DisForm_InitDateTimeCalendar() {
   if (m_pMonthCal) {
     return;
   }
@@ -849,32 +501,35 @@ void CFWL_DateTimePickerImp::DisForm_InitDateTimeCalendar() {
   propMonth.m_dwStyles =
       FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border | FWL_WGTSTYLE_EdgeSunken;
   propMonth.m_dwStates = FWL_WGTSTATE_Invisible;
-  propMonth.m_pParent = m_pInterface;
+  propMonth.m_pParent = this;
   propMonth.m_pDataProvider = &m_MonthCalendarDP;
   propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider;
-  m_pMonthCal.reset(IFWL_DateTimeCalender::Create(propMonth, m_pInterface));
+  m_pMonthCal.reset(IFWL_DateTimeCalendar::Create(propMonth, this));
   m_pMonthCal->Initialize();
   CFX_RectF rtMonthCal;
   m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE);
   rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtMonthCal);
 }
-void CFWL_DateTimePickerImp::DisForm_InitDateTimeEdit() {
+
+void IFWL_DateTimePicker::DisForm_InitDateTimeEdit() {
   if (m_pEdit) {
     return;
   }
   CFWL_WidgetImpProperties propEdit;
-  propEdit.m_pParent = m_pInterface;
+  propEdit.m_pParent = this;
   propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
-  m_pEdit.reset(IFWL_DateTimeEdit::Create(propEdit, m_pInterface));
+  m_pEdit.reset(IFWL_DateTimeEdit::Create(propEdit, this));
   m_pEdit->Initialize();
 }
-FX_BOOL CFWL_DateTimePickerImp::DisForm_IsMonthCalendarShowed() {
+
+FX_BOOL IFWL_DateTimePicker::DisForm_IsMonthCalendarShowed() {
   if (!m_pMonthCal)
     return FALSE;
   return !(m_pMonthCal->GetStates() & FWL_WGTSTATE_Invisible);
 }
-void CFWL_DateTimePickerImp::DisForm_ShowMonthCalendar(FX_BOOL bActivate) {
+
+void IFWL_DateTimePicker::DisForm_ShowMonthCalendar(FX_BOOL bActivate) {
   FX_BOOL bShowed = IsMonthCalendarShowed();
   if (bShowed == bActivate) {
     return;
@@ -911,8 +566,8 @@ void CFWL_DateTimePickerImp::DisForm_ShowMonthCalendar(FX_BOOL bActivate) {
   rtInvalidate.Inflate(2, 2);
   Repaint(&rtInvalidate);
 }
-FWL_WidgetHit CFWL_DateTimePickerImp::DisForm_HitTest(FX_FLOAT fx,
-                                                      FX_FLOAT fy) {
+
+FWL_WidgetHit IFWL_DateTimePicker::DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   CFX_RectF rect;
   rect.Set(0, 0, m_pProperties->m_rtWidget.width,
            m_pProperties->m_rtWidget.height);
@@ -929,14 +584,15 @@ FWL_WidgetHit CFWL_DateTimePickerImp::DisForm_HitTest(FX_FLOAT fx,
   }
   return FWL_WidgetHit::Unknown;
 }
-FX_BOOL CFWL_DateTimePickerImp::DisForm_IsNeedShowButton() {
+
+FX_BOOL IFWL_DateTimePicker::DisForm_IsNeedShowButton() {
   FX_BOOL bFocus = m_pProperties->m_dwStates & FWL_WGTSTATE_Focused ||
                    m_pMonthCal->GetStates() & FWL_WGTSTATE_Focused ||
                    m_pEdit->GetStates() & FWL_WGTSTATE_Focused;
   return bFocus;
 }
 
-FWL_Error CFWL_DateTimePickerImp::DisForm_Update() {
+FWL_Error IFWL_DateTimePicker::DisForm_Update() {
   if (m_iLock)
     return FWL_Error::Indefinite;
   if (!m_pProperties->m_pThemeProvider)
@@ -953,7 +609,7 @@ FWL_Error CFWL_DateTimePickerImp::DisForm_Update() {
   if (m_pProperties->m_pDataProvider) {
     IFWL_DateTimePickerDP* pData =
         static_cast<IFWL_DateTimePickerDP*>(m_pProperties->m_pDataProvider);
-    pData->GetToday(m_pInterface, m_MonthCalendarDP.m_iCurYear,
+    pData->GetToday(this, m_MonthCalendarDP.m_iCurYear,
                     m_MonthCalendarDP.m_iCurMonth, m_MonthCalendarDP.m_iCurDay);
   }
   FX_FLOAT* pWidth = static_cast<FX_FLOAT*>(
@@ -972,15 +628,16 @@ FWL_Error CFWL_DateTimePickerImp::DisForm_Update() {
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_DateTimePickerImp::DisForm_GetWidgetRect(CFX_RectF& rect,
-                                                        FX_BOOL bAutoSize) {
+FWL_Error IFWL_DateTimePicker::DisForm_GetWidgetRect(CFX_RectF& rect,
+                                                     FX_BOOL bAutoSize) {
   rect = m_pProperties->m_rtWidget;
   if (DisForm_IsNeedShowButton()) {
     rect.width += m_fBtn;
   }
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::DisForm_GetBBox(CFX_RectF& rect) {
+
+FWL_Error IFWL_DateTimePicker::DisForm_GetBBox(CFX_RectF& rect) {
   rect = m_pProperties->m_rtWidget;
   if (DisForm_IsNeedShowButton()) {
     rect.width += m_fBtn;
@@ -994,9 +651,9 @@ FWL_Error CFWL_DateTimePickerImp::DisForm_GetBBox(CFX_RectF& rect) {
   }
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_DateTimePickerImp::DisForm_DrawWidget(
-    CFX_Graphics* pGraphics,
-    const CFX_Matrix* pMatrix) {
+
+FWL_Error IFWL_DateTimePicker::DisForm_DrawWidget(CFX_Graphics* pGraphics,
+                                                  const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return FWL_Error::Indefinite;
   if (m_pEdit) {
@@ -1023,7 +680,7 @@ FWL_Error CFWL_DateTimePickerImp::DisForm_DrawWidget(
 }
 
 CFWL_DateTimePickerImpDelegate::CFWL_DateTimePickerImpDelegate(
-    CFWL_DateTimePickerImp* pOwner)
+    IFWL_DateTimePicker* pOwner)
     : m_pOwner(pOwner) {}
 
 void CFWL_DateTimePickerImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
@@ -1104,6 +761,7 @@ void CFWL_DateTimePickerImpDelegate::OnFocusChanged(CFWL_Message* pMsg,
   }
   m_pOwner->Repaint(&m_pOwner->m_rtClient);
 }
+
 void CFWL_DateTimePickerImpDelegate::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   if (!pMsg)
     return;
@@ -1128,6 +786,7 @@ void CFWL_DateTimePickerImpDelegate::OnLButtonDown(CFWL_MsgMouse* pMsg) {
     }
   }
 }
+
 void CFWL_DateTimePickerImpDelegate::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   if (!pMsg)
     return;
@@ -1139,6 +798,7 @@ void CFWL_DateTimePickerImpDelegate::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
   m_pOwner->Repaint(&m_pOwner->m_rtBtn);
 }
+
 void CFWL_DateTimePickerImpDelegate::OnMouseMove(CFWL_MsgMouse* pMsg) {
   if (m_pOwner->m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
   } else {
@@ -1146,12 +806,14 @@ void CFWL_DateTimePickerImpDelegate::OnMouseMove(CFWL_MsgMouse* pMsg) {
   }
   m_pOwner->Repaint(&m_pOwner->m_rtBtn);
 }
+
 void CFWL_DateTimePickerImpDelegate::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   if (!pMsg)
     return;
   m_pOwner->m_iBtnState = CFWL_PartState_Normal;
   m_pOwner->Repaint(&m_pOwner->m_rtBtn);
 }
+
 void CFWL_DateTimePickerImpDelegate::DisForm_OnFocusChanged(CFWL_Message* pMsg,
                                                             FX_BOOL bSet) {
   CFX_RectF rtInvalidate(m_pOwner->m_rtBtn);
@@ -1183,29 +845,29 @@ void CFWL_DateTimePickerImpDelegate::DisForm_OnFocusChanged(CFWL_Message* pMsg,
   m_pOwner->Repaint(&rtInvalidate);
 }
 
-CFWL_DateTimePickerImp::CFWL_MonthCalendarImpDP::CFWL_MonthCalendarImpDP() {
+IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::CFWL_MonthCalendarImpDP() {
   m_iCurYear = 2010;
   m_iCurMonth = 3;
   m_iCurDay = 29;
 }
 
-FWL_Error CFWL_DateTimePickerImp::CFWL_MonthCalendarImpDP::GetCaption(
+FWL_Error IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCaption(
     IFWL_Widget* pWidget,
     CFX_WideString& wsCaption) {
   return FWL_Error::Succeeded;
 }
 
-int32_t CFWL_DateTimePickerImp::CFWL_MonthCalendarImpDP::GetCurDay(
+int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurDay(
     IFWL_Widget* pWidget) {
   return m_iCurDay;
 }
 
-int32_t CFWL_DateTimePickerImp::CFWL_MonthCalendarImpDP::GetCurMonth(
+int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurMonth(
     IFWL_Widget* pWidget) {
   return m_iCurMonth;
 }
 
-int32_t CFWL_DateTimePickerImp::CFWL_MonthCalendarImpDP::GetCurYear(
+int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurYear(
     IFWL_Widget* pWidget) {
   return m_iCurYear;
 }