From b4d40ffae3f955fab2fac838430c89aca452c45f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 5 May 2016 10:28:02 -0700 Subject: 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 --- xfa/fwl/core/fwl_formimp.h | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'xfa/fwl/core/fwl_formimp.h') diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h index f1bc51df37..9d2d394d03 100644 --- a/xfa/fwl/core/fwl_formimp.h +++ b/xfa/fwl/core/fwl_formimp.h @@ -68,27 +68,29 @@ typedef struct RestoreResizeInfo { class CFWL_FormImp : public CFWL_WidgetImp { public: CFWL_FormImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual ~CFWL_FormImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error GetClientRect(CFX_RectF& rect); - 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 FWL_FORMSIZE GetFormSize(); - virtual FWL_Error SetFormSize(FWL_FORMSIZE eFormSize); - virtual IFWL_Widget* DoModal(); - virtual IFWL_Widget* DoModal(uint32_t& dwCommandID); - virtual FWL_Error EndDoModal(); - virtual FWL_Error SetBorderRegion(CFX_Path* pPath); - virtual void DrawBackground(CFX_Graphics* pGraphics, - IFWL_ThemeProvider* pTheme); + ~CFWL_FormImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error GetClientRect(CFX_RectF& rect) 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; + + FWL_FORMSIZE GetFormSize(); + FWL_Error SetFormSize(FWL_FORMSIZE eFormSize); + IFWL_Widget* DoModal(); + IFWL_Widget* DoModal(uint32_t& dwCommandID); + FWL_Error EndDoModal(); + FWL_Error SetBorderRegion(CFX_Path* pPath); + void DrawBackground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme); CFWL_WidgetImp* GetSubFocus(); void SetSubFocus(CFWL_WidgetImp* pWidget); -- cgit v1.2.3