diff options
Diffstat (limited to 'xfa/fgas/layout/fgas_textbreak.h')
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 9aa576f380..fd864f1296 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -61,7 +61,7 @@ struct FX_TXTRUN { int32_t iVerticalScale; uint32_t dwCharStyles; const CFX_RectF* pRect; - FX_WCHAR wLineBreakChar; + wchar_t wLineBreakChar; bool bSkipSpace; }; @@ -76,8 +76,8 @@ class CFX_TxtBreak { void SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont); void SetFontSize(FX_FLOAT fFontSize); void SetTabWidth(FX_FLOAT fTabWidth, bool bEquidistant); - void SetDefaultChar(FX_WCHAR wch); - void SetParagraphBreakChar(FX_WCHAR wch); + void SetDefaultChar(wchar_t wch); + void SetParagraphBreakChar(wchar_t wch); void SetLineBreakTolerance(FX_FLOAT fTolerance); void SetHorizontalScale(int32_t iScale); void SetCharSpace(FX_FLOAT fCharSpace); @@ -95,7 +95,7 @@ class CFX_TxtBreak { std::vector<CFX_RectF> GetCharRects(const FX_TXTRUN* pTxtRun, bool bCharBBox = false) const; void AppendChar_PageLoad(CFX_Char* pCurChar, uint32_t dwProps); - CFX_BreakType AppendChar(FX_WCHAR wch); + CFX_BreakType AppendChar(wchar_t wch); CFX_BreakType AppendChar_Combination(CFX_Char* pCurChar); CFX_BreakType AppendChar_Tab(CFX_Char* pCurChar); CFX_BreakType AppendChar_Control(CFX_Char* pCurChar); @@ -133,8 +133,8 @@ class CFX_TxtBreak { CFX_RetainPtr<CFGAS_GEFont> m_pFont; int32_t m_iFontSize; int32_t m_iTabWidth; - FX_WCHAR m_wDefChar; - FX_WCHAR m_wParagBreakChar; + wchar_t m_wDefChar; + wchar_t m_wParagBreakChar; int32_t m_iDefChar; int32_t m_iAlignment; uint32_t m_dwContextCharStyles; |