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_barcode.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'xfa/fwl/core/ifwl_barcode.h') diff --git a/xfa/fwl/core/ifwl_barcode.h b/xfa/fwl/core/ifwl_barcode.h index f7f28428f5..33cb442e50 100644 --- a/xfa/fwl/core/ifwl_barcode.h +++ b/xfa/fwl/core/ifwl_barcode.h @@ -13,7 +13,6 @@ #include "xfa/fwl/core/ifwl_scrollbar.h" #include "xfa/fxbarcode/BC_Library.h" -class CFWL_BarcodeImpDelegate; class CFWL_WidgetImpProperties; class CFX_Barcode; class IFWL_Widget; @@ -68,13 +67,12 @@ class IFWL_Barcode : public IFWL_Edit { FWL_Error DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; FWL_Error SetText(const CFX_WideString& wsText) override; + void OnProcessEvent(CFWL_Event* pEvent) override; void SetType(BC_TYPE type); FX_BOOL IsProtectedType(); protected: - friend class CFWL_BarcodeImpDelegate; - void GenerateBarcodeImageCache(); void CreateBarcodeEngine(); @@ -83,10 +81,4 @@ class IFWL_Barcode : public IFWL_Edit { BC_TYPE m_type; }; -class CFWL_BarcodeImpDelegate : public CFWL_EditImpDelegate { - public: - explicit CFWL_BarcodeImpDelegate(IFWL_Barcode* pOwner); - void OnProcessEvent(CFWL_Event* pEvent) override; -}; - #endif // XFA_FWL_CORE_IFWL_BARCODE_H_ -- cgit v1.2.3