| Index: core/src/fxcrt/fx_unicode.cpp
 | 
| diff --git a/core/src/fxcrt/fx_unicode.cpp b/core/src/fxcrt/fx_unicode.cpp
 | 
| index d66a58a9b33e96c291ce5a7e1fcddbb34ce859d6..1d63da93aaa9e841deb1dd128db1ba75062299b2 100644
 | 
| --- a/core/src/fxcrt/fx_unicode.cpp
 | 
| +++ b/core/src/fxcrt/fx_unicode.cpp
 | 
| @@ -13,27 +13,27 @@ FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch)
 | 
|  {
 | 
|      return gs_FX_TextLayout_CodeProperties[(FX_WORD)wch];
 | 
|  }
 | 
| -FX_BOOL FX_IsCtrlCode(FX_WCHAR ch)
 | 
| +bool FX_IsCtrlCode(FX_WCHAR ch)
 | 
|  {
 | 
|      FX_DWORD dwRet = (gs_FX_TextLayout_CodeProperties[(FX_WORD)ch] & FX_CHARTYPEBITSMASK);
 | 
|      return dwRet == FX_CHARTYPE_Tab || dwRet == FX_CHARTYPE_Control;
 | 
|  }
 | 
| -FX_BOOL FX_IsRotationCode(FX_WCHAR ch)
 | 
| +bool FX_IsRotationCode(FX_WCHAR ch)
 | 
|  {
 | 
|      return (gs_FX_TextLayout_CodeProperties[(FX_WORD)ch] & 0x8000) != 0;
 | 
|  }
 | 
| -FX_BOOL FX_IsCombinationChar(FX_WCHAR wch)
 | 
| +bool FX_IsCombinationChar(FX_WCHAR wch)
 | 
|  {
 | 
|      FX_DWORD dwProps = (gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK);
 | 
|      return dwProps == FX_CHARTYPE_Combination;
 | 
|  }
 | 
| -FX_BOOL	FX_IsBidiChar(FX_WCHAR wch)
 | 
| +bool	FX_IsBidiChar(FX_WCHAR wch)
 | 
|  {
 | 
|      FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch];
 | 
|      int32_t iBidiCls = (dwProps & FX_BIDICLASSBITSMASK) >> FX_BIDICLASSBITS;
 | 
|      return (FX_BIDICLASS_R == iBidiCls || FX_BIDICLASS_AL == iBidiCls);
 | 
|  }
 | 
| -FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical)
 | 
| +FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, bool bRTL, bool bVertical)
 | 
|  {
 | 
|      FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch];
 | 
|      FX_DWORD dwTemp = (dwProps & 0xFF800000);
 | 
| @@ -49,7 +49,7 @@ FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical)
 | 
|      }
 | 
|      return wch;
 | 
|  }
 | 
| -FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, FX_BOOL bVertical)
 | 
| +FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, bool bRTL, bool bVertical)
 | 
|  {
 | 
|      FX_DWORD dwTemp = (dwProps & 0xFF800000);
 | 
|      if (bRTL && dwTemp < 0xFF800000) {
 | 
| 
 |