From 736f28ab2434e2da1de66ff91b64741483ff9cba Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:19:51 -0700 Subject: Remove FX_DWORD from XFA. Review URL: https://codereview.chromium.org/1830323006 --- xfa/fwl/basewidget/fwl_barcodeimp.cpp | 6 +-- xfa/fwl/basewidget/fwl_caretimp.cpp | 10 ++--- xfa/fwl/basewidget/fwl_checkboximp.cpp | 12 ++--- xfa/fwl/basewidget/fwl_comboboximp.cpp | 66 ++++++++++++++-------------- xfa/fwl/basewidget/fwl_datetimepickerimp.cpp | 28 ++++++------ xfa/fwl/basewidget/fwl_editimp.cpp | 32 +++++++------- xfa/fwl/basewidget/fwl_formproxyimp.cpp | 2 +- xfa/fwl/basewidget/fwl_listboximp.cpp | 42 +++++++++--------- xfa/fwl/basewidget/fwl_monthcalendarimp.cpp | 12 ++--- xfa/fwl/basewidget/fwl_pictureboximp.cpp | 2 +- xfa/fwl/basewidget/fwl_pushbuttonimp.cpp | 12 ++--- xfa/fwl/basewidget/fwl_scrollbarimp.cpp | 20 ++++----- xfa/fwl/basewidget/fwl_spinbuttonimp.cpp | 8 ++-- xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp | 4 +- 14 files changed, 128 insertions(+), 128 deletions(-) (limited to 'xfa/fwl/basewidget') 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(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(GetImpl())->ShowCaret(bFlag); } -FWL_ERR IFWL_Caret::GetFrequency(FX_DWORD& elapse) { +FWL_ERR IFWL_Caret::GetFrequency(uint32_t& elapse) { return static_cast(GetImpl())->GetFrequency(elapse); } -FWL_ERR IFWL_Caret::SetFrequency(FX_DWORD elapse) { +FWL_ERR IFWL_Caret::SetFrequency(uint32_t elapse) { return static_cast(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(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(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(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(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(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(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(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(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(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(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(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(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(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(GetImpl())->SetNumberRange(iMin, iMax); } -FWL_ERR IFWL_Edit::SetBackColor(FX_DWORD dwColor) { +FWL_ERR IFWL_Edit::SetBackColor(uint32_t dwColor) { return static_cast(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(GetThemeCapacity(FWL_WGTCAPACITY_TextColor)); + uint32_t* pFontColor = + static_cast(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(m_pProperties->m_pDataProvider); -- cgit v1.2.3