| Index: xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| index c62256262abea396ee6ea4a7ff684f2ebd1d141f..e4e574b9696e85bd1bb963426085fb82f4bab071 100644
|
| --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| @@ -741,7 +741,7 @@ void CXFA_WidgetAcc::UpdateUIDisplay(CXFA_FFWidget* pExcept) {
|
| pWidget->AddInvalidateRect();
|
| }
|
| }
|
| -void CXFA_WidgetAcc::NotifyEvent(FX_DWORD dwEvent,
|
| +void CXFA_WidgetAcc::NotifyEvent(uint32_t dwEvent,
|
| CXFA_FFWidget* pWidget,
|
| void* pParam,
|
| void* pAdditional) {
|
| @@ -899,7 +899,7 @@ void CXFA_WidgetAcc::CalculateTextContentSize(CFX_SizeF& size) {
|
| pTextOut->SetFontSize(fFontSize);
|
| pTextOut->SetLineBreakTolerance(fFontSize * 0.2f);
|
| pTextOut->SetLineSpace(GetLineHeight());
|
| - FX_DWORD dwStyles = FDE_TTOSTYLE_LastLineHeight;
|
| + uint32_t dwStyles = FDE_TTOSTYLE_LastLineHeight;
|
| if (GetUIType() == XFA_ELEMENT_TextEdit && IsMultiLine()) {
|
| dwStyles |= FDE_TTOSTYLE_LineWrap;
|
| }
|
| @@ -1535,7 +1535,7 @@ CXFA_WidgetLayoutData* CXFA_WidgetAcc::GetWidgetLayoutData() {
|
| }
|
| IFX_Font* CXFA_WidgetAcc::GetFDEFont() {
|
| CFX_WideStringC wsFontName = FX_WSTRC(L"Courier");
|
| - FX_DWORD dwFontStyle = 0;
|
| + uint32_t dwFontStyle = 0;
|
| if (CXFA_Font font = GetFont()) {
|
| if (font.IsBold()) {
|
| dwFontStyle |= FX_FONTSTYLE_Bold;
|
|
|