From c64b76c97c7f469ebd4126f314badceeb8a78b8b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 14 Nov 2016 09:01:37 -0800 Subject: Cleanup remaining IFWL files for visiblity and usage. This CL cleans up the remaining ifwl_* files to fixup visibility, remove unused methods and remove unused FWL_Error return codes. Review-Url: https://codereview.chromium.org/2502653002 --- xfa/fwl/core/ifwl_checkbox.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'xfa/fwl/core/ifwl_checkbox.h') diff --git a/xfa/fwl/core/ifwl_checkbox.h b/xfa/fwl/core/ifwl_checkbox.h index d3dfd2680d..cda02b5168 100644 --- a/xfa/fwl/core/ifwl_checkbox.h +++ b/xfa/fwl/core/ifwl_checkbox.h @@ -56,8 +56,8 @@ class IFWL_CheckBoxDP : public IFWL_DataProvider { class IFWL_CheckBox : public IFWL_Widget { public: - explicit IFWL_CheckBox(const IFWL_App* app, - std::unique_ptr properties); + IFWL_CheckBox(const IFWL_App* app, + std::unique_ptr properties); ~IFWL_CheckBox() override; // IFWL_Widget @@ -71,14 +71,19 @@ class IFWL_CheckBox : public IFWL_Widget { void OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; - int32_t GetCheckState(); - FWL_Error SetCheckState(int32_t iCheck); - - protected: + private: + void SetCheckState(int32_t iCheck); void Layout(); uint32_t GetPartStates(); void UpdateTextOutStyles(); void NextStates(); + void OnActivate(CFWL_Message* pMsg); + 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_rtBox; @@ -87,15 +92,6 @@ class IFWL_CheckBox : public IFWL_Widget { uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; bool m_bBtnDown; - - private: - void OnActivate(CFWL_Message* pMsg); - 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); }; #endif // XFA_FWL_CORE_IFWL_CHECKBOX_H_ -- cgit v1.2.3