Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fwl/src/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 "../../../foxitlib.h"
 #include "include/fwl_targetimp.h"
 #include "include/fwl_threadimp.h"
 #include "include/fwl_noteimp.h"
@@ skipping 308 matching lines @@
         }
     }
     return FWL_WGTHITTEST_Client;
 }
 FWL_ERR CFWL_FormImp::DrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix )
 {
     _FWL_RETURN_VALUE_IF_FAIL(pGraphics, FWL_ERR_Indefinite);
     _FWL_RETURN_VALUE_IF_FAIL(m_pProperties->m_pThemeProvider, FWL_ERR_Indefinite);
     IFWL_ThemeProvider *pTheme = m_pProperties->m_pThemeProvider;
     FX_BOOL bInactive = !IsActive();
-    FX_INT32 iState = bInactive ? FWL_PARTSTATE_FRM_Inactive : FWL_PARTSTATE_FRM_Normal;
+    int32_t iState = bInactive ? FWL_PARTSTATE_FRM_Inactive : FWL_PARTSTATE_FRM_Normal;
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_NoDrawClient) == 0) {
         DrawBackground(pGraphics, pTheme);
     }
 #ifdef FWL_UseMacSystemBorder
     return FWL_ERR_Succeeded;
 #endif
     CFWL_ThemeBackground param;
     param.m_pWidget = m_pInterface;
     param.m_dwStates = iState;
     param.m_pGraphics = pGraphics;
@@ skipping 252 matching lines @@
         return m_pMaxBox;
     }
     if (m_pMinBox && (m_pMinBox->m_dwState & dwState)) {
         return m_pMinBox;
     }
     if (m_pCaptionBox && (m_pCaptionBox->m_dwState & dwState)) {
         return m_pCaptionBox;
     }
     return NULL;
 }
-CFWL_SysBtn* CFWL_FormImp::GetSysBtnByIndex(FX_INT32 nIndex)
+CFWL_SysBtn* CFWL_FormImp::GetSysBtnByIndex(int32_t nIndex)
 {
     if (nIndex < 0) {
         return NULL;
     }
     CFX_PtrArray arrBtn;
     if (m_pMinBox) {
         arrBtn.Add(m_pMinBox);
     }
     if (m_pMaxBox) {
         arrBtn.Add(m_pMaxBox);
     }
     if (m_pCloseBox) {
         arrBtn.Add(m_pCloseBox);
     }
     return (CFWL_SysBtn*) arrBtn[nIndex];
 }
-FX_INT32 CFWL_FormImp::GetSysBtnIndex(CFWL_SysBtn *pBtn)
+int32_t CFWL_FormImp::GetSysBtnIndex(CFWL_SysBtn *pBtn)
 {
     CFX_PtrArray arrBtn;
     if (m_pMinBox) {
         arrBtn.Add(m_pMinBox);
     }
     if (m_pMaxBox) {
         arrBtn.Add(m_pMaxBox);
     }
     if (m_pCloseBox) {
         arrBtn.Add(m_pCloseBox);
@@ skipping 352 matching lines @@
         } else if (fTemp > fLimitMax && fHeight < fLimitMax) {
             fTop -= bTop ? (fLimitMax - fHeight) : 0;
             fHeight = fLimitMax;
         }
     }
 }
 CFWL_FormDelegate::CFWL_FormDelegate(CFWL_FormImp *pOwner)
     : m_pOwner(pOwner)
 {
 }
-FX_INT32 CFWL_FormDelegate::OnProcessMessage(CFWL_Message *pMessage)
+int32_t CFWL_FormDelegate::OnProcessMessage(CFWL_Message *pMessage)
 {
 #ifdef FWL_UseMacSystemBorder
     _FWL_RETURN_VALUE_IF_FAIL(pMessage, 0);
     FX_DWORD dwMsgCode = pMessage->GetClassID();
-    FX_INT32 iRet = 1;
+    int32_t iRet = 1;
     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
     _FWL_RETURN_VALUE_IF_FAIL(pMessage, 0);
     FX_DWORD dwMsgCode = pMessage->GetClassID();
-    FX_INT32 iRet = 1;
+    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 = (CFWL_NoteDriver*)pThread->GetNoteDriver();
                 CFWL_WidgetImp *pSubFocusImp = m_pOwner->GetSubFocus();
                 IFWL_Widget *pSubFocus = pSubFocusImp ? pSubFocusImp->GetInterface() : NULL;
                 if (pSubFocus && pSubFocus != pDriver->GetFocus()) {
                     pDriver->SetFocus(pSubFocus);
                 }
@@ skipping 400 matching lines @@
     CFWL_EvtClose eClose;
     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 = (CFWL_FormImp*)((IFWL_TargetData*)pFrom)->GetData();
     _FWL_RETURN_VALUE_IF_FAIL(pImp, FWL_ERR_Indefinite);
     return FWL_ERR_Succeeded;
 }