Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / include / fwl / theme / widgettp.h
index 5a07c7e..9d05784 100644 (file)
@@ -26,7 +26,7 @@ public:
     virtual FWL_ERR            SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix);\r
     virtual FX_BOOL            DrawBackground(CFWL_ThemeBackground *pParams);\r
     virtual FX_BOOL            DrawText(CFWL_ThemeText *pParams);\r
-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);\r
+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);\r
     virtual FX_BOOL            IsCustomizedLayout(IFWL_Widget *pWidget);\r
     virtual FWL_ERR            GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF &rtPart);\r
     virtual FX_BOOL            IsInPart(CFWL_ThemePart *pThemePart, FX_FLOAT fx, FX_FLOAT fy);\r
@@ -34,7 +34,7 @@ public:
     virtual FWL_ERR            Initialize();\r
     virtual FWL_ERR            Finalize();\r
     virtual ~CFWL_WidgetTP();\r
-    FWL_ERR            SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);\r
+    FWL_ERR            SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);\r
     FWL_ERR            SetFont(IFWL_Widget *pWidget, IFX_Font *pFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);\r
     IFX_Font*  GetFont(IFWL_Widget *pWidget);\r
 protected:\r