diff options
Diffstat (limited to 'xfa/fwl')
41 files changed, 269 insertions, 269 deletions
diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.cpp b/xfa/fwl/basewidget/fwl_barcodeimp.cpp index 1ee731399f..9b6761bf8d 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.cpp +++ b/xfa/fwl/basewidget/fwl_barcodeimp.cpp @@ -42,7 +42,7 @@ FWL_ERR CFWL_BarcodeImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Barcode; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_BarcodeImp::GetClassID() const { +uint32_t CFWL_BarcodeImp::GetClassID() const { return FWL_CLASSHASH_Barcode; } FWL_ERR CFWL_BarcodeImp::Initialize() { @@ -129,7 +129,7 @@ void CFWL_BarcodeImp::GenerateBarcodeImageCache() { } m_pBarcodeEngine->SetHeight(int32_t(m_rtClient.height)); m_pBarcodeEngine->SetWidth(int32_t(m_rtClient.width)); - FX_DWORD dwAttributeMask = pData->GetBarcodeAttributeMask(); + uint32_t dwAttributeMask = pData->GetBarcodeAttributeMask(); if (dwAttributeMask & FWL_BCDATTRIBUTE_CHARENCODING) { m_pBarcodeEngine->SetCharEncoding(pData->GetCharEncoding()); } @@ -212,7 +212,7 @@ FX_BOOL CFWL_BarcodeImp::IsProtectedType() { CFWL_BarcodeImpDelegate::CFWL_BarcodeImpDelegate(CFWL_BarcodeImp* pOwner) : CFWL_EditImpDelegate(pOwner) {} FWL_ERR CFWL_BarcodeImpDelegate::OnProcessEvent(CFWL_Event* pEvent) { - FX_DWORD dwFlag = pEvent->GetClassID(); + uint32_t dwFlag = pEvent->GetClassID(); if (dwFlag == FWL_EVTHASH_EDT_TextChanged) { CFWL_BarcodeImp* pOwner = static_cast<CFWL_BarcodeImp*>(m_pOwner); pOwner->ReleaseBarcodeEngine(); diff --git a/xfa/fwl/basewidget/fwl_caretimp.cpp b/xfa/fwl/basewidget/fwl_caretimp.cpp index cc0f548392..e7ce56777e 100644 --- a/xfa/fwl/basewidget/fwl_caretimp.cpp +++ b/xfa/fwl/basewidget/fwl_caretimp.cpp @@ -26,10 +26,10 @@ IFWL_Caret::IFWL_Caret() {} FWL_ERR IFWL_Caret::ShowCaret(FX_BOOL bFlag) { return static_cast<CFWL_CaretImp*>(GetImpl())->ShowCaret(bFlag); } -FWL_ERR IFWL_Caret::GetFrequency(FX_DWORD& elapse) { +FWL_ERR IFWL_Caret::GetFrequency(uint32_t& elapse) { return static_cast<CFWL_CaretImp*>(GetImpl())->GetFrequency(elapse); } -FWL_ERR IFWL_Caret::SetFrequency(FX_DWORD elapse) { +FWL_ERR IFWL_Caret::SetFrequency(uint32_t elapse) { return static_cast<CFWL_CaretImp*>(GetImpl())->SetFrequency(elapse); } FWL_ERR IFWL_Caret::SetColor(CFX_Color crFill) { @@ -55,7 +55,7 @@ FWL_ERR CFWL_CaretImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Caret; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_CaretImp::GetClassID() const { +uint32_t CFWL_CaretImp::GetClassID() const { return FWL_CLASSHASH_Caret; } FWL_ERR CFWL_CaretImp::Initialize() { @@ -94,11 +94,11 @@ FWL_ERR CFWL_CaretImp::ShowCaret(FX_BOOL bFlag) { } return SetStates(FWL_WGTSTATE_Invisible, !bFlag); } -FWL_ERR CFWL_CaretImp::GetFrequency(FX_DWORD& elapse) { +FWL_ERR CFWL_CaretImp::GetFrequency(uint32_t& elapse) { elapse = m_dwElapse; return FWL_ERR_Succeeded; } -FWL_ERR CFWL_CaretImp::SetFrequency(FX_DWORD elapse) { +FWL_ERR CFWL_CaretImp::SetFrequency(uint32_t elapse) { m_dwElapse = elapse; return FWL_ERR_Succeeded; } diff --git a/xfa/fwl/basewidget/fwl_checkboximp.cpp b/xfa/fwl/basewidget/fwl_checkboximp.cpp index 8ab75562b9..d2d149ffd4 100644 --- a/xfa/fwl/basewidget/fwl_checkboximp.cpp +++ b/xfa/fwl/basewidget/fwl_checkboximp.cpp @@ -54,7 +54,7 @@ FWL_ERR CFWL_CheckBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_CheckBox; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_CheckBoxImp::GetClassID() const { +uint32_t CFWL_CheckBoxImp::GetClassID() const { return FWL_CLASSHASH_CheckBox; } FWL_ERR CFWL_CheckBoxImp::Initialize() { @@ -279,7 +279,7 @@ void CFWL_CheckBoxImp::Layout() { m_rtFocus.Inflate(1, 1); } } -FX_DWORD CFWL_CheckBoxImp::GetPartStates() { +uint32_t CFWL_CheckBoxImp::GetPartStates() { int32_t dwStates = FWL_PARTSTATE_CKB_UnChecked; if ((m_pProperties->m_dwStates & FWL_STATE_CKB_CheckMask) == FWL_STATE_CKB_Neutral) { @@ -355,7 +355,7 @@ void CFWL_CheckBoxImp::UpdateTextOutStyles() { } } void CFWL_CheckBoxImp::NextStates() { - FX_DWORD dwFirststate = m_pProperties->m_dwStates; + uint32_t dwFirststate = m_pProperties->m_dwStates; if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CKB_RadioButton) { if ((m_pProperties->m_dwStates & FWL_STATE_CKB_CheckMask) == FWL_STATE_CKB_Unchecked) { @@ -400,7 +400,7 @@ void CFWL_CheckBoxImp::NextStates() { } } Repaint(&m_rtClient); - FX_DWORD dwLaststate = m_pProperties->m_dwStates; + uint32_t dwLaststate = m_pProperties->m_dwStates; if (dwFirststate != dwLaststate) { CFWL_EvtCkbCheckStateChanged wmCheckBoxState; wmCheckBoxState.m_pSrcTarget = m_pInterface; @@ -412,7 +412,7 @@ CFWL_CheckBoxImpDelegate::CFWL_CheckBoxImpDelegate(CFWL_CheckBoxImp* pOwner) int32_t CFWL_CheckBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); int32_t iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_Activate: { @@ -426,7 +426,7 @@ int32_t CFWL_CheckBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); diff --git a/xfa/fwl/basewidget/fwl_comboboximp.cpp b/xfa/fwl/basewidget/fwl_comboboximp.cpp index 5404777e73..9d3a5db4c2 100644 --- a/xfa/fwl/basewidget/fwl_comboboximp.cpp +++ b/xfa/fwl/basewidget/fwl_comboboximp.cpp @@ -128,8 +128,8 @@ FX_BOOL IFWL_ComboBox::EditDeSelect() { FWL_ERR IFWL_ComboBox::GetBBox(CFX_RectF& rect) { return static_cast<CFWL_ComboBoxImp*>(GetImpl())->GetBBox(rect); } -FWL_ERR IFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR IFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { return static_cast<CFWL_ComboBoxImp*>(GetImpl()) ->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } @@ -145,7 +145,7 @@ CFWL_ComboEditImpDelegate::CFWL_ComboEditImpDelegate(CFWL_ComboEditImp* pOwner) int32_t CFWL_ComboEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); FX_BOOL backDefault = TRUE; switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: @@ -287,7 +287,7 @@ CFWL_ComboListImpDelegate::CFWL_ComboListImpDelegate(CFWL_ComboListImp* pOwner) int32_t CFWL_ComboListImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwHashCode = pMessage->GetClassID(); + uint32_t dwHashCode = pMessage->GetClassID(); FX_BOOL backDefault = TRUE; if (dwHashCode == FWL_MSGHASH_SetFocus || dwHashCode == FWL_MSGHASH_KillFocus) { @@ -305,7 +305,7 @@ int32_t CFWL_ComboListImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { return pDelegate->OnProcessMessage(pMsg); } } - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_MouseMove: { backDefault = FALSE; @@ -413,7 +413,7 @@ int32_t CFWL_ComboListImpDelegate::OnDropListKey(CFWL_MsgKey* pKey) { static_cast<CFWL_ComboBoxImp*>(m_pOwner->m_pOuter->GetImpl()); FX_BOOL bPropagate = FALSE; if (pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown) { - FX_DWORD dwKeyCode = pKey->m_dwKeyCode; + uint32_t dwKeyCode = pKey->m_dwKeyCode; switch (dwKeyCode) { case FWL_VKEY_Return: case FWL_VKEY_Escape: { @@ -440,7 +440,7 @@ int32_t CFWL_ComboListImpDelegate::OnDropListKey(CFWL_MsgKey* pKey) { return 0; } void CFWL_ComboListImpDelegate::OnDropListKeyDown(CFWL_MsgKey* pKey) { - FX_DWORD dwKeyCode = pKey->m_dwKeyCode; + uint32_t dwKeyCode = pKey->m_dwKeyCode; switch (dwKeyCode) { case FWL_VKEY_Up: case FWL_VKEY_Down: @@ -485,7 +485,7 @@ FWL_ERR CFWL_ComboBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ComboBox; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ComboBoxImp::GetClassID() const { +uint32_t CFWL_ComboBoxImp::GetClassID() const { return FWL_CLASSHASH_ComboBox; } FWL_ERR CFWL_ComboBoxImp::Initialize() { @@ -549,8 +549,8 @@ FWL_ERR CFWL_ComboBoxImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { } return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ComboBoxImp::ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_ComboBoxImp::ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { if (m_pWidgetMgr->IsFormDisabled()) { return DisForm_ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } @@ -590,7 +590,7 @@ FWL_ERR CFWL_ComboBoxImp::Update() { &part, FWL_WGTCAPACITY_CMB_ComboFormHandler)); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ComboBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_ComboBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (m_pWidgetMgr->IsFormDisabled()) { return DisForm_HitTest(fx, fy); } @@ -719,7 +719,7 @@ FWL_ERR CFWL_ComboBoxImp::SetCurSel(int32_t iSel) { m_iCurSel = bClearSel ? -1 : iSel; return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ComboBoxImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR CFWL_ComboBoxImp::SetStates(uint32_t dwStates, FX_BOOL bSet) { FX_BOOL bIsDropDown = IsDropDownStyle(); if (bIsDropDown && m_pEdit) { m_pEdit->SetStates(dwStates, bSet); @@ -863,8 +863,8 @@ FWL_ERR CFWL_ComboBoxImp::GetBBox(CFX_RectF& rect) { } return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ComboBoxImp::EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_ComboBoxImp::EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { if (m_pEdit != NULL) { return m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } else { @@ -904,7 +904,7 @@ void CFWL_ComboBoxImp::ShowDropList(FX_BOOL bActivate) { static_cast<CFWL_ComboListImp*>(m_pListBox->GetImpl()) ->ChangeSelected(m_iCurSel); ReSetListItemAlignment(); - FX_DWORD dwStyleAdd = m_pProperties->m_dwStyleExes & + uint32_t dwStyleAdd = m_pProperties->m_dwStyleExes & (FWL_STYLEEXT_CMB_Sort | FWL_STYLEEXT_CMB_OwnerDraw); m_pListBox->ModifyStylesEx(dwStyleAdd, 0); m_pListBox->GetWidgetRect(m_rtList, TRUE); @@ -1049,8 +1049,8 @@ void CFWL_ComboBoxImp::ReSetTheme() { void CFWL_ComboBoxImp::ReSetEditAlignment() { if (!m_pEdit) return; - FX_DWORD dwStylExes = m_pProperties->m_dwStyleExes; - FX_DWORD dwAdd = 0; + uint32_t dwStylExes = m_pProperties->m_dwStyleExes; + uint32_t dwAdd = 0; switch (dwStylExes & FWL_STYLEEXT_CMB_EditHAlignMask) { case FWL_STYLEEXT_CMB_EditHCenter: { dwAdd |= FWL_STYLEEXT_EDT_HCenter; @@ -1086,8 +1086,8 @@ void CFWL_ComboBoxImp::ReSetEditAlignment() { void CFWL_ComboBoxImp::ReSetListItemAlignment() { if (!m_pListBox) return; - FX_DWORD dwStylExes = m_pProperties->m_dwStyleExes; - FX_DWORD dwAdd = 0; + uint32_t dwStylExes = m_pProperties->m_dwStyleExes; + uint32_t dwAdd = 0; switch (dwStylExes & FWL_STYLEEXT_CMB_ListItemAlignMask) { case FWL_STYLEEXT_CMB_ListItemCenterAlign: { dwAdd |= FWL_STYLEEXT_LTB_CenterAlign; @@ -1224,8 +1224,8 @@ void CFWL_ComboBoxImp::DisForm_ShowDropList(FX_BOOL bActivate) { FX_BOOL CFWL_ComboBoxImp::DisForm_IsDropListShowed() { return !(m_pListBox->GetStates() & FWL_WGTSTATE_Invisible); } -FWL_ERR CFWL_ComboBoxImp::DisForm_ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_ComboBoxImp::DisForm_ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { if (!m_pEdit) { DisForm_InitComboEdit(); } @@ -1251,7 +1251,7 @@ FWL_ERR CFWL_ComboBoxImp::DisForm_Update() { Layout(); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ComboBoxImp::DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_ComboBoxImp::DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy) { CFX_RectF rect; rect.Set(0, 0, m_pProperties->m_rtWidget.width - m_rtBtn.width, m_pProperties->m_rtWidget.height); @@ -1366,7 +1366,7 @@ int32_t CFWL_ComboBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); FX_BOOL iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: @@ -1376,7 +1376,7 @@ int32_t CFWL_ComboBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); @@ -1408,7 +1408,7 @@ int32_t CFWL_ComboBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { return iRet; } FWL_ERR CFWL_ComboBoxImpDelegate::OnProcessEvent(CFWL_Event* pEvent) { - FX_DWORD dwFlag = pEvent->GetClassID(); + uint32_t dwFlag = pEvent->GetClassID(); if (dwFlag == FWL_EVTHASH_LTB_DrawItem) { CFWL_EvtLtbDrawItem* pDrawItemEvent = static_cast<CFWL_EvtLtbDrawItem*>(pEvent); @@ -1522,7 +1522,7 @@ void CFWL_ComboBoxImpDelegate::OnMouseLeave(CFWL_MsgMouse* pMsg) { } } void CFWL_ComboBoxImpDelegate::OnKey(CFWL_MsgKey* pMsg) { - FX_DWORD dwKeyCode = pMsg->m_dwKeyCode; + uint32_t dwKeyCode = pMsg->m_dwKeyCode; if (dwKeyCode == FWL_VKEY_Tab) { m_pOwner->DispatchKeyEvent(pMsg); return; @@ -1531,7 +1531,7 @@ void CFWL_ComboBoxImpDelegate::OnKey(CFWL_MsgKey* pMsg) { DoSubCtrlKey(pMsg); } void CFWL_ComboBoxImpDelegate::DoSubCtrlKey(CFWL_MsgKey* pMsg) { - FX_DWORD dwKeyCode = pMsg->m_dwKeyCode; + uint32_t dwKeyCode = pMsg->m_dwKeyCode; const bool bUp = dwKeyCode == FWL_VKEY_Up; const bool bDown = dwKeyCode == FWL_VKEY_Down; if (bUp || bDown) { @@ -1589,7 +1589,7 @@ int32_t CFWL_ComboBoxImpDelegate::DisForm_OnProcessMessage( CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); FX_BOOL backDefault = TRUE; switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: @@ -1601,7 +1601,7 @@ int32_t CFWL_ComboBoxImpDelegate::DisForm_OnProcessMessage( case FWL_MSGHASH_Mouse: { backDefault = FALSE; CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { DisForm_OnLButtonDown(pMsg); @@ -1623,7 +1623,7 @@ int32_t CFWL_ComboBoxImpDelegate::DisForm_OnProcessMessage( } if (m_pOwner->DisForm_IsDropListShowed() && pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown) { - FX_DWORD dwKeyCode = pKey->m_dwKeyCode; + uint32_t dwKeyCode = pKey->m_dwKeyCode; FX_BOOL bListKey = dwKeyCode == FWL_VKEY_Up || dwKeyCode == FWL_VKEY_Down || dwKeyCode == FWL_VKEY_Return || dwKeyCode == FWL_VKEY_Escape; @@ -1683,7 +1683,7 @@ void CFWL_ComboBoxImpDelegate::DisForm_OnFocusChanged(CFWL_Message* pMsg, } } void CFWL_ComboBoxImpDelegate::DisForm_OnKey(CFWL_MsgKey* pMsg) { - FX_DWORD dwKeyCode = pMsg->m_dwKeyCode; + uint32_t dwKeyCode = pMsg->m_dwKeyCode; const bool bUp = dwKeyCode == FWL_VKEY_Up; const bool bDown = dwKeyCode == FWL_VKEY_Down; if (bUp || bDown) { @@ -1738,10 +1738,10 @@ CFWL_ComboProxyImpDelegate::CFWL_ComboProxyImpDelegate( int32_t CFWL_ComboProxyImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); if (dwMsgCode == FWL_MSGHASH_Mouse) { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp index 70f76c607b..978fb619e2 100644 --- a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp @@ -147,8 +147,8 @@ FWL_ERR IFWL_DateTimePicker::GetBBox(CFX_RectF& rect) { FWL_ERR IFWL_DateTimePicker::SetEditLimit(int32_t nLimit) { return static_cast<CFWL_DateTimePickerImp*>(GetImpl())->SetEditLimit(nLimit); } -FWL_ERR IFWL_DateTimePicker::ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR IFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { return static_cast<CFWL_DateTimePickerImp*>(GetImpl()) ->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved); } @@ -173,7 +173,7 @@ int32_t CFWL_DateTimeEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) { return DisForm_OnProcessMessage(pMessage); } - FX_DWORD dwHashCode = pMessage->GetClassID(); + uint32_t dwHashCode = pMessage->GetClassID(); if (dwHashCode == FWL_MSGHASH_SetFocus || dwHashCode == FWL_MSGHASH_KillFocus) { IFWL_Widget* pOuter = m_pOwner->GetOuter(); @@ -184,7 +184,7 @@ int32_t CFWL_DateTimeEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } int32_t CFWL_DateTimeEditImpDelegate::DisForm_OnProcessMessage( CFWL_Message* pMessage) { - FX_DWORD dwHashCode = pMessage->GetClassID(); + uint32_t dwHashCode = pMessage->GetClassID(); if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) { if (dwHashCode == FWL_MSGHASH_Mouse) { CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage); @@ -232,7 +232,7 @@ CFWL_DateTimeCalendarImpDelegate::CFWL_DateTimeCalendarImpDelegate( } int32_t CFWL_DateTimeCalendarImpDelegate::OnProcessMessage( CFWL_Message* pMessage) { - FX_DWORD dwCode = pMessage->GetClassID(); + uint32_t dwCode = pMessage->GetClassID(); if (dwCode == FWL_MSGHASH_SetFocus || dwCode == FWL_MSGHASH_KillFocus) { IFWL_Widget* pOuter = m_pOwner->GetOuter(); IFWL_WidgetDelegate* pDelegate = pOuter->SetDelegate(NULL); @@ -431,7 +431,7 @@ FWL_ERR CFWL_DateTimePickerImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_DateTimePicker; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_DateTimePickerImp::GetClassID() const { +uint32_t CFWL_DateTimePickerImp::GetClassID() const { return FWL_CLASSHASH_DateTimePicker; } FWL_ERR CFWL_DateTimePickerImp::Initialize() { @@ -531,7 +531,7 @@ FWL_ERR CFWL_DateTimePickerImp::Update() { m_pMonthCal->Update(); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_DateTimePickerImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_DateTimePickerImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (m_pWidgetMgr->IsFormDisabled()) { return DisForm_HitTest(fx, fy); } @@ -675,8 +675,8 @@ FWL_ERR CFWL_DateTimePickerImp::GetBBox(CFX_RectF& rect) { FWL_ERR CFWL_DateTimePickerImp::SetEditLimit(int32_t nLimit) { return m_pEdit->SetLimit(nLimit); } -FWL_ERR CFWL_DateTimePickerImp::ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_DateTimePickerImp::ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { return m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } void CFWL_DateTimePickerImp::DrawDropDownButton(CFX_Graphics* pGraphics, @@ -755,8 +755,8 @@ FX_BOOL CFWL_DateTimePickerImp::IsMonthCalendarShowed() { void CFWL_DateTimePickerImp::ReSetEditAlignment() { if (!m_pEdit) return; - FX_DWORD dwStylExes = m_pProperties->m_dwStyleExes; - FX_DWORD dwAdd = 0; + uint32_t dwStylExes = m_pProperties->m_dwStyleExes; + uint32_t dwAdd = 0; switch (dwStylExes & FWL_STYLEEXT_DTP_EditHAlignMask) { case FWL_STYLEEXT_DTP_EditHCenter: { dwAdd |= FWL_STYLEEXT_EDT_HCenter; @@ -901,7 +901,7 @@ void CFWL_DateTimePickerImp::DisForm_ShowMonthCalendar(FX_BOOL bActivate) { rtInvalidate.Inflate(2, 2); Repaint(&rtInvalidate); } -FX_DWORD CFWL_DateTimePickerImp::DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_DateTimePickerImp::DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy) { CFX_RectF rect; rect.Set(0, 0, m_pProperties->m_rtWidget.width, m_pProperties->m_rtWidget.height); @@ -1018,7 +1018,7 @@ int32_t CFWL_DateTimePickerImpDelegate::OnProcessMessage( CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: case FWL_MSGHASH_KillFocus: { @@ -1027,7 +1027,7 @@ int32_t CFWL_DateTimePickerImpDelegate::OnProcessMessage( } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMouse->m_dwCmd; + uint32_t dwCmd = pMouse->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMouse); diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 237e461917..e60650f450 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -155,7 +155,7 @@ FWL_ERR IFWL_Edit::SetOuter(IFWL_Widget* pOuter) { FWL_ERR IFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax) { return static_cast<CFWL_EditImp*>(GetImpl())->SetNumberRange(iMin, iMax); } -FWL_ERR IFWL_Edit::SetBackColor(FX_DWORD dwColor) { +FWL_ERR IFWL_Edit::SetBackColor(uint32_t dwColor) { return static_cast<CFWL_EditImp*>(GetImpl())->SetBackgroundColor(dwColor); } FWL_ERR IFWL_Edit::SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize) { @@ -210,7 +210,7 @@ FWL_ERR CFWL_EditImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Edit; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_EditImp::GetClassID() const { +uint32_t CFWL_EditImp::GetClassID() const { return FWL_CLASSHASH_Edit; } FWL_ERR CFWL_EditImp::Initialize() { @@ -273,7 +273,7 @@ FWL_ERR CFWL_EditImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { } return FWL_ERR_Succeeded; } -FWL_ERR CFWL_EditImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR CFWL_EditImp::SetStates(uint32_t dwStates, FX_BOOL bSet) { if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Invisible) || (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)) { ShowCaret(FALSE); @@ -300,7 +300,7 @@ FWL_ERR CFWL_EditImp::Update() { InitCaret(); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_EditImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_EditImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) { if (IsShowScrollBar(TRUE)) { CFX_RectF rect; @@ -798,7 +798,7 @@ void CFWL_EditImp::On_CaretChanged(IFDE_TxtEdtEngine* pEdit, } void CFWL_EditImp::On_TextChanged(IFDE_TxtEdtEngine* pEdit, FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo) { - FX_DWORD dwStyleEx = m_pProperties->m_dwStyleExes; + uint32_t dwStyleEx = m_pProperties->m_dwStyleExes; if (dwStyleEx & FWL_STYLEEXT_EDT_VAlignMask) { UpdateVAlignment(); } @@ -922,7 +922,7 @@ FX_BOOL CFWL_EditImp::On_Validate(IFDE_TxtEdtEngine* pEdit, DispatchEvent(&event); return event.bValidate; } -FWL_ERR CFWL_EditImp::SetBackgroundColor(FX_DWORD color) { +FWL_ERR CFWL_EditImp::SetBackgroundColor(uint32_t color) { m_backColor = color; m_updateBackColor = TRUE; return FWL_ERR_Succeeded; @@ -945,7 +945,7 @@ void CFWL_EditImp::DrawTextBk(CFX_Graphics* pGraphics, param.m_dwStates = m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly ? FWL_PARTSTATE_EDT_ReadOnly : FWL_PARTSTATE_EDT_Normal; - FX_DWORD dwStates = (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled); + uint32_t dwStates = (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled); if (dwStates) { param.m_dwStates = FWL_PARTSTATE_EDT_Disable; } @@ -1166,8 +1166,8 @@ void CFWL_EditImp::UpdateEditParams() { if (!pFontSize) return; m_fFontSize = *pFontSize; - FX_DWORD* pFontColor = - static_cast<FX_DWORD*>(GetThemeCapacity(FWL_WGTCAPACITY_TextColor)); + uint32_t* pFontColor = + static_cast<uint32_t*>(GetThemeCapacity(FWL_WGTCAPACITY_TextColor)); if (!pFontColor) return; params.dwFontColor = *pFontColor; @@ -1738,7 +1738,7 @@ CFWL_EditImpDelegate::CFWL_EditImpDelegate(CFWL_EditImp* pOwner) int32_t CFWL_EditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); int32_t iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_Activate: { @@ -1756,7 +1756,7 @@ int32_t CFWL_EditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); @@ -1784,7 +1784,7 @@ int32_t CFWL_EditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Key: { CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage); - FX_DWORD dwCmd = pKey->m_dwCmd; + uint32_t dwCmd = pKey->m_dwCmd; if (dwCmd == FWL_MSGKEYCMD_KeyDown) { OnKeyDown(pKey); } else if (dwCmd == FWL_MSGKEYCMD_Char) { @@ -1800,7 +1800,7 @@ int32_t CFWL_EditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { FWL_ERR CFWL_EditImpDelegate::OnProcessEvent(CFWL_Event* pEvent) { if (!pEvent) return FWL_ERR_Indefinite; - FX_DWORD dwHashCode = pEvent->GetClassID(); + uint32_t dwHashCode = pEvent->GetClassID(); if (dwHashCode != FWL_EVTHASH_Scroll) { return FWL_ERR_Succeeded; } @@ -1847,7 +1847,7 @@ void CFWL_EditImpDelegate::DoButtonDown(CFWL_MsgMouse* pMsg) { m_pOwner->m_pEdtEngine->SetCaretPos(nIndex, bBefore); } void CFWL_EditImpDelegate::OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet) { - FX_DWORD dwStyleEx = m_pOwner->GetStylesEx(); + uint32_t dwStyleEx = m_pOwner->GetStylesEx(); FX_BOOL bRepaint = dwStyleEx & FWL_STYLEEXT_EDT_InnerCaret; if (bSet) { m_pOwner->m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused; @@ -1964,7 +1964,7 @@ void CFWL_EditImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) { FDE_TXTEDTMOVECARET MoveCaret = MC_MoveNone; FX_BOOL bShift = pMsg->m_dwFlags & FWL_KEYFLAG_Shift; FX_BOOL bCtrl = pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl; - FX_DWORD dwKeyCode = pMsg->m_dwKeyCode; + uint32_t dwKeyCode = pMsg->m_dwKeyCode; switch (dwKeyCode) { case FWL_VKEY_Left: { MoveCaret = MC_Left; @@ -2109,7 +2109,7 @@ void CFWL_EditImpDelegate::OnChar(CFWL_MsgKey* pMsg) { } } FX_BOOL CFWL_EditImpDelegate::OnScroll(IFWL_ScrollBar* pScrollBar, - FX_DWORD dwCode, + uint32_t dwCode, FX_FLOAT fPos) { CFX_SizeF fs; pScrollBar->GetRange(fs.x, fs.y); diff --git a/xfa/fwl/basewidget/fwl_formproxyimp.cpp b/xfa/fwl/basewidget/fwl_formproxyimp.cpp index 51f3507707..27a608795b 100644 --- a/xfa/fwl/basewidget/fwl_formproxyimp.cpp +++ b/xfa/fwl/basewidget/fwl_formproxyimp.cpp @@ -20,7 +20,7 @@ FWL_ERR CFWL_FormProxyImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_FormProxy; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_FormProxyImp::GetClassID() const { +uint32_t CFWL_FormProxyImp::GetClassID() const { return FWL_CLASSHASH_FormProxy; } FX_BOOL CFWL_FormProxyImp::IsInstance(const CFX_WideStringC& wsClass) const { diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp index ad5800142c..24b29d6ac0 100644 --- a/xfa/fwl/basewidget/fwl_listboximp.cpp +++ b/xfa/fwl/basewidget/fwl_listboximp.cpp @@ -80,7 +80,7 @@ FWL_ERR CFWL_ListBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ListBox; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ListBoxImp::GetClassID() const { +uint32_t CFWL_ListBoxImp::GetClassID() const { return FWL_CLASSHASH_ListBox; } FWL_ERR CFWL_ListBoxImp::Initialize() { @@ -143,7 +143,7 @@ FWL_ERR CFWL_ListBoxImp::Update() { CalcSize(); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ListBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_ListBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (IsShowScrollBar(FALSE)) { CFX_RectF rect; m_pHorzScrollBar->GetWidgetRect(rect); @@ -217,7 +217,7 @@ int32_t CFWL_ListBoxImp::CountSelItems() { if (!hItem) { continue; } - FX_DWORD dwStyle = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem); if (dwStyle & FWL_ITEMSTATE_LTB_Selected) { iRet++; } @@ -236,7 +236,7 @@ FWL_HLISTITEM CFWL_ListBoxImp::GetSelItem(int32_t nIndexSel) { if (!hItem) { return NULL; } - FX_DWORD dwStyle = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem); if (dwStyle & FWL_ITEMSTATE_LTB_Selected) { if (index == nIndexSel) { return hItem; @@ -259,7 +259,7 @@ int32_t CFWL_ListBoxImp::GetSelIndex(int32_t nIndex) { if (!hItem) { return -1; } - FX_DWORD dwStyle = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem); if (dwStyle & FWL_ITEMSTATE_LTB_Selected) { if (index == nIndex) { return i; @@ -327,7 +327,7 @@ FWL_ERR* CFWL_ListBoxImp::Sort(IFWL_ListBoxCompare* pCom) { return FWL_ERR_Succeeded; } FWL_HLISTITEM CFWL_ListBoxImp::GetItem(FWL_HLISTITEM hItem, - FX_DWORD dwKeyCode) { + uint32_t dwKeyCode) { FWL_HLISTITEM hRet = NULL; switch (dwKeyCode) { case FWL_VKEY_Up: @@ -383,7 +383,7 @@ void CFWL_ListBoxImp::SetSelection(FWL_HLISTITEM hStart, void CFWL_ListBoxImp::SetSelectionDirect(FWL_HLISTITEM hItem, FX_BOOL bSelect) { IFWL_ListBoxDP* pData = static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider); - FX_DWORD dwOldStyle = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwOldStyle = pData->GetItemStyles(m_pInterface, hItem); bSelect ? dwOldStyle |= FWL_ITEMSTATE_LTB_Selected : dwOldStyle &= ~FWL_ITEMSTATE_LTB_Selected; pData->SetItemStyles(m_pInterface, hItem, dwOldStyle); @@ -391,7 +391,7 @@ void CFWL_ListBoxImp::SetSelectionDirect(FWL_HLISTITEM hItem, FX_BOOL bSelect) { FX_BOOL CFWL_ListBoxImp::IsItemSelected(FWL_HLISTITEM hItem) { IFWL_ListBoxDP* pData = static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider); - FX_DWORD dwState = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwState = pData->GetItemStyles(m_pInterface, hItem); return (dwState & FWL_ITEMSTATE_LTB_Selected) != 0; } void CFWL_ListBoxImp::ClearSelection() { @@ -402,7 +402,7 @@ void CFWL_ListBoxImp::ClearSelection() { int32_t iCount = pData->CountItems(m_pInterface); for (int32_t i = 0; i < iCount; i++) { FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i); - FX_DWORD dwState = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwState = pData->GetItemStyles(m_pInterface, hItem); FX_BOOL bFindSel = dwState & FWL_ITEMSTATE_LTB_Selected; if (!bFindSel) { continue; @@ -448,12 +448,12 @@ void CFWL_ListBoxImp::SetFocusItem(FWL_HLISTITEM hItem) { FWL_HLISTITEM hFocus = GetFocusedItem(); if (hItem != hFocus) { if (hFocus) { - FX_DWORD dwStyle = pData->GetItemStyles(m_pInterface, hFocus); + uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hFocus); dwStyle &= ~FWL_ITEMSTATE_LTB_Focused; pData->SetItemStyles(m_pInterface, hFocus, dwStyle); } if (hItem) { - FX_DWORD dwStyle = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem); dwStyle |= FWL_ITEMSTATE_LTB_Focused; pData->SetItemStyles(m_pInterface, hItem, dwStyle); } @@ -629,8 +629,8 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { IFWL_ListBoxDP* pData = static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider); - FX_DWORD dwItemStyles = pData->GetItemStyles(m_pInterface, hItem); - FX_DWORD dwPartStates = FWL_PARTSTATE_LTB_Normal; + uint32_t dwItemStyles = pData->GetItemStyles(m_pInterface, hItem); + uint32_t dwPartStates = FWL_PARTSTATE_LTB_Normal; if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) { dwPartStates = FWL_PARTSTATE_LTB_Disabled; } else if (dwItemStyles & FWL_ITEMSTATE_LTB_Selected) { @@ -651,7 +651,7 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics, param.m_pGraphics = pGraphics; param.m_matrix.Concat(*pMatrix); param.m_rtPart = rtItem; - param.m_dwData = (FX_DWORD)(uintptr_t)(&itemData); + param.m_dwData = (uint32_t)(uintptr_t)(&itemData); CFX_RectF rtFocus(rtItem); param.m_pData = &rtFocus; if (m_pVertScrollBar && !m_pHorzScrollBar && @@ -675,7 +675,7 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics, param.m_pGraphics = pGraphics; param.m_matrix.Concat(*pMatrix); param.m_rtPart = rtDIB; - param.m_dwData = (FX_DWORD)(uintptr_t)(&itemData); + param.m_dwData = (uint32_t)(uintptr_t)(&itemData); param.m_pImage = pDib; pTheme->DrawBackground(¶m); } @@ -697,7 +697,7 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics, } param.m_matrix.Concat(*pMatrix); param.m_rtPart = rtCheck; - param.m_dwData = (FX_DWORD)(uintptr_t)(&itemData); + param.m_dwData = (uint32_t)(uintptr_t)(&itemData); pTheme->DrawBackground(¶m); } CFX_WideString wsText; @@ -720,7 +720,7 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics, textParam.m_wsText = wsText; textParam.m_dwTTOStyles = m_dwTTOStyles; textParam.m_iTTOAlign = m_iTTOAligns; - textParam.m_dwData = (FX_DWORD)(uintptr_t)(&itemData); + textParam.m_dwData = (uint32_t)(uintptr_t)(&itemData); pTheme->DrawText(&textParam); } } @@ -990,7 +990,7 @@ int32_t CFWL_ListBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!m_pOwner->IsEnabled()) { return 1; } - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); int32_t iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: @@ -1000,7 +1000,7 @@ int32_t CFWL_ListBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); @@ -1131,7 +1131,7 @@ void CFWL_ListBoxImpDelegate::OnMouseWheel(CFWL_MsgMouseWheel* pMsg) { pDelegate->OnProcessMessage(pMsg); } void CFWL_ListBoxImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) { - FX_DWORD dwKeyCode = pMsg->m_dwKeyCode; + uint32_t dwKeyCode = pMsg->m_dwKeyCode; switch (dwKeyCode) { case FWL_VKEY_Tab: case FWL_VKEY_Up: @@ -1182,7 +1182,7 @@ void CFWL_ListBoxImpDelegate::OnVK(FWL_HLISTITEM hItem, } } FX_BOOL CFWL_ListBoxImpDelegate::OnScroll(IFWL_ScrollBar* pScrollBar, - FX_DWORD dwCode, + uint32_t dwCode, FX_FLOAT fPos) { CFX_SizeF fs; pScrollBar->GetRange(fs.x, fs.y); diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp index 7106601b68..d55144a805 100644 --- a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp @@ -93,7 +93,7 @@ FWL_ERR CFWL_MonthCalendarImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_MonthCalendar; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_MonthCalendarImp::GetClassID() const { +uint32_t CFWL_MonthCalendarImp::GetClassID() const { return FWL_CLASSHASH_MonthCalendar; } FWL_ERR CFWL_MonthCalendarImp::Initialize() { @@ -513,7 +513,7 @@ CFX_SizeF CFWL_MonthCalendarImp::CalcSize(FX_BOOL bAutoSize) { CFX_WideString* wsText = NULL; FX_FLOAT fMaxWeekW = 0.0f; FX_FLOAT fMaxWeekH = 0.0f; - for (FX_DWORD week = FWL_MCCAPACITY_Sun; week <= FWL_MCCAPACITY_Sat; week++) { + for (uint32_t week = FWL_MCCAPACITY_Sun; week <= FWL_MCCAPACITY_Sat; week++) { wsText = static_cast<CFX_WideString*>(pTheme->GetCapacity(¶ms, week)); CFX_SizeF sz = CalcTextSize(*wsText, m_pProperties->m_pThemeProvider); fMaxWeekW = (fMaxWeekW >= sz.x) ? fMaxWeekW : sz.x; @@ -536,7 +536,7 @@ CFX_SizeF CFWL_MonthCalendarImp::CalcSize(FX_BOOL bAutoSize) { MONTHCAL_HEADER_BTN_HMARGIN * 2; FX_FLOAT fMonthMaxW = 0.0f; FX_FLOAT fMonthMaxH = 0.0f; - for (FX_DWORD month = FWL_MCCAPACITY_January; + for (uint32_t month = FWL_MCCAPACITY_January; month <= FWL_MCCAPACITY_December; month++) { wsText = static_cast<CFX_WideString*>(pTheme->GetCapacity(¶ms, month)); CFX_SizeF sz = CalcTextSize(*wsText, m_pProperties->m_pThemeProvider); @@ -773,7 +773,7 @@ void CFWL_MonthCalendarImp::ReSetDateItem() { } CFX_WideString wsDay; wsDay.Format(L"%d", i + 1); - FX_DWORD dwStates = 0; + uint32_t dwStates = 0; if (m_iYear == m_iCurYear && m_iMonth == m_iCurMonth && m_iDay == (i + 1)) { dwStates |= FWL_ITEMSTATE_MCD_Flag; } @@ -929,7 +929,7 @@ int32_t CFWL_MonthCalendarImpDelegate::OnProcessMessage( CFWL_Message* pMessage) { if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); int32_t iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: @@ -942,7 +942,7 @@ int32_t CFWL_MonthCalendarImpDelegate::OnProcessMessage( } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMouse->m_dwCmd; + uint32_t dwCmd = pMouse->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMouse); diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.cpp b/xfa/fwl/basewidget/fwl_pictureboximp.cpp index a9dd440ccd..f1b72b8ee4 100644 --- a/xfa/fwl/basewidget/fwl_pictureboximp.cpp +++ b/xfa/fwl/basewidget/fwl_pictureboximp.cpp @@ -40,7 +40,7 @@ FWL_ERR CFWL_PictureBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_PictureBox; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_PictureBoxImp::GetClassID() const { +uint32_t CFWL_PictureBoxImp::GetClassID() const { return FWL_CLASSHASH_PictureBox; } FWL_ERR CFWL_PictureBoxImp::Initialize() { diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp index cb6f99de7c..89654d0271 100644 --- a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp @@ -44,7 +44,7 @@ FWL_ERR CFWL_PushButtonImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_PushButton; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_PushButtonImp::GetClassID() const { +uint32_t CFWL_PushButtonImp::GetClassID() const { return FWL_CLASSHASH_PushButton; } FWL_ERR CFWL_PushButtonImp::Initialize() { @@ -84,7 +84,7 @@ FWL_ERR CFWL_PushButtonImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { } return FWL_ERR_Succeeded; } -FWL_ERR CFWL_PushButtonImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR CFWL_PushButtonImp::SetStates(uint32_t dwStates, FX_BOOL bSet) { if ((dwStates & FWL_WGTSTATE_Disabled) && bSet) { m_pProperties->m_dwStates = FWL_WGTSTATE_Disabled; return FWL_ERR_Succeeded; @@ -335,8 +335,8 @@ void CFWL_PushButtonImp::DrawText(CFX_Graphics* pGraphics, param.m_iTTOAlign = m_iTTOAlign; pTheme->DrawText(¶m); } -FX_DWORD CFWL_PushButtonImp::GetPartStates() { - FX_DWORD dwStates = FWL_PARTSTATE_PSB_Normal; +uint32_t CFWL_PushButtonImp::GetPartStates() { + uint32_t dwStates = FWL_PARTSTATE_PSB_Normal; if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) { dwStates |= FWL_PARTSTATE_PSB_Focused; } @@ -408,7 +408,7 @@ int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { return 1; } int32_t iRet = 1; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: case FWL_MSGHASH_KillFocus: { @@ -417,7 +417,7 @@ int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); diff --git a/xfa/fwl/basewidget/fwl_scrollbarimp.cpp b/xfa/fwl/basewidget/fwl_scrollbarimp.cpp index ad41d82be2..23bda25d58 100644 --- a/xfa/fwl/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/fwl/basewidget/fwl_scrollbarimp.cpp @@ -62,7 +62,7 @@ FX_FLOAT IFWL_ScrollBar::GetTrackPos() { FWL_ERR IFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) { return static_cast<CFWL_ScrollBarImp*>(GetImpl())->SetTrackPos(fTrackPos); } -FX_BOOL IFWL_ScrollBar::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos) { +FX_BOOL IFWL_ScrollBar::DoScroll(uint32_t dwCode, FX_FLOAT fPos) { return static_cast<CFWL_ScrollBarImp*>(GetImpl())->DoScroll(dwCode, fPos); } CFWL_ScrollBarImp::CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties, @@ -104,7 +104,7 @@ FWL_ERR CFWL_ScrollBarImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ScrollBar; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ScrollBarImp::GetClassID() const { +uint32_t CFWL_ScrollBarImp::GetClassID() const { return FWL_CLASSHASH_ScrollBar; } FWL_ERR CFWL_ScrollBarImp::Initialize() { @@ -210,7 +210,7 @@ FWL_ERR CFWL_ScrollBarImp::SetTrackPos(FX_FLOAT fTrackPos) { CalcMaxTrackRect(m_rtMaxTrack); return FWL_ERR_Succeeded; } -FX_BOOL CFWL_ScrollBarImp::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos) { +FX_BOOL CFWL_ScrollBarImp::DoScroll(uint32_t dwCode, FX_FLOAT fPos) { switch (dwCode) { case FWL_SCBCODE_Min: case FWL_SCBCODE_Max: @@ -615,7 +615,7 @@ FX_BOOL CFWL_ScrollBarImp::SendEvent() { } return TRUE; } -FX_BOOL CFWL_ScrollBarImp::OnScroll(FX_DWORD dwCode, FX_FLOAT fPos) { +FX_BOOL CFWL_ScrollBarImp::OnScroll(uint32_t dwCode, FX_FLOAT fPos) { FX_BOOL bRet = TRUE; CFWL_EvtScroll ev; ev.m_iScrollCode = dwCode; @@ -631,10 +631,10 @@ int32_t CFWL_ScrollBarImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; int32_t iRet = 1; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); if (dwMsgCode == FWL_MSGHASH_Mouse) { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg->m_dwFlags, pMsg->m_fx, pMsg->m_fy); @@ -667,7 +667,7 @@ FWL_ERR CFWL_ScrollBarImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { return m_pOwner->DrawWidget(pGraphics, pMatrix); } -void CFWL_ScrollBarImpDelegate::OnLButtonDown(FX_DWORD dwFlags, +void CFWL_ScrollBarImpDelegate::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) { if (!m_pOwner->IsEnabled()) { @@ -703,7 +703,7 @@ void CFWL_ScrollBarImpDelegate::OnLButtonDown(FX_DWORD dwFlags, m_pOwner->m_hTimer = FWL_StartTimer(m_pOwner, FWL_SCROLLBAR_Elapse); } } -void CFWL_ScrollBarImpDelegate::OnLButtonUp(FX_DWORD dwFlags, +void CFWL_ScrollBarImpDelegate::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) { FWL_StopTimer(m_pOwner->m_hTimer); @@ -715,7 +715,7 @@ void CFWL_ScrollBarImpDelegate::OnLButtonUp(FX_DWORD dwFlags, DoMouseUp(4, m_pOwner->m_rtMaxTrack, m_pOwner->m_iMaxTrackState, fx, fy); m_pOwner->SetGrab(FALSE); } -void CFWL_ScrollBarImpDelegate::OnMouseMove(FX_DWORD dwFlags, +void CFWL_ScrollBarImpDelegate::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) { DoMouseMove(0, m_pOwner->m_rtMinBtn, m_pOwner->m_iMinButtonState, fx, fy); @@ -733,7 +733,7 @@ void CFWL_ScrollBarImpDelegate::OnMouseLeave() { } void CFWL_ScrollBarImpDelegate::OnMouseWheel(FX_FLOAT fx, FX_FLOAT fy, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fDeltaX, FX_FLOAT fDeltaY) { m_pOwner->m_iMouseWheel = (int32_t)fDeltaX; diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp b/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp index bc11d8fdf1..9f276b7281 100644 --- a/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp @@ -60,7 +60,7 @@ FWL_ERR CFWL_SpinButtonImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_SpinButton; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_SpinButtonImp::GetClassID() const { +uint32_t CFWL_SpinButtonImp::GetClassID() const { return FWL_CLASSHASH_SpinButton; } FWL_ERR CFWL_SpinButtonImp::Initialize() { @@ -101,7 +101,7 @@ FWL_ERR CFWL_SpinButtonImp::Update() { } return FWL_ERR_Succeeded; } -FX_DWORD CFWL_SpinButtonImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_SpinButtonImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (m_rtClient.Contains(fx, fy)) { return FWL_WGTHITTEST_Client; } @@ -208,7 +208,7 @@ int32_t CFWL_SpinButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (!pMessage) return 0; int32_t iRet = 1; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: case FWL_MSGHASH_KillFocus: { @@ -217,7 +217,7 @@ int32_t CFWL_SpinButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { } case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); - FX_DWORD dwCmd = pMsg->m_dwCmd; + uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { case FWL_MSGMOUSECMD_LButtonDown: { OnLButtonDown(pMsg); diff --git a/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp b/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp index 584e6c3ae8..97ead0e44c 100644 --- a/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp @@ -63,7 +63,7 @@ FWL_ERR CFWL_ToolTipImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ToolTip; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ToolTipImp::GetClassID() const { +uint32_t CFWL_ToolTipImp::GetClassID() const { return FWL_CLASSHASH_ToolTip; } FWL_ERR CFWL_ToolTipImp::Initialize() { @@ -226,7 +226,7 @@ FWL_ERR CFWL_ToolTipImp::Hide() { } return TRUE; } -FWL_ERR CFWL_ToolTipImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR CFWL_ToolTipImp::SetStates(uint32_t dwStates, FX_BOOL bSet) { if ((dwStates & FWL_WGTSTATE_Invisible) && !bSet) { IFWL_ToolTipDP* pData = static_cast<IFWL_ToolTipDP*>(m_pProperties->m_pDataProvider); diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp index 83176550eb..f7fc301d97 100644 --- a/xfa/fwl/core/fwl_formimp.cpp +++ b/xfa/fwl/core/fwl_formimp.cpp @@ -49,7 +49,7 @@ FWL_ERR IFWL_Form::SetFormSize(FWL_FORMSIZE eFormSize) { IFWL_Widget* IFWL_Form::DoModal() { return static_cast<CFWL_FormImp*>(GetImpl())->DoModal(); } -IFWL_Widget* IFWL_Form::DoModal(FX_DWORD& dwCommandID) { +IFWL_Widget* IFWL_Form::DoModal(uint32_t& dwCommandID) { return static_cast<CFWL_FormImp*>(GetImpl())->DoModal(dwCommandID); } FWL_ERR IFWL_Form::EndDoModal() { @@ -96,7 +96,7 @@ FWL_ERR CFWL_FormImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Form; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_FormImp::GetClassID() const { +uint32_t CFWL_FormImp::GetClassID() const { return FWL_CLASSHASH_Form; } FX_BOOL CFWL_FormImp::IsInstance(const CFX_WideStringC& wsClass) const { @@ -194,7 +194,7 @@ FWL_ERR CFWL_FormImp::Update() { Layout(); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_FormImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_FormImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { (void)GetAvailableTheme(); if (m_pCloseBox && m_pCloseBox->m_rtBtn.Contains(fx, fy)) { return FWL_WGTHITTEST_CloseBox; @@ -407,7 +407,7 @@ IFWL_Widget* CFWL_FormImp::DoModal() { m_pNoteLoop = NULL; return NULL; } -IFWL_Widget* CFWL_FormImp::DoModal(FX_DWORD& dwCommandID) { +IFWL_Widget* CFWL_FormImp::DoModal(uint32_t& dwCommandID) { return DoModal(); } FWL_ERR CFWL_FormImp::EndDoModal() { @@ -458,7 +458,7 @@ void CFWL_FormImp::SetAccelerator(CFX_MapAccelerators* pAccelerators) { if (!pAccelerators) return; m_mapAccelerators.RemoveAll(); - FX_DWORD vrKey, rValue; + uint32_t vrKey, rValue; FX_POSITION pos = pAccelerators->GetStartPosition(); while (pos) { pAccelerators->GetNextAssoc(pos, vrKey, rValue); @@ -526,7 +526,7 @@ CFWL_SysBtn* CFWL_FormImp::GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy) { } return NULL; } -CFWL_SysBtn* CFWL_FormImp::GetSysBtnByState(FX_DWORD dwState) { +CFWL_SysBtn* CFWL_FormImp::GetSysBtnByState(uint32_t dwState) { if (m_pCloseBox && (m_pCloseBox->m_dwState & dwState)) { return m_pCloseBox; } @@ -571,7 +571,7 @@ int32_t CFWL_FormImp::GetSysBtnIndex(CFWL_SysBtn* pBtn) { return arrBtn.Find(pBtn); } FX_FLOAT CFWL_FormImp::GetCaptionHeight() { - FX_DWORD dwCapacity = 0; + uint32_t dwCapacity = 0; if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Caption) { dwCapacity = FWL_WGTCAPACITY_FRM_CYCaption; } else if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_NarrowCaption) { @@ -879,7 +879,7 @@ int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { #ifdef FWL_UseMacSystemBorder if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); switch (dwMsgCode) { case FWL_MSGHASH_Activate: { m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated; @@ -896,7 +896,7 @@ int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { #else if (!pMessage) return 0; - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); int32_t iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_Activate: { diff --git a/xfa/fwl/core/fwl_gridimp.cpp b/xfa/fwl/core/fwl_gridimp.cpp index 9ff1949b38..77e4c245cd 100644 --- a/xfa/fwl/core/fwl_gridimp.cpp +++ b/xfa/fwl/core/fwl_gridimp.cpp @@ -168,7 +168,7 @@ FWL_ERR CFWL_GridImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Grid; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_GridImp::GetClassID() const { +uint32_t CFWL_GridImp::GetClassID() const { return FWL_CLASSHASH_Grid; } FWL_ERR CFWL_GridImp::Initialize() { diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp index 72dd9ecff2..dbb9a95286 100644 --- a/xfa/fwl/core/fwl_noteimp.cpp +++ b/xfa/fwl/core/fwl_noteimp.cpp @@ -76,11 +76,11 @@ FX_BOOL CFWL_NoteLoop::TranslateAccelerator(CFWL_Message* pMessage) { if (!pos) { return FALSE; } - FX_DWORD vrKey, rValue; + uint32_t vrKey, rValue; while (pos) { accel.GetNextAssoc(pos, vrKey, rValue); - FX_DWORD dwFlags = (vrKey & 0xFF00) >> 8; - FX_DWORD m_dwKeyCode = vrKey & 0x00FF; + uint32_t dwFlags = (vrKey & 0xFF00) >> 8; + uint32_t m_dwKeyCode = vrKey & 0x00FF; if (pMsgKey->m_dwFlags == dwFlags && pMsgKey->m_dwKeyCode == m_dwKeyCode) { GenerateCommondEvent(rValue); return TRUE; @@ -92,7 +92,7 @@ FWL_ERR CFWL_NoteLoop::SetMainForm(CFWL_WidgetImp* pForm) { m_pForm = pForm; return FWL_ERR_Succeeded; } -void CFWL_NoteLoop::GenerateCommondEvent(FX_DWORD dwCommand) { +void CFWL_NoteLoop::GenerateCommondEvent(uint32_t dwCommand) { CFWL_EvtMenuCommand ev; ev.m_iCommand = dwCommand; IFWL_NoteThread* pThread = m_pForm->GetOwnerThread(); @@ -165,8 +165,8 @@ FX_BOOL CFWL_NoteDriver::SendNote(CFWL_Note* pNote) { #define FWL_NoteDriver_EventKey 1100 FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget* pListener, IFWL_Widget* pEventSource, - FX_DWORD dwFilter) { - FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData( + uint32_t dwFilter) { + uint32_t dwkey = (uint32_t)(uintptr_t)pListener->GetPrivateData( (void*)(uintptr_t)FWL_NoteDriver_EventKey); if (dwkey == 0) { void* random = FX_Random_MT_Start(0); @@ -184,7 +184,7 @@ FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget* pListener, return FWL_ERR_Succeeded; } FWL_ERR CFWL_NoteDriver::UnregisterEventTarget(IFWL_Widget* pListener) { - FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData( + uint32_t dwkey = (uint32_t)(uintptr_t)pListener->GetPrivateData( (void*)(uintptr_t)FWL_NoteDriver_EventKey); if (dwkey == 0) { return FWL_ERR_Indefinite; @@ -847,7 +847,7 @@ CFWL_EventTarget::~CFWL_EventTarget() { m_eventSources.RemoveAll(); } int32_t CFWL_EventTarget::SetEventSource(IFWL_Widget* pSource, - FX_DWORD dwFilter) { + uint32_t dwFilter) { if (pSource) { m_eventSources.SetAt(pSource, dwFilter); return m_eventSources.GetCount(); @@ -865,7 +865,7 @@ FX_BOOL CFWL_EventTarget::ProcessEvent(CFWL_Event* pEvent) { FX_POSITION pos = m_eventSources.GetStartPosition(); while (pos) { IFWL_Widget* pSource = NULL; - FX_DWORD dwFilter = 0; + uint32_t dwFilter = 0; m_eventSources.GetNextAssoc(pos, (void*&)pSource, dwFilter); if (pSource == pEvent->m_pSrcTarget || pEvent->GetClassID() == FWL_EVTHASH_Idle) { @@ -877,7 +877,7 @@ FX_BOOL CFWL_EventTarget::ProcessEvent(CFWL_Event* pEvent) { } return FALSE; } -FX_BOOL CFWL_EventTarget::IsFilterEvent(CFWL_Event* pEvent, FX_DWORD dwFilter) { +FX_BOOL CFWL_EventTarget::IsFilterEvent(CFWL_Event* pEvent, uint32_t dwFilter) { if (dwFilter == FWL_EVENT_ALL_MASK) { return TRUE; } diff --git a/xfa/fwl/core/fwl_panelimp.cpp b/xfa/fwl/core/fwl_panelimp.cpp index 3d1bf9a84d..fce89fb465 100644 --- a/xfa/fwl/core/fwl_panelimp.cpp +++ b/xfa/fwl/core/fwl_panelimp.cpp @@ -42,7 +42,7 @@ FWL_ERR CFWL_PanelImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Panel; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_PanelImp::GetClassID() const { +uint32_t CFWL_PanelImp::GetClassID() const { return FWL_CLASSHASH_Panel; } FWL_ERR CFWL_PanelImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { diff --git a/xfa/fwl/core/fwl_sdadapterimp.cpp b/xfa/fwl/core/fwl_sdadapterimp.cpp index 1d69defcac..2e9d740e40 100644 --- a/xfa/fwl/core/fwl_sdadapterimp.cpp +++ b/xfa/fwl/core/fwl_sdadapterimp.cpp @@ -86,7 +86,7 @@ FWL_ERR CFWL_SDAdapterWidgetMgr::SetBorderRegion(IFWL_Widget* pWidget, return FWL_ERR_Succeeded; } FWL_ERR CFWL_SDAdapterWidgetMgr::SetTransparent(IFWL_Widget* pWidget, - FX_DWORD dwAlpha) { + uint32_t dwAlpha) { return FWL_ERR_Succeeded; } FWL_ERR CFWL_SDAdapterWidgetMgr::SetFullScreen(IFWL_Widget* pWidget, @@ -113,7 +113,7 @@ FWL_ERR CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget* pWidget, void* CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget* pWidget) { return NULL; } -FX_DWORD CFWL_SDAdapterWidgetMgr::GetKeyState(FX_DWORD dwVirtKey) { +uint32_t CFWL_SDAdapterWidgetMgr::GetKeyState(uint32_t dwVirtKey) { return 0; } FWL_ERR CFWL_SDAdapterWidgetMgr::RunLoop(IFWL_Widget* widget) { diff --git a/xfa/fwl/core/fwl_targetimp.cpp b/xfa/fwl/core/fwl_targetimp.cpp index d1f92d0307..e3e768085a 100644 --- a/xfa/fwl/core/fwl_targetimp.cpp +++ b/xfa/fwl/core/fwl_targetimp.cpp @@ -9,7 +9,7 @@ FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const { return m_pImpl->GetClassName(wsClass); } -FX_DWORD IFWL_Target::GetClassID() const { +uint32_t IFWL_Target::GetClassID() const { return m_pImpl->GetClassID(); } FX_BOOL IFWL_Target::IsInstance(const CFX_WideStringC& wsClass) const { @@ -30,7 +30,7 @@ FWL_ERR CFWL_TargetImp::GetClassName(CFX_WideString& wsClass) const { wsClass.Empty(); return FWL_ERR_Succeeded; } -FX_DWORD CFWL_TargetImp::GetClassID() const { +uint32_t CFWL_TargetImp::GetClassID() const { return 0; } FX_BOOL CFWL_TargetImp::IsInstance(const CFX_WideStringC& wsClass) const { diff --git a/xfa/fwl/core/fwl_timerimp.cpp b/xfa/fwl/core/fwl_timerimp.cpp index b9cb478a18..1dfed0c584 100644 --- a/xfa/fwl/core/fwl_timerimp.cpp +++ b/xfa/fwl/core/fwl_timerimp.cpp @@ -13,7 +13,7 @@ #include "xfa/fwl/core/include/ifwl_adaptertimermgr.h" FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer, - FX_DWORD dwElapse, + uint32_t dwElapse, FX_BOOL bImmediately) { IFWL_AdapterNative* pAdapterNative = FWL_GetAdapterNative(); if (!pAdapterNative) diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp index fdc192756d..961b60e172 100644 --- a/xfa/fwl/core/fwl_widgetimp.cpp +++ b/xfa/fwl/core/fwl_widgetimp.cpp @@ -61,26 +61,26 @@ FWL_ERR IFWL_Widget::SetOwner(IFWL_Widget* pOwner) { IFWL_Widget* IFWL_Widget::GetOuter() { return static_cast<CFWL_WidgetImp*>(GetImpl())->GetOuter(); } -FX_DWORD IFWL_Widget::GetStyles() { +uint32_t IFWL_Widget::GetStyles() { return static_cast<CFWL_WidgetImp*>(GetImpl())->GetStyles(); } -FWL_ERR IFWL_Widget::ModifyStyles(FX_DWORD dwStylesAdded, - FX_DWORD dwStylesRemoved) { +FWL_ERR IFWL_Widget::ModifyStyles(uint32_t dwStylesAdded, + uint32_t dwStylesRemoved) { return static_cast<CFWL_WidgetImp*>(GetImpl()) ->ModifyStyles(dwStylesAdded, dwStylesRemoved); } -FX_DWORD IFWL_Widget::GetStylesEx() { +uint32_t IFWL_Widget::GetStylesEx() { return static_cast<CFWL_WidgetImp*>(GetImpl())->GetStylesEx(); } -FWL_ERR IFWL_Widget::ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR IFWL_Widget::ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { return static_cast<CFWL_WidgetImp*>(GetImpl()) ->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } -FX_DWORD IFWL_Widget::GetStates() { +uint32_t IFWL_Widget::GetStates() { return static_cast<CFWL_WidgetImp*>(GetImpl())->GetStates(); } -FWL_ERR IFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR IFWL_Widget::SetStates(uint32_t dwStates, FX_BOOL bSet) { return static_cast<CFWL_WidgetImp*>(GetImpl())->SetStates(dwStates, bSet); } FWL_ERR IFWL_Widget::SetPrivateData(void* module_id, @@ -101,7 +101,7 @@ FWL_ERR IFWL_Widget::LockUpdate() { FWL_ERR IFWL_Widget::UnlockUpdate() { return static_cast<CFWL_WidgetImp*>(GetImpl())->UnlockUpdate(); } -FX_DWORD IFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t IFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) { return static_cast<CFWL_WidgetImp*>(GetImpl())->HitTest(fx, fy); } FWL_ERR IFWL_Widget::TransformTo(IFWL_Widget* pWidget, @@ -258,25 +258,25 @@ FWL_ERR CFWL_WidgetImp::SetOwner(IFWL_Widget* pOwner) { IFWL_Widget* CFWL_WidgetImp::GetOuter() { return m_pOuter; } -FX_DWORD CFWL_WidgetImp::GetStyles() { +uint32_t CFWL_WidgetImp::GetStyles() { return m_pProperties->m_dwStyles; } -FWL_ERR CFWL_WidgetImp::ModifyStyles(FX_DWORD dwStylesAdded, - FX_DWORD dwStylesRemoved) { +FWL_ERR CFWL_WidgetImp::ModifyStyles(uint32_t dwStylesAdded, + uint32_t dwStylesRemoved) { m_pProperties->m_dwStyles = (m_pProperties->m_dwStyles & ~dwStylesRemoved) | dwStylesAdded; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_WidgetImp::GetStylesEx() { +uint32_t CFWL_WidgetImp::GetStylesEx() { return m_pProperties->m_dwStyleExes; } -FWL_ERR CFWL_WidgetImp::ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_WidgetImp::ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { m_pProperties->m_dwStyleExes = (m_pProperties->m_dwStyleExes & ~dwStylesExRemoved) | dwStylesExAdded; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_WidgetImp::GetStates() { +uint32_t CFWL_WidgetImp::GetStates() { return m_pProperties->m_dwStates; } static void NotifyHideChildWidget(IFWL_WidgetMgr* widgetMgr, @@ -289,7 +289,7 @@ static void NotifyHideChildWidget(IFWL_WidgetMgr* widgetMgr, child = widgetMgr->GetWidget(child, FWL_WGTRELATION_NextSibling); } } -FWL_ERR CFWL_WidgetImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR CFWL_WidgetImp::SetStates(uint32_t dwStates, FX_BOOL bSet) { bSet ? (m_pProperties->m_dwStates |= dwStates) : (m_pProperties->m_dwStates &= ~dwStates); FWL_ERR ret = FWL_ERR_Succeeded; @@ -340,7 +340,7 @@ FWL_ERR CFWL_WidgetImp::UnlockUpdate() { } return FWL_ERR_Succeeded; } -FX_DWORD CFWL_WidgetImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_WidgetImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) { CFX_RectF rtClient; GetClientRect(rtClient); if (rtClient.Contains(fx, fy)) { @@ -592,7 +592,7 @@ FX_FLOAT CFWL_WidgetImp::GetBorderSize(FX_BOOL bCX) { return *pfBorder; } FX_FLOAT CFWL_WidgetImp::GetEdgeWidth() { - FX_DWORD dwCapacity = 0; + uint32_t dwCapacity = 0; switch (m_pProperties->m_dwStyles & FWL_WGTSTYLE_EdgeMask) { case FWL_WGTSTYLE_EdgeFlat: { dwCapacity = FWL_WGTCAPACITY_EdgeFlat; @@ -617,7 +617,7 @@ void CFWL_WidgetImp::GetRelativeRect(CFX_RectF& rect) { rect = m_pProperties->m_rtWidget; rect.left = rect.top = 0; } -void* CFWL_WidgetImp::GetThemeCapacity(FX_DWORD dwCapacity) { +void* CFWL_WidgetImp::GetThemeCapacity(uint32_t dwCapacity) { IFWL_ThemeProvider* pTheme = GetAvailableTheme(); if (!pTheme) return NULL; @@ -680,7 +680,7 @@ CFX_SizeF CFWL_WidgetImp::CalcTextSize(const CFX_WideString& wsText, } void CFWL_WidgetImp::CalcTextRect(const CFX_WideString& wsText, IFWL_ThemeProvider* pTheme, - FX_DWORD dwTTOStyles, + uint32_t dwTTOStyles, int32_t iTTOAlign, CFX_RectF& rect) { CFWL_ThemeText calPart; @@ -823,7 +823,7 @@ FX_BOOL CFWL_WidgetImp::GetScreenSize(FX_FLOAT& fx, FX_FLOAT& fy) { return FALSE; } void CFWL_WidgetImp::RegisterEventTarget(IFWL_Widget* pEventSource, - FX_DWORD dwFilter) { + uint32_t dwFilter) { IFWL_NoteThread* pThread = GetOwnerThread(); if (!pThread) return; @@ -969,7 +969,7 @@ int32_t CFWL_WidgetImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { return 0; CFWL_WidgetImp* pWidget = static_cast<CFWL_WidgetImp*>(pMessage->m_pDstTarget->GetImpl()); - FX_DWORD dwMsgCode = pMessage->GetClassID(); + uint32_t dwMsgCode = pMessage->GetClassID(); switch (dwMsgCode) { case FWL_MSGHASH_Mouse: { CFWL_MsgMouse* pMsgMouse = static_cast<CFWL_MsgMouse*>(pMessage); @@ -1089,11 +1089,11 @@ void FWL_SetWidgetRect(IFWL_Widget* widget, const CFX_RectF& rect) { static_cast<CFWL_WidgetImp*>(widget->GetImpl())->m_pProperties->m_rtWidget = rect; } -void FWL_SetWidgetStates(IFWL_Widget* widget, FX_DWORD dwStates) { +void FWL_SetWidgetStates(IFWL_Widget* widget, uint32_t dwStates) { static_cast<CFWL_WidgetImp*>(widget->GetImpl())->m_pProperties->m_dwStates = dwStates; } -void FWL_SetWidgetStyles(IFWL_Widget* widget, FX_DWORD dwStyles) { +void FWL_SetWidgetStyles(IFWL_Widget* widget, uint32_t dwStyles) { static_cast<CFWL_WidgetImp*>(widget->GetImpl())->m_pProperties->m_dwStyles = dwStyles; } diff --git a/xfa/fwl/core/fwl_widgetmgrimp.cpp b/xfa/fwl/core/fwl_widgetmgrimp.cpp index 9a9b2d6f24..97a3cbc1f1 100644 --- a/xfa/fwl/core/fwl_widgetmgrimp.cpp +++ b/xfa/fwl/core/fwl_widgetmgrimp.cpp @@ -664,7 +664,7 @@ FX_BOOL CFWL_WidgetMgr::IsAbleNative(IFWL_Widget* pWidget) { if (!pWidget->IsInstance(FX_WSTRC(FWL_CLASS_Form))) { return FALSE; } - FX_DWORD dwStyles = pWidget->GetStyles(); + uint32_t dwStyles = pWidget->GetStyles(); return ((dwStyles & FWL_WGTSTYLE_WindowTypeMask) == FWL_WGTSTYLE_OverLapper) || (dwStyles & FWL_WGTSTYLE_Popup); @@ -686,7 +686,7 @@ FX_BOOL CFWL_WidgetMgr::GetAdapterPopupPos(IFWL_Widget* pWidget, } CFWL_WidgetMgrDelegate::CFWL_WidgetMgrDelegate(CFWL_WidgetMgr* pWidgetMgr) : m_pWidgetMgr(pWidgetMgr) {} -FWL_ERR CFWL_WidgetMgrDelegate::OnSetCapability(FX_DWORD dwCapability) { +FWL_ERR CFWL_WidgetMgrDelegate::OnSetCapability(uint32_t dwCapability) { m_pWidgetMgr->m_dwCapability = dwCapability; return FWL_ERR_Succeeded; } diff --git a/xfa/fwl/lightwidget/caret.cpp b/xfa/fwl/lightwidget/caret.cpp index 5415aa5560..9c2b90b22a 100644 --- a/xfa/fwl/lightwidget/caret.cpp +++ b/xfa/fwl/lightwidget/caret.cpp @@ -35,10 +35,10 @@ FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) { FWL_ERR CFWL_Caret::ShowCaret(FX_BOOL bFlag) { return static_cast<IFWL_Caret*>(m_pIface)->ShowCaret(bFlag); } -FWL_ERR CFWL_Caret::GetFrequency(FX_DWORD& elapse) { +FWL_ERR CFWL_Caret::GetFrequency(uint32_t& elapse) { return static_cast<IFWL_Caret*>(m_pIface)->GetFrequency(elapse); } -FWL_ERR CFWL_Caret::SetFrequency(FX_DWORD elapse) { +FWL_ERR CFWL_Caret::SetFrequency(uint32_t elapse) { return static_cast<IFWL_Caret*>(m_pIface)->SetFrequency(elapse); } FWL_ERR CFWL_Caret::SetColor(CFX_Color crFill) { diff --git a/xfa/fwl/lightwidget/combobox.cpp b/xfa/fwl/lightwidget/combobox.cpp index 7ea1370341..65b1081832 100644 --- a/xfa/fwl/lightwidget/combobox.cpp +++ b/xfa/fwl/lightwidget/combobox.cpp @@ -230,8 +230,8 @@ FWL_ERR CFWL_ComboBox::GetBBox(CFX_RectF& rect) { return FALSE; return static_cast<IFWL_ComboBox*>(m_pIface)->GetBBox(rect); } -FWL_ERR CFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { if (!m_pIface) return FALSE; return static_cast<IFWL_ComboBox*>(m_pIface) @@ -272,7 +272,7 @@ FX_BOOL CFWL_ComboBox::CFWL_ComboBoxDP::SetItemIndex(IFWL_Widget* pWidget, m_ItemArray[nIndex].reset(reinterpret_cast<CFWL_ComboBoxItem*>(hItem)); return TRUE; } -FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemStyles(IFWL_Widget* pWidget, +uint32_t CFWL_ComboBox::CFWL_ComboBoxDP::GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) { if (!hItem) return 0; @@ -305,7 +305,7 @@ void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget* pWidget, } FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle) { + uint32_t dwStyle) { if (!hItem) return FWL_ERR_Indefinite; reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_dwStyles = dwStyle; @@ -351,7 +351,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckRect( pItem->m_rtCheckBox = rtCheck; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckState( +uint32_t CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckState( IFWL_Widget* pWidget, FWL_HLISTITEM hItem) { CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem); @@ -360,7 +360,7 @@ FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckState( FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckState( IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState) { + uint32_t dwCheckState) { CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem); pItem->m_dwCheckState = dwCheckState; return FWL_ERR_Succeeded; diff --git a/xfa/fwl/lightwidget/datetimepicker.cpp b/xfa/fwl/lightwidget/datetimepicker.cpp index 3372c53829..a3ace90c2d 100644 --- a/xfa/fwl/lightwidget/datetimepicker.cpp +++ b/xfa/fwl/lightwidget/datetimepicker.cpp @@ -136,8 +136,8 @@ FWL_ERR CFWL_DateTimePicker::GetBBox(CFX_RectF& rect) { FWL_ERR CFWL_DateTimePicker::SetEditLimit(int32_t nLimit) { return static_cast<IFWL_DateTimePicker*>(m_pIface)->SetEditLimit(nLimit); } -FWL_ERR CFWL_DateTimePicker::ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { return static_cast<IFWL_DateTimePicker*>(m_pIface) ->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved); } diff --git a/xfa/fwl/lightwidget/edit.cpp b/xfa/fwl/lightwidget/edit.cpp index 612d5a4ac2..efceb4e39f 100644 --- a/xfa/fwl/lightwidget/edit.cpp +++ b/xfa/fwl/lightwidget/edit.cpp @@ -161,7 +161,7 @@ FWL_ERR CFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax) { } return static_cast<IFWL_Edit*>(m_pIface)->SetNumberRange(iMin, iMax); } -FWL_ERR CFWL_Edit::SetBackColor(FX_DWORD dwColor) { +FWL_ERR CFWL_Edit::SetBackColor(uint32_t dwColor) { if (!m_pIface) return FWL_ERR_Indefinite; return static_cast<IFWL_Edit*>(m_pIface)->SetBackColor(dwColor); diff --git a/xfa/fwl/lightwidget/listbox.cpp b/xfa/fwl/lightwidget/listbox.cpp index 6a7a26cd1b..7913727775 100644 --- a/xfa/fwl/lightwidget/listbox.cpp +++ b/xfa/fwl/lightwidget/listbox.cpp @@ -174,7 +174,7 @@ FWL_HLISTITEM CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) { } return NULL; } -FX_DWORD CFWL_ListBox::GetItemStates(FWL_HLISTITEM hItem) { +uint32_t CFWL_ListBox::GetItemStates(FWL_HLISTITEM hItem) { if (!hItem) return 0; CFWL_ListItem* pItem = reinterpret_cast<CFWL_ListItem*>(hItem); @@ -216,7 +216,7 @@ FX_BOOL CFWL_ListBox::CFWL_ListBoxDP::SetItemIndex(IFWL_Widget* pWidget, m_ItemArray[nIndex].reset(reinterpret_cast<CFWL_ListItem*>(hItem)); return TRUE; } -FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemStyles(IFWL_Widget* pWidget, +uint32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) { if (!hItem) return -1; @@ -248,7 +248,7 @@ void* CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget* pWidget, } FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle) { + uint32_t dwStyle) { if (!hItem) return FWL_ERR_Indefinite; reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwStates = dwStyle; @@ -290,13 +290,13 @@ FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckRect( reinterpret_cast<CFWL_ListItem*>(hItem)->m_rtCheckBox = rtCheck; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckState(IFWL_Widget* pWidget, +uint32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) { return reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwCheckState; } FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState) { + uint32_t dwCheckState) { reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwCheckState = dwCheckState; return FWL_ERR_Succeeded; } diff --git a/xfa/fwl/lightwidget/scrollbar.cpp b/xfa/fwl/lightwidget/scrollbar.cpp index a070483183..62f2ffd1e5 100644 --- a/xfa/fwl/lightwidget/scrollbar.cpp +++ b/xfa/fwl/lightwidget/scrollbar.cpp @@ -84,7 +84,7 @@ FWL_ERR CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) { return FWL_ERR_Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->SetTrackPos(fTrackPos); } -FX_BOOL CFWL_ScrollBar::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos) { +FX_BOOL CFWL_ScrollBar::DoScroll(uint32_t dwCode, FX_FLOAT fPos) { if (!m_pIface) return FALSE; return static_cast<IFWL_ScrollBar*>(m_pIface)->DoScroll(dwCode, fPos); diff --git a/xfa/fwl/lightwidget/theme.cpp b/xfa/fwl/lightwidget/theme.cpp index 950d70e944..59729c1b2d 100644 --- a/xfa/fwl/lightwidget/theme.cpp +++ b/xfa/fwl/lightwidget/theme.cpp @@ -49,14 +49,14 @@ FX_BOOL CFWL_Theme::IsValidWidget(IFWL_Widget* pWidget) { return !!GetTheme(pWidget); } -FX_DWORD CFWL_Theme::GetThemeID(IFWL_Widget* pWidget) { +uint32_t CFWL_Theme::GetThemeID(IFWL_Widget* pWidget) { return GetTheme(pWidget)->GetThemeID(pWidget); } -FX_DWORD CFWL_Theme::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_Theme::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { - FX_DWORD dwID; + uint32_t dwID; for (const auto& pTheme : m_ThemesArray) { dwID = pTheme->GetThemeID(pWidget); pTheme->SetThemeID(pWidget, dwThemeID, FALSE); @@ -81,7 +81,7 @@ FX_BOOL CFWL_Theme::DrawText(CFWL_ThemeText* pParams) { return GetTheme(pParams->m_pWidget)->DrawText(pParams); } -void* CFWL_Theme::GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity) { +void* CFWL_Theme::GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity) { return GetTheme(pThemePart->m_pWidget)->GetCapacity(pThemePart, dwCapacity); } diff --git a/xfa/fwl/lightwidget/widget.cpp b/xfa/fwl/lightwidget/widget.cpp index ae1f147502..294604a01b 100644 --- a/xfa/fwl/lightwidget/widget.cpp +++ b/xfa/fwl/lightwidget/widget.cpp @@ -39,7 +39,7 @@ FWL_ERR CFWL_Widget::GetClassName(CFX_WideString& wsClass) const { return FWL_ERR_Indefinite; return m_pIface->GetClassName(wsClass); } -FX_DWORD CFWL_Widget::GetClassID() const { +uint32_t CFWL_Widget::GetClassID() const { if (!m_pIface) return 0; return m_pIface->GetClassID(); @@ -99,32 +99,32 @@ FWL_ERR CFWL_Widget::SetOwner(CFWL_Widget* pOwner) { return FWL_ERR_Indefinite; return FWL_ERR_Succeeded; } -FX_DWORD CFWL_Widget::GetStyles() { +uint32_t CFWL_Widget::GetStyles() { if (!m_pIface) return 0; return m_pIface->GetStyles(); } -FWL_ERR CFWL_Widget::ModifyStyles(FX_DWORD dwStylesAdded, - FX_DWORD dwStylesRemoved) { +FWL_ERR CFWL_Widget::ModifyStyles(uint32_t dwStylesAdded, + uint32_t dwStylesRemoved) { if (!m_pIface) return FWL_ERR_Indefinite; return m_pIface->ModifyStyles(dwStylesAdded, dwStylesRemoved); } -FX_DWORD CFWL_Widget::GetStylesEx() { +uint32_t CFWL_Widget::GetStylesEx() { if (!m_pIface) return 0; return m_pIface->GetStylesEx(); } -FWL_ERR CFWL_Widget::ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved) { +FWL_ERR CFWL_Widget::ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) { return m_pIface->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } -FX_DWORD CFWL_Widget::GetStates() { +uint32_t CFWL_Widget::GetStates() { if (!m_pIface) return FWL_ERR_Indefinite; return m_pIface->GetStates(); } -FWL_ERR CFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet) { +FWL_ERR CFWL_Widget::SetStates(uint32_t dwStates, FX_BOOL bSet) { if (!m_pIface) return FWL_ERR_Indefinite; return m_pIface->SetStates(dwStates, bSet); @@ -156,7 +156,7 @@ FWL_ERR CFWL_Widget::UnlockUpdate() { return FWL_ERR_Indefinite; return m_pIface->UnlockUpdate(); } -FX_DWORD CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) { +uint32_t CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (!m_pIface) return 0; return m_pIface->HitTest(fx, fy); @@ -251,7 +251,7 @@ FWL_ERR CFWL_Widget::SetGrab(FX_BOOL bSet) { return FWL_ERR_Succeeded; } void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource, - FX_DWORD dwFilter) { + uint32_t dwFilter) { if (!m_pIface) return; IFWL_NoteThread* pThread = m_pIface->GetOwnerThread(); diff --git a/xfa/fwl/theme/carettp.cpp b/xfa/fwl/theme/carettp.cpp index b1cf5ef65a..a5782f30b6 100644 --- a/xfa/fwl/theme/carettp.cpp +++ b/xfa/fwl/theme/carettp.cpp @@ -37,7 +37,7 @@ FX_BOOL CFWL_CaretTP::DrawBackground(CFWL_ThemeBackground* pParams) { return TRUE; } void CFWL_CaretTP::DrawCaretBK(CFX_Graphics* pGraphics, - FX_DWORD dwStates, + uint32_t dwStates, const CFX_RectF* pRect, CFX_Color* crFill, CFX_Matrix* pMatrix) { diff --git a/xfa/fwl/theme/checkboxtp.cpp b/xfa/fwl/theme/checkboxtp.cpp index e7d206a1a0..ee485fb7ac 100644 --- a/xfa/fwl/theme/checkboxtp.cpp +++ b/xfa/fwl/theme/checkboxtp.cpp @@ -41,8 +41,8 @@ CFWL_CheckBoxTP::~CFWL_CheckBoxTP() { FX_BOOL CFWL_CheckBoxTP::IsValidWidget(IFWL_Widget* pWidget) { return pWidget && pWidget->GetClassID() == FWL_CLASSHASH_CheckBox; } -FX_DWORD CFWL_CheckBoxTP::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_CheckBoxTP::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { if (m_pThemeData) { SetThemeData(FWL_GetThemeColor(dwThemeID)); @@ -111,11 +111,11 @@ FWL_ERR CFWL_CheckBoxTP::Finalize() { void CFWL_CheckBoxTP::DrawBoxBk(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, const CFX_RectF* pRect, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix) { dwStates &= 0x03; int32_t fillMode = FXFILL_WINDING; - FX_DWORD dwStyleEx = pWidget->GetStylesEx(); + uint32_t dwStyleEx = pWidget->GetStylesEx(); dwStyleEx &= FWL_STYLEEXT_CKB_ShapeMask; CFX_Path path; path.Create(); @@ -176,11 +176,11 @@ void CFWL_CheckBoxTP::DrawBoxBk(IFWL_Widget* pWidget, void CFWL_CheckBoxTP::DrawSign(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, const CFX_RectF* pRtBox, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix) { CFX_RectF rtSign(*pRtBox); rtSign.Deflate(CHECKBOX_SIZE_SIGNMARGIN, CHECKBOX_SIZE_SIGNMARGIN); - FX_DWORD dwColor = m_pThemeData->clrSignCheck; + uint32_t dwColor = m_pThemeData->clrSignCheck; FX_BOOL bCheck = TRUE; if (((dwStates & FWL_PARTSTATE_CKB_Mask1) == FWL_PARTSTATE_CKB_Disabled) && ((dwStates & FWL_PARTSTATE_CKB_Mask2) == FWL_PARTSTATE_CKB_Checked)) { @@ -209,7 +209,7 @@ void CFWL_CheckBoxTP::DrawSign(IFWL_Widget* pWidget, } } if (bCheck) { - FX_DWORD dwStyle = pWidget->GetStylesEx(); + uint32_t dwStyle = pWidget->GetStylesEx(); switch (dwStyle & FWL_STYLEEXT_CKB_SignShapeMask) { case FWL_STYLEEXT_CKB_SignShapeCheck: { DrawSignCheck(pGraphics, &rtSign, dwColor, pMatrix); @@ -393,8 +393,8 @@ void CFWL_CheckBoxTP::DrawSignBorder(IFWL_Widget* pWidget, } } } -void CFWL_CheckBoxTP::SetThemeData(FX_DWORD dwID) { - FX_DWORD* pData = (FX_DWORD*)&m_pThemeData->clrBoxBk; +void CFWL_CheckBoxTP::SetThemeData(uint32_t dwID) { + uint32_t* pData = (uint32_t*)&m_pThemeData->clrBoxBk; if (dwID) { *pData++ = 0, *pData++ = 0, *pData++ = ArgbEncode(255, 220, 220, 215), *pData++ = ArgbEncode(255, 255, 255, 255), diff --git a/xfa/fwl/theme/comboboxtp.cpp b/xfa/fwl/theme/comboboxtp.cpp index 23b1320fe3..578793b002 100644 --- a/xfa/fwl/theme/comboboxtp.cpp +++ b/xfa/fwl/theme/comboboxtp.cpp @@ -72,7 +72,7 @@ FX_BOOL CFWL_ComboBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { return TRUE; } void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix) { CFX_Path path; path.Create(); @@ -83,7 +83,7 @@ void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground* pParams, pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, &pParams->m_matrix); } void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) { + uint32_t dwCapacity) { if (dwCapacity == FWL_WGTCAPACITY_CMB_ComboFormHandler) { m_fValue = FWLTHEME_CAPACITY_ComboFormHandler; return &m_fValue; @@ -92,7 +92,7 @@ void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart* pThemePart, } #ifdef THEME_XPSimilar void CFWL_ComboBoxTP::DrawDropDownButton(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix) { FWLTHEME_STATE eState = FWLTHEME_STATE_Normal; switch (dwStates) { @@ -119,7 +119,7 @@ void CFWL_ComboBoxTP::DrawDropDownButton(CFWL_ThemeBackground* pParams, } #else void CFWL_ComboBoxTP::DrawDropDownButton(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix) { FX_BOOL bPressed = ((pParams->m_dwStates & FWL_CMBPARTSTATE_Pressed) == FWL_CMBPARTSTATE_Pressed); diff --git a/xfa/fwl/theme/datetimepickertp.cpp b/xfa/fwl/theme/datetimepickertp.cpp index 99c5ccb448..63fbc13110 100644 --- a/xfa/fwl/theme/datetimepickertp.cpp +++ b/xfa/fwl/theme/datetimepickertp.cpp @@ -45,7 +45,7 @@ FX_BOOL CFWL_DateTimePickerTP::DrawBackground(CFWL_ThemeBackground* pParams) { #ifdef THEME_XPSimilar void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - FX_DWORD dwStates = pParams->m_dwStates; + uint32_t dwStates = pParams->m_dwStates; dwStates &= 0x03; FWLTHEME_STATE eState = FWLTHEME_STATE_Normal; switch (eState & dwStates) { @@ -111,7 +111,7 @@ void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams, } #endif void CFWL_DateTimePickerTP::initThemeData() { - FX_DWORD* pData = (FX_DWORD*)&m_pThemeData->BoxBkColor; + uint32_t* pData = (uint32_t*)&m_pThemeData->BoxBkColor; *pData++ = 0, *pData++ = 0, *pData++ = ArgbEncode(255, 220, 220, 215), *pData++ = ArgbEncode(255, 255, 255, 255), *pData++ = ArgbEncode(255, 255, 240, 207), diff --git a/xfa/fwl/theme/formtp.cpp b/xfa/fwl/theme/formtp.cpp index 67ef025f7e..28a8805dee 100644 --- a/xfa/fwl/theme/formtp.cpp +++ b/xfa/fwl/theme/formtp.cpp @@ -62,11 +62,11 @@ FWL_ERR CFWL_FormTP::Finalize() { FX_BOOL CFWL_FormTP::IsValidWidget(IFWL_Widget* pWidget) { if (!pWidget) return FALSE; - FX_DWORD dwHash = pWidget->GetClassID(); + uint32_t dwHash = pWidget->GetClassID(); return dwHash == FWL_CLASSHASH_Form; } -FX_DWORD CFWL_FormTP::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_FormTP::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { if (m_pThemeData) { SetThemeData(FWL_GetThemeColor(dwThemeID)); @@ -159,7 +159,7 @@ FX_BOOL CFWL_FormTP::DrawText(CFWL_ThemeText* pParams) { return CFWL_WidgetTP::DrawText(pParams); } void* CFWL_FormTP::GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) { + uint32_t dwCapacity) { FX_BOOL bDefPro = FALSE; FX_BOOL bDwordVal = FALSE; switch (dwCapacity) { @@ -230,7 +230,7 @@ FWL_ERR CFWL_FormTP::GetPartRect(CFWL_ThemePart* pThemePart, return FWL_ERR_Succeeded; } void CFWL_FormTP::CalCloseBox(IFWL_Widget* pWidget, CFX_RectF& rect) { - FX_DWORD dwStyles = pWidget->GetStyles(); + uint32_t dwStyles = pWidget->GetStyles(); CFX_RectF rtWidget; pWidget->GetWidgetRect(rtWidget); rtWidget.Offset(-rtWidget.left, -rtWidget.top); @@ -244,7 +244,7 @@ void CFWL_FormTP::CalCloseBox(IFWL_Widget* pWidget, CFX_RectF& rect) { } } void CFWL_FormTP::CalMaxBox(IFWL_Widget* pWidget, CFX_RectF& rect) { - FX_DWORD dwStyles = pWidget->GetStyles(); + uint32_t dwStyles = pWidget->GetStyles(); CFX_RectF rtWidget; pWidget->GetWidgetRect(rtWidget); rtWidget.Offset(-rtWidget.left, -rtWidget.top); @@ -260,7 +260,7 @@ void CFWL_FormTP::CalMaxBox(IFWL_Widget* pWidget, CFX_RectF& rect) { } } void CFWL_FormTP::CalMinBox(IFWL_Widget* pWidget, CFX_RectF& rect) { - FX_DWORD dwStyles = pWidget->GetStyles(); + uint32_t dwStyles = pWidget->GetStyles(); CFX_RectF rtWidget; pWidget->GetWidgetRect(rtWidget); rtWidget.Offset(-rtWidget.left, -rtWidget.top); @@ -578,7 +578,7 @@ void CFWL_FormTP::DrawIconImage(CFX_Graphics* pGraphics, int32_t iActive) { pGraphics->StretchImage(pDIBitmap, *pRect, pMatrix); } -void CFWL_FormTP::SetThemeData(FX_DWORD dwID) { +void CFWL_FormTP::SetThemeData(uint32_t dwID) { m_pThemeData->clrTransWhite = ArgbEncode(0x65, 255, 255, 255); m_pThemeData->clrCloseBtBKStart[0][0] = ArgbEncode(0xff, 240, 166, 148); m_pThemeData->clrCloseBtBKEnd[0][0] = ArgbEncode(0xff, 228, 61, 5); diff --git a/xfa/fwl/theme/listboxtp.cpp b/xfa/fwl/theme/listboxtp.cpp index 0022e06f50..5c38166afa 100644 --- a/xfa/fwl/theme/listboxtp.cpp +++ b/xfa/fwl/theme/listboxtp.cpp @@ -53,7 +53,7 @@ FX_BOOL CFWL_ListBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { break; } case FWL_PART_LTB_Check: { - FX_DWORD color = 0xFF000000; + uint32_t color = 0xFF000000; if (pParams->m_dwStates == FWL_PARTSTATE_LTB_Checked) { color = 0xFFFF0000; } else if (pParams->m_dwStates == FWL_PARTSTATE_LTB_UnChecked) { @@ -75,7 +75,7 @@ FWL_ERR CFWL_ListBoxTP::Finalize() { return CFWL_WidgetTP::Finalize(); } void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics* pGraphics, - FX_DWORD dwStates, + uint32_t dwStates, const CFX_RectF* prtItem, void* pData, CFX_Matrix* pMatrix) { diff --git a/xfa/fwl/theme/monthcalendartp.cpp b/xfa/fwl/theme/monthcalendartp.cpp index 832adde73a..2ae154860a 100644 --- a/xfa/fwl/theme/monthcalendartp.cpp +++ b/xfa/fwl/theme/monthcalendartp.cpp @@ -71,8 +71,8 @@ FX_BOOL CFWL_MonthCalendarTP::IsValidWidget(IFWL_Widget* pWidget) { return FALSE; return pWidget->GetClassID() == FWL_CLASSHASH_MonthCalendar; } -FX_DWORD CFWL_MonthCalendarTP::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_MonthCalendarTP::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { if (m_pThemeData) { SetThemeData(FWL_GetThemeColor(dwThemeID)); @@ -160,7 +160,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText* pParams) { return CFWL_WidgetTP::DrawText(pParams); } void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) { + uint32_t dwCapacity) { FX_BOOL bDefPro = FALSE; FX_BOOL bDwordVal = FALSE; switch (dwCapacity) { @@ -558,7 +558,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawTodayCircle(CFWL_ThemeBackground* pParams, pParams->m_pGraphics->RestoreGraphState(); return TRUE; } -FWLTHEME_STATE CFWL_MonthCalendarTP::GetState(FX_DWORD dwFWLStates) { +FWLTHEME_STATE CFWL_MonthCalendarTP::GetState(uint32_t dwFWLStates) { if (dwFWLStates & FWL_PARTSTATE_MCD_Hovered) { return FWLTHEME_STATE_Hover; } else if (dwFWLStates & FWL_PARTSTATE_MCD_Pressed) { @@ -566,7 +566,7 @@ FWLTHEME_STATE CFWL_MonthCalendarTP::GetState(FX_DWORD dwFWLStates) { } return FWLTHEME_STATE_Normal; } -void CFWL_MonthCalendarTP::SetThemeData(FX_DWORD dwThemeID) { +void CFWL_MonthCalendarTP::SetThemeData(uint32_t dwThemeID) { if (dwThemeID == 0) { m_pThemeData->clrCaption = ArgbEncode(0xff, 0, 153, 255); m_pThemeData->clrSeperator = ArgbEncode(0xff, 141, 161, 239); diff --git a/xfa/fwl/theme/pushbuttontp.cpp b/xfa/fwl/theme/pushbuttontp.cpp index 091375094e..00ff3e9737 100644 --- a/xfa/fwl/theme/pushbuttontp.cpp +++ b/xfa/fwl/theme/pushbuttontp.cpp @@ -27,8 +27,8 @@ CFWL_PushButtonTP::~CFWL_PushButtonTP() { FX_BOOL CFWL_PushButtonTP::IsValidWidget(IFWL_Widget* pWidget) { return pWidget->GetClassID() == FWL_CLASSHASH_PushButton; } -FX_DWORD CFWL_PushButtonTP::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_PushButtonTP::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { SetThemeData(FWL_GetThemeColor(dwThemeID)); return CFWL_WidgetTP::SetThemeID(pWidget, dwThemeID, bChildren); @@ -96,7 +96,7 @@ FX_BOOL CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { return TRUE; } void* CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) { + uint32_t dwCapacity) { if (dwCapacity == FWL_WGTCAPACITY_PSB_Margin) { m_fValue = 0; return &m_fValue; @@ -111,7 +111,7 @@ FWL_ERR CFWL_PushButtonTP::Finalize() { FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } -void CFWL_PushButtonTP::SetThemeData(FX_DWORD dwID) { +void CFWL_PushButtonTP::SetThemeData(uint32_t dwID) { if (dwID) { m_pThemeData->clrBorder[0] = ArgbEncode(255, 55, 98, 6); m_pThemeData->clrBorder[1] = ArgbEncode(255, 55, 98, 6); @@ -156,6 +156,6 @@ void CFWL_PushButtonTP::SetThemeData(FX_DWORD dwID) { m_pThemeData->clrFill[4] = ArgbEncode(255, 245, 244, 234); } } -int32_t CFWL_PushButtonTP::GetColorID(FX_DWORD dwStates) { +int32_t CFWL_PushButtonTP::GetColorID(uint32_t dwStates) { return dwStates &= FWL_PARTSTATE_PSB_Mask; } diff --git a/xfa/fwl/theme/scrollbartp.cpp b/xfa/fwl/theme/scrollbartp.cpp index 2c7bed02da..2df08d68be 100644 --- a/xfa/fwl/theme/scrollbartp.cpp +++ b/xfa/fwl/theme/scrollbartp.cpp @@ -31,15 +31,15 @@ FX_BOOL CFWL_ScrollBarTP::IsValidWidget(IFWL_Widget* pWidget) { return pWidget->GetClassID() == FWL_CLASSHASH_ScrollBar; } void* CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) { + uint32_t dwCapacity) { if (dwCapacity == FWL_CAPACITY_SCB_Size) { m_fValue = 5; return &m_fValue; } return CFWL_WidgetTP::GetCapacity(pThemePart, dwCapacity); } -FX_DWORD CFWL_ScrollBarTP::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_ScrollBarTP::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { if (m_pThemeData) { SetThemeData(FWL_GetThemeColor(dwThemeID)); @@ -335,7 +335,7 @@ void CFWL_ScrollBarTP::DrawMaxMinBtn(CFX_Graphics* pGraphics, eState == FWLTHEME_STATE_Pressed, pMatrix); } #endif -void CFWL_ScrollBarTP::SetThemeData(FX_DWORD dwID) { +void CFWL_ScrollBarTP::SetThemeData(uint32_t dwID) { m_pThemeData->clrPawColorLight[3] = ArgbEncode(0xff, 208, 223, 172); m_pThemeData->clrPawColorDark[3] = ArgbEncode(0xff, 140, 157, 115); m_pThemeData->clrBtnBK[3][0] = ArgbEncode(0xff, 164, 180, 139); diff --git a/xfa/fwl/theme/widgettp.cpp b/xfa/fwl/theme/widgettp.cpp index 2eda644838..c87c70c1c2 100644 --- a/xfa/fwl/theme/widgettp.cpp +++ b/xfa/fwl/theme/widgettp.cpp @@ -18,7 +18,7 @@ #include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cfx_shading.h" -static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { +static void FWL_SetChildThemeID(IFWL_Widget* pParent, uint32_t dwThemeID) { IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); IFWL_Widget* pChild = pWidgetMgr->GetWidget(pParent, FWL_WGTRELATION_FirstChild); @@ -34,13 +34,13 @@ static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { FX_BOOL CFWL_WidgetTP::IsValidWidget(IFWL_Widget* pWidget) { return FALSE; } -FX_DWORD CFWL_WidgetTP::GetThemeID(IFWL_Widget* pWidget) { +uint32_t CFWL_WidgetTP::GetThemeID(IFWL_Widget* pWidget) { return m_dwThemeID; } -FX_DWORD CFWL_WidgetTP::SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, +uint32_t CFWL_WidgetTP::SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren) { - FX_DWORD dwOld = m_dwThemeID; + uint32_t dwOld = m_dwThemeID; m_dwThemeID = dwThemeID; if (CFWL_ArrowData::IsInstance()) { CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(dwThemeID)); @@ -81,7 +81,7 @@ FX_BOOL CFWL_WidgetTP::DrawText(CFWL_ThemeText* pParams) { return TRUE; } void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) { + uint32_t dwCapacity) { switch (dwCapacity) { case FWL_WGTCAPACITY_CXBorder: { m_fValue = FWLTHEME_CAPACITY_CXBorder; @@ -222,7 +222,7 @@ FX_ERR CFWL_WidgetTP::FinalizeTTO() { } #ifdef THEME_XPSimilar void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics, - FX_DWORD dwStyles, + uint32_t dwStyles, const CFX_RectF* pRect, CFX_Matrix* pMatrix) { if (!pGraphics) @@ -249,7 +249,7 @@ void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics, } #else void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics, - FX_DWORD dwStyles, + uint32_t dwStyles, const CFX_RectF* pRect, CFX_Matrix* pMatrix) { if (!pGraphics) @@ -717,13 +717,13 @@ CFWL_FontData::~CFWL_FontData() { #endif } FX_BOOL CFWL_FontData::Equal(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage) { return m_wsFamily == wsFontFamily && m_dwStyles == dwFontStyles && m_dwCodePage == wCodePage; } FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t dwCodePage) { m_wsFamily = wsFontFamily; m_dwStyles = dwFontStyles; @@ -754,7 +754,7 @@ void CFWL_FontManager::DestroyInstance() { CFWL_FontManager::CFWL_FontManager() {} CFWL_FontManager::~CFWL_FontManager() {} IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage) { for (const auto& pData : m_FontsArray) { if (pData->Equal(wsFontFamily, dwFontStyles, wCodePage)) @@ -773,13 +773,13 @@ void FWLTHEME_Release() { CFWL_ArrowData::DestroyInstance(); CFWL_FontManager::DestroyInstance(); } -FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID) { +uint32_t FWL_GetThemeLayout(uint32_t dwThemeID) { return 0xffff0000 & dwThemeID; } -FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID) { +uint32_t FWL_GetThemeColor(uint32_t dwThemeID) { return 0x0000ffff & dwThemeID; } -FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor) { +uint32_t FWL_MakeThemeID(uint32_t dwLayout, uint32_t dwColor) { return (dwLayout << 16) | (0x0000FFFF & dwColor); } CFWL_ArrowData* CFWL_ArrowData::m_pInstance = NULL; @@ -804,7 +804,7 @@ CFWL_ArrowData::~CFWL_ArrowData() { m_pColorData = NULL; } } -void CFWL_ArrowData::SetColorData(FX_DWORD dwID) { +void CFWL_ArrowData::SetColorData(uint32_t dwID) { if (!m_pColorData) { m_pColorData = new CColorData; } |