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/core/fwl_theme.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/include/fwl/core/fwl_theme.h') diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index cc29e351d1..9ab970b47c 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -45,7 +45,7 @@ public: int32_t m_iPart; FX_DWORD m_dwStates; FX_DWORD m_dwData; - FX_LPVOID m_pData; + void* m_pData; }; class CFWL_ThemeBackground : public CFWL_ThemePart { @@ -82,7 +82,7 @@ public: virtual FWL_ERR SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix) = 0; virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams) = 0; virtual FX_BOOL DrawText(CFWL_ThemeText *pParams) = 0; - virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) = 0; + virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) = 0; virtual FX_BOOL IsCustomizedLayout(IFWL_Widget *pWidget) = 0; virtual FWL_ERR GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF &rtPart) = 0; virtual FX_BOOL IsInPart(CFWL_ThemePart *pThemePart, FX_FLOAT fx, FX_FLOAT fy) = 0; -- cgit v1.2.3