Remove CLASSHASH defines in favour of an enum class.

This Cl updates all the CLASSHASH defines to use an enum class. A few defines
where unabled and were either updated or removed if the number no longer exists
in the code base.

Review-Url: https://codereview.chromium.org/1946213003

1 files changed, 19 insertions, 12 deletions

diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.h b/xfa/fwl/basewidget/fwl_spinbuttonimp.h
index aa963c9da4..068fbd888f 100644
--- a/xfa/fwl/basewidget/fwl_spinbuttonimp.h
+++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.h
@@ -19,27 +19,35 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
  public:
   CFWL_SpinButtonImp(const CFWL_WidgetImpProperties& properties,
                      IFWL_Widget* pOuter);
-  ~CFWL_SpinButtonImp();
-  virtual FWL_Error GetClassName(CFX_WideString& wsClass) const;
-  virtual uint32_t GetClassID() const;
-  virtual FWL_Error Initialize();
-  virtual FWL_Error Finalize();
-  virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
-  virtual FWL_Error Update();
-  virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy);
-  virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics,
-                               const CFX_Matrix* pMatrix = NULL);
-  virtual int32_t Run(FWL_HTIMER hTimer);
+  ~CFWL_SpinButtonImp() override;
+
+  // CFWL_WidgetImp
+  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;
+
+  // IFWL_Timer
+  int32_t Run(FWL_HTIMER hTimer) override;
+
   FWL_Error EnableButton(FX_BOOL bEnable, FX_BOOL bUp = TRUE);
   FX_BOOL IsButtonEnable(FX_BOOL bUp = TRUE);
 
  protected:
+  friend class CFWL_SpinButtonImpDelegate;
+
   void DrawUpButton(CFX_Graphics* pGraphics,
                     IFWL_ThemeProvider* pTheme,
                     const CFX_Matrix* pMatrix);
   void DrawDownButton(CFX_Graphics* pGraphics,
                       IFWL_ThemeProvider* pTheme,
                       const CFX_Matrix* pMatrix);
+
   CFX_RectF m_rtClient;
   CFX_RectF m_rtUpButton;
   CFX_RectF m_rtDnButton;
@@ -48,7 +56,6 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
   int32_t m_iButtonIndex;
   FX_BOOL m_bLButtonDwn;
   FWL_HTIMER m_hTimer;
-  friend class CFWL_SpinButtonImpDelegate;
 };
 class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate {
  public: