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

xfa/fwl/core/ifwl_spinbutton.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_BASEWIDGET_FWL_SPINBUTTONIMP_H_
-#define XFA_FWL_BASEWIDGET_FWL_SPINBUTTONIMP_H_
+#ifndef XFA_FWL_CORE_IFWL_SPINBUTTON_H_
+#define XFA_FWL_CORE_IFWL_SPINBUTTON_H_
 
-#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/cfwl_event.h"
 #include "xfa/fwl/core/ifwl_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
+#include "xfa/fxfa/cxfa_eventparam.h"
+
+#define FWL_CLASS_SpinButton L"FWL_SPINBUTTON"
+#define FWL_STYLEEXE_SPB_Vert (1L << 0)
 
 class CFWL_MsgMouse;
 class CFWL_SpinButtonImpDelegate;
 class CFWL_WidgetImpProperties;
 
-class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
+FWL_EVENT_DEF(CFWL_EvtSpbClick, CFWL_EventType::Click, FX_BOOL m_bUp;)
+
+class IFWL_SpinButton : public IFWL_Widget, public IFWL_Timer {
  public:
-  CFWL_SpinButtonImp(const CFWL_WidgetImpProperties& properties,
-                     IFWL_Widget* pOuter);
-  ~CFWL_SpinButtonImp() override;
+  static IFWL_SpinButton* Create(const CFWL_WidgetImpProperties& properties,
+                                 IFWL_Widget* pOuter);
 
-  // CFWL_WidgetImp
+  IFWL_SpinButton(const CFWL_WidgetImpProperties& properties,
+                  IFWL_Widget* pOuter);
+  ~IFWL_SpinButton() override;
+
+  // IFWL_Widget
   FWL_Error GetClassName(CFX_WideString& wsClass) const override;
   FWL_Type GetClassID() const override;
   FWL_Error Initialize() override;
   FWL_Error Finalize() override;
   FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
   FWL_Error Update() override;
   FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) override;
   FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = nullptr) override;
 
@@ skipping 18 matching lines @@
   CFX_RectF m_rtDnButton;
   uint32_t m_dwUpState;
   uint32_t m_dwDnState;
   int32_t m_iButtonIndex;
   FX_BOOL m_bLButtonDwn;
   IFWL_TimerInfo* m_pTimerInfo;
 };
 
 class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate {
  public:
-  CFWL_SpinButtonImpDelegate(CFWL_SpinButtonImp* pOwner);
+  CFWL_SpinButtonImpDelegate(IFWL_SpinButton* pOwner);
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
  protected:
   void OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE);
   void OnLButtonDown(CFWL_MsgMouse* pMsg);
   void OnLButtonUp(CFWL_MsgMouse* pMsg);
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   void OnKeyDown(CFWL_MsgKey* pMsg);
-  CFWL_SpinButtonImp* m_pOwner;
+  IFWL_SpinButton* m_pOwner;
 };
 
-#endif  // XFA_FWL_BASEWIDGET_FWL_SPINBUTTONIMP_H_
+#endif  // XFA_FWL_CORE_IFWL_SPINBUTTON_H_