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/lightwidget/caret.cpp | 4 ++-- xfa/fwl/lightwidget/combobox.cpp | 12 ++++++------ xfa/fwl/lightwidget/datetimepicker.cpp | 4 ++-- xfa/fwl/lightwidget/edit.cpp | 2 +- xfa/fwl/lightwidget/listbox.cpp | 10 +++++----- xfa/fwl/lightwidget/scrollbar.cpp | 2 +- xfa/fwl/lightwidget/theme.cpp | 10 +++++----- xfa/fwl/lightwidget/widget.cpp | 22 +++++++++++----------- 8 files changed, 33 insertions(+), 33 deletions(-) (limited to 'xfa/fwl/lightwidget') 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(m_pIface)->ShowCaret(bFlag); } -FWL_ERR CFWL_Caret::GetFrequency(FX_DWORD& elapse) { +FWL_ERR CFWL_Caret::GetFrequency(uint32_t& elapse) { return static_cast(m_pIface)->GetFrequency(elapse); } -FWL_ERR CFWL_Caret::SetFrequency(FX_DWORD elapse) { +FWL_ERR CFWL_Caret::SetFrequency(uint32_t elapse) { return static_cast(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(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(m_pIface) @@ -272,7 +272,7 @@ FX_BOOL CFWL_ComboBox::CFWL_ComboBoxDP::SetItemIndex(IFWL_Widget* pWidget, m_ItemArray[nIndex].reset(reinterpret_cast(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(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(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(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(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(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(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(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(hItem); @@ -216,7 +216,7 @@ FX_BOOL CFWL_ListBox::CFWL_ListBoxDP::SetItemIndex(IFWL_Widget* pWidget, m_ItemArray[nIndex].reset(reinterpret_cast(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(hItem)->m_dwStates = dwStyle; @@ -290,13 +290,13 @@ FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckRect( reinterpret_cast(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(hItem)->m_dwCheckState; } FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState) { + uint32_t dwCheckState) { reinterpret_cast(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(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(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(); -- cgit v1.2.3