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/theme/pushbuttontp.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'xfa/include/fwl/theme/pushbuttontp.h') diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index 676a5fce50..b27afc47f4 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -30,8 +30,7 @@ protected: void SetCornerColor(FX_DWORD *pData); FX_INT32 GetColorID(FX_DWORD dwStates); - struct PBThemeData : CFX_Object { - public: + struct PBThemeData { FX_ARGB clrBorder[5]; FX_ARGB clrStart[5]; FX_ARGB clrEnd[5]; -- cgit v1.2.3