Remove FX_DWORD from XFA.

xfa/fwl/core/fwl_formimp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/fwl_formimp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/fwl_formproxyimp.h"
@@ skipping 31 matching lines @@
 IFWL_Form::IFWL_Form() {}
 FWL_FORMSIZE IFWL_Form::GetFormSize() {
   return static_cast<CFWL_FormImp*>(GetImpl())->GetFormSize();
 }
 FWL_ERR IFWL_Form::SetFormSize(FWL_FORMSIZE eFormSize) {
   return static_cast<CFWL_FormImp*>(GetImpl())->SetFormSize(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() {
   return static_cast<CFWL_FormImp*>(GetImpl())->EndDoModal();
 }
 FWL_ERR IFWL_Form::SetBorderRegion(CFX_Path* pPath) {
   return static_cast<CFWL_FormImp*>(GetImpl())->SetBorderRegion(pPath);
 }
 
 CFWL_FormImp::CFWL_FormImp(const CFWL_WidgetImpProperties& properties,
@@ skipping 26 matching lines @@
   m_rtIcon.Reset();
 }
 CFWL_FormImp::~CFWL_FormImp() {
   RemoveSysButtons();
   delete m_pNoteLoop;
 }
 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 {
   if (wsClass == CFX_WideStringC(FWL_CLASS_Form)) {
     return TRUE;
   }
   return CFWL_PanelImp::IsInstance(wsClass);
 }
 FWL_ERR CFWL_FormImp::Initialize() {
   if (CFWL_WidgetImp::Initialize() != FWL_ERR_Succeeded)
@@ skipping 77 matching lines @@
 #else
   SetThemeData();
   if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Icon) {
     UpdateIcon();
   }
 #endif
   UpdateCaption();
   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;
   }
   if (m_pMaxBox && m_pMaxBox->m_rtBtn.Contains(fx, fy)) {
     return FWL_WGTHITTEST_MaxBox;
   }
   if (m_pMinBox && m_pMinBox->m_rtBtn.Contains(fx, fy)) {
     return FWL_WGTHITTEST_MinBox;
   }
@@ skipping 192 matching lines @@
   SetStates(FWL_WGTSTATE_Invisible, FALSE);
   pDriver->Run();
 #if (_FX_OS_ == _FX_MACOSX_)
 #else
   pDriver->PopNoteLoop();
 #endif
   delete m_pNoteLoop;
   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() {
   if (!m_pNoteLoop)
     return FWL_ERR_Indefinite;
   m_bDoModalFlag = FALSE;
 #if (_FX_OS_ == _FX_MACOSX_)
   m_pNoteLoop->EndModalLoop();
   IFWL_NoteThread* pThread = GetOwnerThread();
   if (!pThread)
@@ skipping 30 matching lines @@
 void CFWL_FormImp::SetSubFocus(CFWL_WidgetImp* pWidget) {
   m_pSubFocus = pWidget;
 }
 CFX_MapAccelerators& CFWL_FormImp::GetAccelerator() {
   return m_mapAccelerators;
 }
 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);
     m_mapAccelerators.SetAt(vrKey, rValue);
   }
 }
 void CFWL_FormImp::ShowChildWidget(IFWL_Widget* pParent) {
   IFWL_App* pApp = FWL_GetApp();
   if (!pApp)
     return;
@@ skipping 47 matching lines @@
     return m_pMaxBox;
   }
   if (m_pMinBox && m_pMinBox->m_rtBtn.Contains(fx, fy)) {
     return m_pMinBox;
   }
   if (m_pCaptionBox && m_pCaptionBox->m_rtBtn.Contains(fx, fy)) {
     return m_pCaptionBox;
   }
   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;
   }
   if (m_pMaxBox && (m_pMaxBox->m_dwState & dwState)) {
     return m_pMaxBox;
   }
   if (m_pMinBox && (m_pMinBox->m_dwState & dwState)) {
     return m_pMinBox;
   }
   if (m_pCaptionBox && (m_pCaptionBox->m_dwState & dwState)) {
@@ skipping 24 matching lines @@
   }
   if (m_pMaxBox) {
     arrBtn.Add(m_pMaxBox);
   }
   if (m_pCloseBox) {
     arrBtn.Add(m_pCloseBox);
   }
   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) {
     dwCapacity = FWL_WGTCAPACITY_FRM_CYNarrowCaption;
   }
   if (dwCapacity > 0) {
     FX_FLOAT* pfCapHeight =
         static_cast<FX_FLOAT*>(GetThemeCapacity(dwCapacity));
     return pfCapHeight ? *pfCapHeight : 0;
   }
@@ skipping 287 matching lines @@
       fHeight = fLimitMax;
     }
   }
 }
 CFWL_FormImpDelegate::CFWL_FormImpDelegate(CFWL_FormImp* pOwner)
     : m_pOwner(pOwner) {}
 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;
       m_pOwner->Repaint(&m_pOwner->m_rtRelative);
       break;
     }
     case FWL_MSGHASH_Deactivate: {
       m_pOwner->m_pProperties->m_dwStates |= FWL_WGTSTATE_Deactivated;
       m_pOwner->Repaint(&m_pOwner->m_rtRelative);
       break;
     }
   }
   return FWL_ERR_Succeeded;
 #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: {
       m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;
       IFWL_NoteThread* pThread = m_pOwner->GetOwnerThread();
       CFWL_NoteDriver* pDriver =
           static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
       CFWL_WidgetImp* pSubFocusImp = m_pOwner->GetSubFocus();
       IFWL_Widget* pSubFocus =
           pSubFocusImp ? pSubFocusImp->GetInterface() : NULL;
@@ skipping 260 matching lines @@
   eClose.m_pSrcTarget = m_pOwner->m_pInterface;
   m_pOwner->DispatchEvent(&eClose);
 }
 FWL_ERR FWL_Accelerator_SetForm(IFWL_Form* pFrom,
                                 CFX_MapAccelerators* pMapAccel) {
   CFWL_FormImp* pImp = static_cast<CFWL_FormImp*>(pFrom->GetImpl());
   if (!pImp)
     return FWL_ERR_Indefinite;
   return FWL_ERR_Succeeded;
 }