From d7e5cc754a937605d1f73db5e7967c58ddd80742 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 14:33:37 -0700 Subject: Merge to XFA: Remove typdefs for pointer types in fx_system.h. Original Review URL: https://codereview.chromium.org/1171733003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1178613002. --- xfa/include/fwl/theme/widgettp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/include/fwl/theme/widgettp.h') diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 5a07c7ea03..9d0578478e 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -26,7 +26,7 @@ public: virtual FWL_ERR SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams); virtual FX_BOOL DrawText(CFWL_ThemeText *pParams); - virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity); virtual FX_BOOL IsCustomizedLayout(IFWL_Widget *pWidget); virtual FWL_ERR GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF &rtPart); virtual FX_BOOL IsInPart(CFWL_ThemePart *pThemePart, FX_FLOAT fx, FX_FLOAT fy); @@ -34,7 +34,7 @@ public: virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual ~CFWL_WidgetTP(); - FWL_ERR SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont); + FWL_ERR SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont); FWL_ERR SetFont(IFWL_Widget *pWidget, IFX_Font *pFont, FX_FLOAT fFontSize, FX_ARGB rgbFont); IFX_Font* GetFont(IFWL_Widget *pWidget); protected: -- cgit v1.2.3