From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- xfa/include/fwl/lightwidget/combobox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xfa/include/fwl/lightwidget/combobox.h') diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index eac58569aa..46aec5bc8a 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -96,7 +96,7 @@ protected: }; CFWL_ComboBoxDP m_comboBoxData; }; -class CFWL_ComboBoxItem : public CFX_Object +class CFWL_ComboBoxItem { public: CFWL_ComboBoxItem() -- cgit v1.2.3