From b4455b90b1c86ab94986e4f470c963f1e91b27ba Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 21 Nov 2016 08:47:23 -0800 Subject: Remove unused FWL_WGTSTYLE_Icon The FWL_WGTSTYLE_Icon flag is never set. This CL removes it and the supporting Icon code from IFWL_Form. Review-Url: https://codereview.chromium.org/2516433003 --- xfa/fwl/core/ifwl_form.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'xfa/fwl/core/ifwl_form.h') diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/ifwl_form.h index 994cb15f34..672f1d2530 100644 --- a/xfa/fwl/core/ifwl_form.h +++ b/xfa/fwl/core/ifwl_form.h @@ -61,10 +61,7 @@ class IFWL_Widget; class IFWL_ThemeProvider; class CFWL_SysBtn; -class IFWL_FormDP : public IFWL_DataProvider { - public: - virtual CFX_DIBitmap* GetIcon(IFWL_Widget* pWidget, bool bBig) = 0; -}; +class IFWL_FormDP : public IFWL_DataProvider {}; class IFWL_Form : public IFWL_Widget { public: @@ -99,18 +96,12 @@ class IFWL_Form : public IFWL_Widget { CFWL_SysBtn* GetSysBtnByState(uint32_t dwState); CFWL_SysBtn* GetSysBtnByIndex(int32_t nIndex); int32_t GetSysBtnIndex(CFWL_SysBtn* pBtn); - void DrawIconImage(CFX_Graphics* pGs, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix = nullptr); void GetEdgeRect(CFX_RectF& rtEdge); void SetWorkAreaRect(); void Layout(); void ResetSysBtn(); void RegisterForm(); void UnRegisterForm(); - void SetThemeData(); - bool HasIcon(); - void UpdateIcon(); void OnLButtonDown(CFWL_MsgMouse* pMsg); void OnLButtonUp(CFWL_MsgMouse* pMsg); void OnMouseMove(CFWL_MsgMouse* pMsg); @@ -122,7 +113,6 @@ class IFWL_Form : public IFWL_Widget { #endif CFX_RectF m_rtRestore; CFX_RectF m_rtRelative; - CFX_RectF m_rtIcon; CFWL_SysBtn* m_pCloseBox; CFWL_SysBtn* m_pMinBox; CFWL_SysBtn* m_pMaxBox; @@ -137,10 +127,6 @@ class IFWL_Form : public IFWL_Widget { bool m_bSetMaximize; bool m_bCustomizeLayout; bool m_bDoModalFlag; - FX_FLOAT m_fSmallIconSz; - FX_FLOAT m_fBigIconSz; - CFX_DIBitmap* m_pBigIcon; - CFX_DIBitmap* m_pSmallIcon; }; #endif // XFA_FWL_CORE_IFWL_FORM_H_ -- cgit v1.2.3