From 4ce94e118d66064715de5baebeb4b2b580dcac66 Mon Sep 17 00:00:00 2001 From: weili Date: Sat, 18 Jun 2016 06:21:57 -0700 Subject: Make code compile with clang_use_chrome_plugin (part VI) This change mainly contains files in xfa/fwl directory. This is part of the efforts to make PDFium code compilable by Clang chromium style plugins. The changes are mainly the following: -- move inline constructor/destructor of complex class/struct out-of-line; -- add constructor/destructor of complex class/struct if not explicitly defined; -- add explicit out-of-line copy constructor when needed; -- move inline virtual functions out-of-line; -- Properly mark virtual functions with 'override'; -- some minor cleanups; BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2070583003 --- xfa/fwl/lightwidget/cfwl_pushbutton.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'xfa/fwl/lightwidget/cfwl_pushbutton.h') diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.h b/xfa/fwl/lightwidget/cfwl_pushbutton.h index 5ca3dded37..145f5ed6f0 100644 --- a/xfa/fwl/lightwidget/cfwl_pushbutton.h +++ b/xfa/fwl/lightwidget/cfwl_pushbutton.h @@ -12,24 +12,33 @@ class CFWL_PushButton : public CFWL_Widget { public: + CFWL_PushButton(); + ~CFWL_PushButton() override; + static CFWL_PushButton* Create(); + FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = NULL); FWL_Error GetCaption(CFX_WideString& wsCaption); FWL_Error SetCaption(const CFX_WideStringC& wsCaption); CFX_DIBitmap* GetPicture(); FWL_Error SetPicture(CFX_DIBitmap* pBitmap); - CFWL_PushButton(); - virtual ~CFWL_PushButton(); protected: class CFWL_PushButtonDP : public IFWL_PushButtonDP { public: CFWL_PushButtonDP() : m_pBitmap(NULL) {} - FWL_Error GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); - virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget); + + // IFWL_DataProvider + FWL_Error GetCaption(IFWL_Widget* pWidget, + CFX_WideString& wsCaption) override; + + // IFWL_PushButtonDP + CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) override; + CFX_WideString m_wsCaption; CFX_DIBitmap* m_pBitmap; }; + CFWL_PushButtonDP m_buttonData; }; -- cgit v1.2.3