From 14d3a9e14e91001b1c6e31233cc5d39fc2a57190 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 21 Nov 2016 08:36:36 -0800 Subject: Remove unset FWL_WGTSTYLE_NarrowCaption This CL removes the flag which never appears to be set and the supporting code for captions in IFWL_Form as they are never used. Review-Url: https://codereview.chromium.org/2507283003 --- xfa/fwl/core/ifwl_form.h | 8 -------- 1 file changed, 8 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 013ef92a52..994cb15f34 100644 --- a/xfa/fwl/core/ifwl_form.h +++ b/xfa/fwl/core/ifwl_form.h @@ -99,10 +99,6 @@ class IFWL_Form : public IFWL_Widget { CFWL_SysBtn* GetSysBtnByState(uint32_t dwState); CFWL_SysBtn* GetSysBtnByIndex(int32_t nIndex); int32_t GetSysBtnIndex(CFWL_SysBtn* pBtn); - FX_FLOAT GetCaptionHeight(); - void DrawCaptionText(CFX_Graphics* pGs, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix = nullptr); void DrawIconImage(CFX_Graphics* pGs, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix = nullptr); @@ -115,7 +111,6 @@ class IFWL_Form : public IFWL_Widget { void SetThemeData(); bool HasIcon(); void UpdateIcon(); - void UpdateCaption(); void OnLButtonDown(CFWL_MsgMouse* pMsg); void OnLButtonUp(CFWL_MsgMouse* pMsg); void OnMouseMove(CFWL_MsgMouse* pMsg); @@ -126,14 +121,11 @@ class IFWL_Form : public IFWL_Widget { bool m_bMouseIn; #endif CFX_RectF m_rtRestore; - CFX_RectF m_rtCaptionText; CFX_RectF m_rtRelative; - CFX_RectF m_rtCaption; CFX_RectF m_rtIcon; CFWL_SysBtn* m_pCloseBox; CFWL_SysBtn* m_pMinBox; CFWL_SysBtn* m_pMaxBox; - CFWL_SysBtn* m_pCaptionBox; std::unique_ptr m_pNoteLoop; IFWL_Widget* m_pSubFocus; FX_FLOAT m_fCXBorder; -- cgit v1.2.3