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

fpdfsdk/src/pdfwindow/PWL_IconList.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 "../../include/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
 #include "../../include/pdfwindow/PWL_ListCtrl.h"
 #include "../../include/pdfwindow/PWL_IconList.h"
@@ skipping 82 matching lines @@
         lcp.sTextColor = PWL_DEFAULT_BLACKCOLOR;
         lcp.fFontSize = 12;
         m_pText->Create(lcp);
 }
 
 void CPWL_IconList_Item::SetData(void* pData)
 {
         m_pData = pData;
 }
 
-void CPWL_IconList_Item::SetIcon(FX_INT32 nIconIndex)
+void CPWL_IconList_Item::SetIcon(int32_t nIconIndex)
 {
         m_nIconIndex = nIconIndex;
 }
 
 void CPWL_IconList_Item::SetText(const CFX_WideString& str)
 {
         m_pText->SetText(str.c_str());
 }
 
 CFX_WideString CPWL_IconList_Item::GetText() const
@@ skipping 27 matching lines @@
 
 void CPWL_IconList_Item::OnDisabled()
 {
         m_pText->SetTextColor(PWL_DEFAULT_HEAVYGRAYCOLOR);
 
         this->InvalidateRect();
 }
 
 /* ----------------- CPWL_IconList_Content ----------------- */
 
-CPWL_IconList_Content::CPWL_IconList_Content(FX_INT32 nListCount) : 
+CPWL_IconList_Content::CPWL_IconList_Content(int32_t nListCount) : 
         m_nSelectIndex(-1),
         m_pNotify(NULL),
         m_bEnableNotify(TRUE),
         m_bMouseDown(FALSE),
         m_nListCount(nListCount)
 {
 }
 
 CPWL_IconList_Content::~CPWL_IconList_Content()
 {
 }
 
 void CPWL_IconList_Content::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
-        for (FX_INT32 i=0; i<m_nListCount; i++)
+        for (int32_t i=0; i<m_nListCount; i++)
         {
                 CPWL_IconList_Item* pNewItem = new CPWL_IconList_Item();
 
                 PWL_CREATEPARAM icp = cp;
                 icp.pParentWnd = this;
                 icp.dwFlags = PWS_CHILD | PWS_VISIBLE | PWS_NOREFRESHCLIP;
                 pNewItem->Create(icp);
         }
 
         this->SetItemSpace(PWL_IconList_ITEM_SPACE);
         this->ResetContent(0);
 
         if (CPWL_Wnd * pParent = this->GetParentWindow())
         {
                 CPDF_Rect rcScroll = this->GetScrollArea();
                 this->GetScrollPos();
 
                 PWL_SCROLL_INFO sInfo;
                 sInfo.fContentMin = rcScroll.bottom;
                 sInfo.fContentMax = rcScroll.top;
                 sInfo.fPlateWidth = GetClientRect().Height();
                 sInfo.fSmallStep = 13.0f;
                 sInfo.fBigStep = sInfo.fPlateWidth;
 
-                pParent->OnNotify(this, PNM_SETSCROLLINFO, SBT_VSCROLL, (FX_INTPTR)&sInfo);
+                pParent->OnNotify(this, PNM_SETSCROLLINFO, SBT_VSCROLL, (intptr_t)&sInfo);
         }
 }
 
 FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
 {
         SetFocus();
 
         SetCapture();
         m_bMouseDown = TRUE;
 
-        FX_INT32 nItemIndex = FindItemIndex(point);
+        int32_t nItemIndex = FindItemIndex(point);
         SetSelect(nItemIndex);
         ScrollToItem(nItemIndex);
 
         return TRUE;
 }
 
 FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
         m_bMouseDown = FALSE;
         ReleaseCapture();
 
         return TRUE;
 }
 
 FX_BOOL CPWL_IconList_Content::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag)
 {
         if (m_bMouseDown)
         {
-                FX_INT32 nItemIndex = FindItemIndex(point);
+                int32_t nItemIndex = FindItemIndex(point);
                 SetSelect(nItemIndex);
                 ScrollToItem(nItemIndex);
         }
 
         return TRUE;
 }
 
 FX_BOOL CPWL_IconList_Content::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
 {
         switch (nChar)
         {
         case FWL_VKEY_Up:
                 if (m_nSelectIndex > 0)
                 {
-                        FX_INT32 nItemIndex = m_nSelectIndex - 1;
+                        int32_t nItemIndex = m_nSelectIndex - 1;
                         SetSelect(nItemIndex);
                         ScrollToItem(nItemIndex);
                 }
                 return TRUE;
         case FWL_VKEY_Down:
                 if (m_nSelectIndex < m_nListCount-1)
                 {
-                        FX_INT32 nItemIndex = m_nSelectIndex + 1;
+                        int32_t nItemIndex = m_nSelectIndex + 1;
                         SetSelect(nItemIndex);
                         ScrollToItem(nItemIndex);
                 }
                 return TRUE;
         }
 
         return FALSE;
 }
 
-FX_INT32 CPWL_IconList_Content::FindItemIndex(const CPDF_Point& point)
+int32_t CPWL_IconList_Content::FindItemIndex(const CPDF_Point& point)
 {
-        FX_INT32 nIndex = 0;
-        for (FX_INT32 i=0,sz=m_aChildren.GetSize(); i<sz; i++)
+        int32_t nIndex = 0;
+        for (int32_t i=0,sz=m_aChildren.GetSize(); i<sz; i++)
         {
                 if (CPWL_Wnd * pChild = m_aChildren.GetAt(i))
                 {
                         CPDF_Rect rcWnd = pChild->ChildToParent(pChild->GetWindowRect());
 
                         if (point.y < rcWnd.top)
                         {
                                 nIndex = i;
                         }
                 }
         }
 
         return nIndex;
 }
 
-void CPWL_IconList_Content::ScrollToItem(FX_INT32 nItemIndex)
+void CPWL_IconList_Content::ScrollToItem(int32_t nItemIndex)
 {
         CPDF_Rect rcClient = GetClientRect();
 
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
         {
                 CPDF_Rect rcOrigin = pItem->GetWindowRect();
                 CPDF_Rect rcWnd = pItem->ChildToParent(rcOrigin);
 
                 if (!(rcWnd.bottom > rcClient.bottom && rcWnd.top < rcClient.top))
                 {
                         CPDF_Point ptScroll = GetScrollPos();
 
                         if (rcWnd.top > rcClient.top)
                         {
                                 ptScroll.y = rcOrigin.top;
                         }
                         else if (rcWnd.bottom < rcClient.bottom)
                         {
                                 ptScroll.y = rcOrigin.bottom + rcClient.Height();                                       
                         }
 
                         this->SetScrollPos(ptScroll);
                         this->ResetFace();
                         this->InvalidateRect();
                         if (CPWL_Wnd* pParent = this->GetParentWindow())
                         {
-                                pParent->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (FX_INTPTR)&ptScroll.y);
+                                pParent->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptScroll.y);
                         }
                 }
         }
 }
 
-void CPWL_IconList_Content::SetSelect(FX_INT32 nIndex)
+void CPWL_IconList_Content::SetSelect(int32_t nIndex)
 {
         if (m_nSelectIndex != nIndex)
         {
                 SelectItem(m_nSelectIndex, FALSE);
                 SelectItem(nIndex, TRUE);
                 m_nSelectIndex = nIndex;
 
                 if (IPWL_IconList_Notify* pNotify = GetNotify())
                         pNotify->OnNoteListSelChanged(nIndex);
         }
 }
 
-FX_INT32 CPWL_IconList_Content::GetSelect() const
+int32_t CPWL_IconList_Content::GetSelect() const
 {
         return m_nSelectIndex;
 }
 
 IPWL_IconList_Notify* CPWL_IconList_Content::GetNotify() const
 {
         if (m_bEnableNotify)
                 return m_pNotify;
         return NULL;
 }
 
 void CPWL_IconList_Content::SetNotify(IPWL_IconList_Notify* pNotify)
 {
         m_pNotify = pNotify;
 }
 
 void CPWL_IconList_Content::EnableNotify(FX_BOOL bNotify)
 {
         m_bEnableNotify = bNotify;
 }
 
-void CPWL_IconList_Content::SelectItem(FX_INT32 nItemIndex, FX_BOOL bSelect)
+void CPWL_IconList_Content::SelectItem(int32_t nItemIndex, FX_BOOL bSelect)
 {
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
         {
                 pItem->SetSelect(bSelect);
                 pItem->InvalidateRect();                
         }
 }
 
-CPWL_IconList_Item* CPWL_IconList_Content::GetListItem(FX_INT32 nItemIndex) const
+CPWL_IconList_Item* CPWL_IconList_Content::GetListItem(int32_t nItemIndex) const
 {
         if (nItemIndex >= 0 && nItemIndex<m_aChildren.GetSize())
         {
                 if (CPWL_Wnd * pChild = m_aChildren.GetAt(nItemIndex))
                 {
                         if (pChild->GetClassName() == "CPWL_IconList_Item")
                         {
                                 return (CPWL_IconList_Item*)pChild;
                         }
                 }
         }
 
         return NULL;
 }
 
-void CPWL_IconList_Content::SetListData(FX_INT32 nItemIndex, void* pData)
+void CPWL_IconList_Content::SetListData(int32_t nItemIndex, void* pData)
 {
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
                 pItem->SetData(pData);
 }
 
-void CPWL_IconList_Content::SetListIcon(FX_INT32 nItemIndex, FX_INT32 nIconIndex)
+void CPWL_IconList_Content::SetListIcon(int32_t nItemIndex, int32_t nIconIndex)
 {
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
                 pItem->SetIcon(nIconIndex);
 }
 
-void CPWL_IconList_Content::SetListString(FX_INT32 nItemIndex, const CFX_WideString& str)
+void CPWL_IconList_Content::SetListString(int32_t nItemIndex, const CFX_WideString& str)
 {
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
                 pItem->SetText(str);
 }
 
-CFX_WideString CPWL_IconList_Content::GetListString(FX_INT32 nItemIndex) const
+CFX_WideString CPWL_IconList_Content::GetListString(int32_t nItemIndex) const
 {
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
                 return pItem->GetText();
 
         return L"";
 }
 
 void CPWL_IconList_Content::SetIconFillColor(const CPWL_Color& color)
 {
-        for (FX_INT32 i=0,sz=m_aChildren.GetSize(); i<sz; i++)
+        for (int32_t i=0,sz=m_aChildren.GetSize(); i<sz; i++)
         {
                 if (CPWL_Wnd * pChild = m_aChildren.GetAt(i))
                 {
                         if (pChild->GetClassName() == "CPWL_IconList_Item")
                         {
                                 CPWL_IconList_Item* pItem = (CPWL_IconList_Item*)pChild;
                                 pItem->SetIconFillColor(color);
                                 pItem->InvalidateRect();
                         }
                 }
         }
 
 }
 
 /* -------------------- CPWL_IconList --------------------- */
 
-CPWL_IconList::CPWL_IconList(FX_INT32 nListCount) : 
+CPWL_IconList::CPWL_IconList(int32_t nListCount) : 
         m_pListContent(NULL),
         m_nListCount(nListCount)
 {
 }
 
 CPWL_IconList::~CPWL_IconList()
 {
 }
 
 void CPWL_IconList::RePosChildWnd()
@@ skipping 17 matching lines @@
 void CPWL_IconList::OnCreated()
 {
         if (CPWL_ScrollBar* pScrollBar = this->GetVScrollBar())
         {
                 pScrollBar->RemoveFlag(PWS_AUTOTRANSPARENT);
                 pScrollBar->SetTransparency(255);
                 pScrollBar->SetNotifyForever(TRUE);
         }
 }
 
-void CPWL_IconList::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam, FX_INTPTR lParam)
+void CPWL_IconList::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
         CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
 
         if (wParam == SBT_VSCROLL)
         {               
                 switch (msg)
                 {
                 case PNM_SETSCROLLINFO:
                         if (PWL_SCROLL_INFO* pInfo = (PWL_SCROLL_INFO*)lParam)
                         {
@@ skipping 35 matching lines @@
                         }
                         return;
                 case PNM_SETSCROLLPOS:
                         if (CPWL_ScrollBar* pScrollBar = this->GetVScrollBar())
                                 pScrollBar->OnNotify(pWnd,PNM_SETSCROLLPOS,wParam,lParam);
                         return;
                 }
         }
 }
 
-void CPWL_IconList::SetSelect(FX_INT32 nIndex)
+void CPWL_IconList::SetSelect(int32_t nIndex)
 {
         m_pListContent->SetSelect(nIndex);
 }
 
-void CPWL_IconList::SetTopItem(FX_INT32 nIndex)
+void CPWL_IconList::SetTopItem(int32_t nIndex)
 {
         m_pListContent->ScrollToItem(nIndex);
 }
 
-FX_INT32 CPWL_IconList::GetSelect() const
+int32_t CPWL_IconList::GetSelect() const
 {
         return m_pListContent->GetSelect();
 }
 
 void CPWL_IconList::SetNotify(IPWL_IconList_Notify* pNotify)
 {
         m_pListContent->SetNotify(pNotify);
 }
 
 void CPWL_IconList::EnableNotify(FX_BOOL bNotify)
 {
         m_pListContent->EnableNotify(bNotify);
 }
 
-void CPWL_IconList::SetListData(FX_INT32 nItemIndex, void* pData)
+void CPWL_IconList::SetListData(int32_t nItemIndex, void* pData)
 {
         m_pListContent->SetListData(nItemIndex, pData);
 }
 
-void CPWL_IconList::SetListIcon(FX_INT32 nItemIndex, FX_INT32 nIconIndex)
+void CPWL_IconList::SetListIcon(int32_t nItemIndex, int32_t nIconIndex)
 {
         m_pListContent->SetListIcon(nItemIndex, nIconIndex);
 }
 
-void CPWL_IconList::SetListString(FX_INT32 nItemIndex, const CFX_WideString& str)
+void CPWL_IconList::SetListString(int32_t nItemIndex, const CFX_WideString& str)
 {
         m_pListContent->SetListString(nItemIndex, str);
 }
 
-CFX_WideString CPWL_IconList::GetListString(FX_INT32 nItemIndex) const
+CFX_WideString CPWL_IconList::GetListString(int32_t nItemIndex) const
 {
         return m_pListContent->GetListString(nItemIndex);
 }
 
 void CPWL_IconList::SetIconFillColor(const CPWL_Color& color)
 {
         m_pListContent->SetIconFillColor(color);
 }
 
 FX_BOOL CPWL_IconList::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
@@ skipping 18 matching lines @@
                 if (ptNew.y < rcScroll.bottom)
                         ptNew.y = rcScroll.bottom;
 
                 if (ptNew.y != ptScroll.y)
                 {
                         m_pListContent->SetScrollPos(ptNew);
                         m_pListContent->ResetFace();
                         m_pListContent->InvalidateRect(NULL);
                         
                         if (CPWL_ScrollBar* pScrollBar = this->GetVScrollBar())
-                                pScrollBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (FX_INTPTR)&ptNew.y);
+                                pScrollBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptNew.y);
 
                         return TRUE;
                 }
         }
 
         return FALSE;
 }