From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 17:38:11 -0700 Subject: Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs. Nearly automatic merge + re-run script on new files. Original Review URL: https://codereview.chromium.org/1180593004. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1174303002. --- core/include/fxge/fx_font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/include/fxge/fx_font.h') diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index c950130d8f..a3c8f89fda 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -360,7 +360,7 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo public: CFX_FolderFontInfo(); virtual ~CFX_FolderFontInfo(); - void AddPath(FX_BSTR path); + void AddPath(const CFX_ByteStringC& path); virtual void Release(); virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper); virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact); -- cgit v1.2.3