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, 20 insertions, 12 deletions

diff --git a/xfa/fwl/basewidget/fwl_checkboximp.h b/xfa/fwl/basewidget/fwl_checkboximp.h
index cc5474db9a..89f680c985 100644
--- a/xfa/fwl/basewidget/fwl_checkboximp.h
+++ b/xfa/fwl/basewidget/fwl_checkboximp.h
@@ -8,6 +8,7 @@
 #define XFA_FWL_BASEWIDGET_FWL_CHECKBOXIMP_H_
 
 #include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/ifwl_widget.h"
 
 class CFWL_CheckBoxImpDelegate;
 class CFWL_MsgMouse;
@@ -18,23 +19,28 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp {
  public:
   CFWL_CheckBoxImp(const CFWL_WidgetImpProperties& properties,
                    IFWL_Widget* pOuter);
-  ~CFWL_CheckBoxImp();
-  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_Error DrawWidget(CFX_Graphics* pGraphics,
-                               const CFX_Matrix* pMatrix = NULL);
-  virtual int32_t GetCheckState();
-  virtual FWL_Error SetCheckState(int32_t iCheck);
+  ~CFWL_CheckBoxImp() 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_Error DrawWidget(CFX_Graphics* pGraphics,
+                       const CFX_Matrix* pMatrix = nullptr) override;
+  int32_t GetCheckState();
+  FWL_Error SetCheckState(int32_t iCheck);
 
  protected:
+  friend class CFWL_CheckBoxImpDelegate;
+
   void Layout();
   uint32_t GetPartStates();
   void UpdateTextOutStyles();
   void NextStates();
+
   CFX_RectF m_rtClient;
   CFX_RectF m_rtBox;
   CFX_RectF m_rtCaption;
@@ -42,11 +48,12 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp {
   uint32_t m_dwTTOStyles;
   int32_t m_iTTOAlign;
   FX_BOOL m_bBtnDown;
-  friend class CFWL_CheckBoxImpDelegate;
 };
+
 class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate {
  public:
   CFWL_CheckBoxImpDelegate(CFWL_CheckBoxImp* pOwner);
+
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = NULL) override;
@@ -59,6 +66,7 @@ class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate {
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   void OnKeyDown(CFWL_MsgKey* pMsg);
+
   CFWL_CheckBoxImp* m_pOwner;
 };