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

xfa/fwl/core/ifwl_spinbutton.h

Index: xfa/fwl/core/ifwl_spinbutton.h
diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.h b/xfa/fwl/core/ifwl_spinbutton.h
similarity index 73%
rename from xfa/fwl/basewidget/fwl_spinbuttonimp.h
rename to xfa/fwl/core/ifwl_spinbutton.h
index 3eca307cdcad460f5d42768ddf66919b68ce9b07..717ba9f011a1b69c4dd1ce758cc4f93eec193347 100644
--- a/xfa/fwl/basewidget/fwl_spinbuttonimp.h
+++ b/xfa/fwl/core/ifwl_spinbutton.h
@@ -4,24 +4,33 @@
 
 // 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);
+
+  IFWL_SpinButton(const CFWL_WidgetImpProperties& properties,
+                  IFWL_Widget* pOuter);
+  ~IFWL_SpinButton() override;
 
-  // CFWL_WidgetImp
+  // IFWL_Widget
   FWL_Error GetClassName(CFX_WideString& wsClass) const override;
   FWL_Type GetClassID() const override;
   FWL_Error Initialize() override;
@@ -60,7 +69,7 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
 
 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,
@@ -73,7 +82,7 @@ class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate {
   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_