summaryrefslogtreecommitdiff
path: root/xfa/include/fwl/theme
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-10 17:38:11 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-10 17:38:11 -0700
commitca3ac5e9ffc936066267fbb1c329e5297d8e23e6 (patch)
tree986e666023ae0eec649051613d83c6c60ef3dac0 /xfa/include/fwl/theme
parent0aa0e7331b3512066df3e33d6642456a0de63de7 (diff)
downloadpdfium-ca3ac5e9ffc936066267fbb1c329e5297d8e23e6.tar.xz
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.
Diffstat (limited to 'xfa/include/fwl/theme')
-rw-r--r--xfa/include/fwl/theme/widgettp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 9d0578478e..6460b2bd57 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -96,8 +96,8 @@ class CFWL_FontData
public:
CFWL_FontData();
virtual ~CFWL_FontData();
- FX_BOOL Equal(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
- FX_BOOL LoadFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
+ FX_BOOL Equal(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
+ FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
IFX_Font* GetFont() const
{
return m_pFont;
@@ -117,7 +117,7 @@ class CFWL_FontManager
public:
CFWL_FontManager();
virtual ~CFWL_FontManager();
- IFX_Font* FindFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage);
+ IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage);
protected:
CFX_PtrArray m_arrFonts;
};