From 3b3ce1a242f8445848d3f23d6c35ba01d7c645f4 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 2 Nov 2016 14:51:25 -0700 Subject: Merge delegates into IFWL_* classes. This Cl removes ownership of the delgates from IFWL_Widget and puts it in the hand of the creating classes. In doing so, merge the delegates back into the IFWL_* classes to simplify logic. Review-Url: https://codereview.chromium.org/2467993003 --- xfa/fwl/core/ifwl_comboedit.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'xfa/fwl/core/ifwl_comboedit.h') diff --git a/xfa/fwl/core/ifwl_comboedit.h b/xfa/fwl/core/ifwl_comboedit.h index f4a529a186..9c321d1cd4 100644 --- a/xfa/fwl/core/ifwl_comboedit.h +++ b/xfa/fwl/core/ifwl_comboedit.h @@ -19,6 +19,9 @@ class IFWL_ComboEdit : public IFWL_Edit { const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); + // IFWL_Edit. + void OnProcessMessage(CFWL_Message* pMessage) override; + void ClearSelected(); void SetSelected(); void EndCaret(); @@ -27,16 +30,6 @@ class IFWL_ComboEdit : public IFWL_Edit { protected: void SetComboBoxFocus(FX_BOOL bSet); IFWL_ComboBox* m_pOuter; - friend class CFWL_ComboEditImpDelegate; -}; - -class CFWL_ComboEditImpDelegate : public CFWL_EditImpDelegate { - public: - CFWL_ComboEditImpDelegate(IFWL_ComboEdit* pOwner); - void OnProcessMessage(CFWL_Message* pMessage) override; - - protected: - IFWL_ComboEdit* m_pOwner; }; #endif // XFA_FWL_CORE_IFWL_COMBOEDIT_H_ -- cgit v1.2.3