From d2bf06228d7572545717cd36ea0dabc67e9b6d84 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 10 Nov 2016 12:46:33 -0800 Subject: Continue IFWL cleanup Cleaning up more IFWL classes. Review-Url: https://codereview.chromium.org/2492563002 --- xfa/fwl/core/ifwl_pushbutton.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'xfa/fwl/core/ifwl_pushbutton.h') diff --git a/xfa/fwl/core/ifwl_pushbutton.h b/xfa/fwl/core/ifwl_pushbutton.h index 6fb81f0811..d717997c18 100644 --- a/xfa/fwl/core/ifwl_pushbutton.h +++ b/xfa/fwl/core/ifwl_pushbutton.h @@ -53,7 +53,7 @@ class IFWL_PushButton : public IFWL_Widget { void OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; - protected: + private: void DrawBkground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); @@ -62,20 +62,18 @@ class IFWL_PushButton : public IFWL_Widget { const CFX_Matrix* pMatrix); uint32_t GetPartStates(); void UpdateTextOutStyles(); - - CFX_RectF m_rtClient; - CFX_RectF m_rtCaption; - bool m_bBtnDown; - uint32_t m_dwTTOStyles; - int32_t m_iTTOAlign; - - private: void OnFocusChanged(CFWL_Message* pMsg, bool bSet); void OnLButtonDown(CFWL_MsgMouse* pMsg); void OnLButtonUp(CFWL_MsgMouse* pMsg); void OnMouseMove(CFWL_MsgMouse* pMsg); void OnMouseLeave(CFWL_MsgMouse* pMsg); void OnKeyDown(CFWL_MsgKey* pMsg); + + CFX_RectF m_rtClient; + CFX_RectF m_rtCaption; + bool m_bBtnDown; + uint32_t m_dwTTOStyles; + int32_t m_iTTOAlign; }; #endif // XFA_FWL_CORE_IFWL_PUSHBUTTON_H_ -- cgit v1.2.3