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/core/fwl_formimp.cpp | 18 +++++++------- xfa/fwl/core/fwl_gridimp.cpp | 2 +- xfa/fwl/core/fwl_noteimp.cpp | 20 ++++++++-------- xfa/fwl/core/fwl_panelimp.cpp | 2 +- xfa/fwl/core/fwl_sdadapterimp.cpp | 4 ++-- xfa/fwl/core/fwl_targetimp.cpp | 4 ++-- xfa/fwl/core/fwl_timerimp.cpp | 2 +- xfa/fwl/core/fwl_widgetimp.cpp | 50 +++++++++++++++++++-------------------- xfa/fwl/core/fwl_widgetmgrimp.cpp | 4 ++-- 9 files changed, 53 insertions(+), 53 deletions(-) (limited to 'xfa/fwl/core') 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(GetImpl())->DoModal(); } -IFWL_Widget* IFWL_Form::DoModal(FX_DWORD& dwCommandID) { +IFWL_Widget* IFWL_Form::DoModal(uint32_t& dwCommandID) { return static_cast(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(GetImpl())->GetOuter(); } -FX_DWORD IFWL_Widget::GetStyles() { +uint32_t IFWL_Widget::GetStyles() { return static_cast(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(GetImpl()) ->ModifyStyles(dwStylesAdded, dwStylesRemoved); } -FX_DWORD IFWL_Widget::GetStylesEx() { +uint32_t IFWL_Widget::GetStylesEx() { return static_cast(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(GetImpl()) ->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } -FX_DWORD IFWL_Widget::GetStates() { +uint32_t IFWL_Widget::GetStates() { return static_cast(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(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(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(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(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(pMessage); @@ -1089,11 +1089,11 @@ void FWL_SetWidgetRect(IFWL_Widget* widget, const CFX_RectF& rect) { static_cast(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(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(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; } -- cgit v1.2.3