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

Near-automatic merge, plus re-running scripts to update
additional usage.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1172793002

10 files changed, 95 insertions, 95 deletions

diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index b69be8368b..72d9dc01c7 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -16,7 +16,7 @@ public:
     virtual ~CFWL_App();

     FWL_ERR		Initialize();

     CFWL_Theme*		GetTheme();

-    FWL_ERR		Exit(FX_INT32 iExitCode = 0);

+    FWL_ERR		Exit(int32_t iExitCode = 0);

     IFWL_App*	GetApp();

 protected:

     IFWL_App	*m_pAppImp;

diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h
index e8fcfea476..242b432ab1 100644
--- a/xfa/include/fwl/lightwidget/barcode.h
+++ b/xfa/include/fwl/lightwidget/barcode.h
@@ -25,23 +25,23 @@ public:
         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CHARENCODING;

         m_barcodeData.m_eCharEncoding = encoding;

     }

-    void		SetModuleHeight(FX_INT32 height)

+    void		SetModuleHeight(int32_t height)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_MODULEHEIGHT;

         m_barcodeData.m_nModuleHeight = height;

     }

-    void		SetModuleWidth(FX_INT32 width)

+    void		SetModuleWidth(int32_t width)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_MODULEWIDTH;

         m_barcodeData.m_nModuleWidth = width;

     }

-    void		SetDataLength(FX_INT32 dataLength)

+    void		SetDataLength(int32_t dataLength)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_DATALENGTH;

         m_barcodeData.m_nDataLength = dataLength;

         ((IFWL_Barcode*)m_pImp)->SetLimit(dataLength);

     }

-    void		SetCalChecksum(FX_INT32 calChecksum)

+    void		SetCalChecksum(int32_t calChecksum)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CALCHECKSUM;

         m_barcodeData.m_nCalChecksum = calChecksum;

@@ -56,7 +56,7 @@ public:
         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_TEXTLOCATION;

         m_barcodeData.m_eTextLocation = location;

     }

-    void		SetWideNarrowRatio(FX_INT32 ratio)

+    void		SetWideNarrowRatio(int32_t ratio)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_WIDENARROWRATIO;

         m_barcodeData.m_nWideNarrowRatio = ratio;

@@ -71,12 +71,12 @@ public:
         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_ENDCHAR;

         m_barcodeData.m_cEndChar = endChar;

     }

-    void		SetVersion(FX_INT32 version)

+    void		SetVersion(int32_t version)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_VERSION;

         m_barcodeData.m_nVersion = version;

     }

-    void		SetErrorCorrectionLevel(FX_INT32 ecLevel)

+    void		SetErrorCorrectionLevel(int32_t ecLevel)

     {

         m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_ECLEVEL;

         m_barcodeData.m_nECLevel = ecLevel;

@@ -102,22 +102,22 @@ protected:
         {

             return m_eCharEncoding;

         }

-        FX_INT32					m_nModuleHeight, m_nModuleWidth;

-        virtual FX_INT32			GetModuleHeight()

+        int32_t					m_nModuleHeight, m_nModuleWidth;

+        virtual int32_t			GetModuleHeight()

         {

             return m_nModuleHeight;

         }

-        virtual FX_INT32			GetModuleWidth()

+        virtual int32_t			GetModuleWidth()

         {

             return m_nModuleWidth;

         }

-        FX_INT32					m_nDataLength;

-        virtual FX_INT32			GetDataLength()

+        int32_t					m_nDataLength;

+        virtual int32_t			GetDataLength()

         {

             return m_nDataLength;

         }

-        FX_INT32					m_nCalChecksum;

-        virtual FX_INT32			GetCalChecksum()

+        int32_t					m_nCalChecksum;

+        virtual int32_t			GetCalChecksum()

         {

             return m_nCalChecksum;

         }

@@ -132,8 +132,8 @@ protected:
         {

             return m_eTextLocation;

         }

-        FX_INT32					m_nWideNarrowRatio;

-        virtual FX_INT32			GetWideNarrowRatio()

+        int32_t					m_nWideNarrowRatio;

+        virtual int32_t			GetWideNarrowRatio()

         {

             return m_nWideNarrowRatio;

         }

@@ -146,13 +146,13 @@ protected:
         {

             return m_cEndChar;

         }

-        FX_INT32					m_nVersion;

-        virtual FX_INT32			GetVersion()

+        int32_t					m_nVersion;

+        virtual int32_t			GetVersion()

         {

             return m_nVersion;

         }

-        FX_INT32					m_nECLevel;

-        virtual FX_INT32			GetErrorCorrectionLevel()

+        int32_t					m_nECLevel;

+        virtual int32_t			GetErrorCorrectionLevel()

         {

             return m_nECLevel;

         }

diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h
index 2f7b2bac97..ebad96fd8e 100644
--- a/xfa/include/fwl/lightwidget/checkbox.h
+++ b/xfa/include/fwl/lightwidget/checkbox.h
@@ -20,8 +20,8 @@ public:
     FWL_ERR		GetCaption(CFX_WideString &wsCaption);

     FWL_ERR		SetCaption(FX_WSTR wsCaption);

     FWL_ERR		SetBoxSize(FX_FLOAT fHeight);

-    FX_INT32	GetCheckState();

-    FWL_ERR		SetCheckState(FX_INT32 iCheck);

+    int32_t	GetCheckState();

+    FWL_ERR		SetCheckState(int32_t iCheck);

     CFWL_CheckBox();

     virtual ~CFWL_CheckBox();

 protected:

diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index 46aec5bc8a..594c056e83 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -17,27 +17,27 @@ class CFWL_ComboBox : public CFWL_Widget
 public:

     static CFWL_ComboBox* Create();

     FWL_ERR		Initialize(const CFWL_WidgetProperties *pProperties = NULL);

-    FX_INT32	AddString(FX_WSTR wsText);

-    FX_INT32	AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);

-    FX_INT32	RemoveAt(FX_INT32 iIndex);

-    FX_INT32    RemoveAll();

-    FX_INT32	CountItems();

-    FWL_ERR		GetTextByIndex(FX_INT32 iIndex, CFX_WideString &wsText);

-    FX_INT32	GetCurSel();

-    FWL_ERR		SetCurSel(FX_INT32 iSel);

+    int32_t	AddString(FX_WSTR wsText);

+    int32_t	AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);

+    int32_t	RemoveAt(int32_t iIndex);

+    int32_t    RemoveAll();

+    int32_t	CountItems();

+    FWL_ERR		GetTextByIndex(int32_t iIndex, CFX_WideString &wsText);

+    int32_t	GetCurSel();

+    FWL_ERR		SetCurSel(int32_t iSel);

     FWL_ERR		SetEditText(FX_WSTR wsText);

-    FX_INT32	GetEditTextLength() const;

-    FWL_ERR		GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const ;

-    FWL_ERR		SetEditSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);

-    FX_INT32	GetEditSelRange(FX_INT32 nIndex, FX_INT32 &nStart);

-    FX_INT32	GetEditLimit();

-    FWL_ERR		SetEditLimit(FX_INT32 nLimit);

-    FWL_ERR		EditDoClipboard(FX_INT32 iCmd);

+    int32_t	GetEditTextLength() const;

+    FWL_ERR		GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const ;

+    FWL_ERR		SetEditSelRange(int32_t nStart, int32_t nCount = -1);

+    int32_t	GetEditSelRange(int32_t nIndex, int32_t &nStart);

+    int32_t	GetEditLimit();

+    FWL_ERR		SetEditLimit(int32_t nLimit);

+    FWL_ERR		EditDoClipboard(int32_t iCmd);

     FX_BOOL		EditRedo(FX_BSTR bsRecord);

     FX_BOOL		EditUndo(FX_BSTR bsRecord);

     FWL_ERR		SetMaxListHeight(FX_FLOAT fMaxHeight);

-    FWL_ERR		SetItemData(FX_INT32 iIndex, FX_LPVOID pData);

-    FX_LPVOID	GetItemData(FX_INT32 iIndex);

+    FWL_ERR		SetItemData(int32_t iIndex, FX_LPVOID pData);

+    FX_LPVOID	GetItemData(int32_t iIndex);

     FWL_ERR		SetListTheme(IFWL_ThemeProvider *pTheme);

     FX_BOOL		AfterFocusShowDropList();

     FWL_ERR		OpenDropDownList(FX_BOOL bActivate);

@@ -70,10 +70,10 @@ protected:
             return FWL_ERR_Succeeded;

         }

 

-        virtual	FX_INT32		CountItems(IFWL_Widget *pWidget);

-        virtual	FWL_HLISTITEM	GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex);

-        virtual	FX_INT32		GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

-        virtual FX_BOOL			SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex);

+        virtual	int32_t		CountItems(IFWL_Widget *pWidget);

+        virtual	FWL_HLISTITEM	GetItem(IFWL_Widget *pWidget, int32_t nIndex);

+        virtual	int32_t		GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

+        virtual FX_BOOL			SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex);

 

         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);

diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h
index 73a382c08c..4af07a99bc 100644
--- a/xfa/include/fwl/lightwidget/datetimepicker.h
+++ b/xfa/include/fwl/lightwidget/datetimepicker.h
@@ -16,13 +16,13 @@ class CFWL_DateTimePicker : public CFWL_Widget
 public:

     static CFWL_DateTimePicker* Create();

     FWL_ERR	Initialize(const CFWL_WidgetProperties *pProperties = NULL);

-    FWL_ERR SetToday(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay);

+    FWL_ERR SetToday(int32_t iYear, int32_t iMonth, int32_t iDay);

     FWL_ERR	GetEditText(CFX_WideString &wsText);

     FWL_ERR	SetEditText(FX_WSTR wsText);

-    FX_INT32 CountSelRanges();

-    FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart);

-    FWL_ERR GetCurSel(FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay);

-    FWL_ERR	SetCurSel(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay);

+    int32_t CountSelRanges();

+    int32_t GetSelRange(int32_t nIndex, int32_t &nStart);

+    FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay);

+    FWL_ERR	SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay);

     FX_BOOL		CanUndo();

     FX_BOOL		CanRedo();

     FX_BOOL		Undo();

@@ -37,7 +37,7 @@ public:
     FX_BOOL		Delete();

     FX_BOOL		DeSelect();

     FWL_ERR		GetBBox(CFX_RectF &rect);

-    FWL_ERR		SetEditLimit(FX_INT32 nLimit);

+    FWL_ERR		SetEditLimit(int32_t nLimit);

     FWL_ERR		ModifyEditStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);

 protected:

     CFWL_DateTimePicker();

@@ -47,10 +47,10 @@ protected:
     public:

         CFWL_DateTimePickerDP();

         virtual FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);

-        virtual FWL_ERR GetToday(IFWL_Widget *pWidget, FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay);

-        FX_INT32 m_iYear;

-        FX_INT32 m_iMonth;

-        FX_INT32 m_iDay;

+        virtual FWL_ERR GetToday(IFWL_Widget *pWidget, int32_t &iYear, int32_t &iMonth, int32_t &iDay);

+        int32_t m_iYear;

+        int32_t m_iMonth;

+        int32_t m_iDay;

         CFX_WideString	m_wsData;

     };

     CFWL_DateTimePickerDP m_DateTimePickerDP;

diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h
index 8299a20322..d95baa20e1 100644
--- a/xfa/include/fwl/lightwidget/edit.h
+++ b/xfa/include/fwl/lightwidget/edit.h
@@ -15,29 +15,29 @@ public:
     static CFWL_Edit* Create();

     FWL_ERR     Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR		SetText(const CFX_WideString &wsText);

-    FX_INT32	GetTextLength() const;

-    FWL_ERR		GetText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const;

+    int32_t	GetTextLength() const;

+    FWL_ERR		GetText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const;

     FWL_ERR		ClearText();

-    FX_INT32	GetCaretPos() const;

-    FX_INT32	SetCaretPos(FX_INT32 nIndex, FX_BOOL bBefore = TRUE);

-    FWL_ERR		AddSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);

-    FX_INT32	CountSelRanges();

-    FX_INT32	GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart);

+    int32_t	GetCaretPos() const;

+    int32_t	SetCaretPos(int32_t nIndex, FX_BOOL bBefore = TRUE);

+    FWL_ERR		AddSelRange(int32_t nStart, int32_t nCount = -1);

+    int32_t	CountSelRanges();

+    int32_t	GetSelRange(int32_t nIndex, int32_t &nStart);

     FWL_ERR		ClearSelections();

-    FX_INT32	GetLimit();

-    FWL_ERR		SetLimit(FX_INT32 nLimit);

+    int32_t	GetLimit();

+    FWL_ERR		SetLimit(int32_t nLimit);

     FWL_ERR		SetAliasChar(FX_WCHAR wAlias);

     FWL_ERR		SetFormatString(const CFX_WideString &wsFormat);

-    FWL_ERR		Insert(FX_INT32 nStart, FX_LPCWSTR lpText, FX_INT32 nLen);

+    FWL_ERR		Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);

     FWL_ERR		DeleteSelections();

-    FWL_ERR		DeleteRange(FX_INT32 nStart, FX_INT32 nCount = -1);

+    FWL_ERR		DeleteRange(int32_t nStart, int32_t nCount = -1);

     FWL_ERR		ReplaceSelections(const CFX_WideStringC &wsReplace);

-    FWL_ERR		Replace(FX_INT32 nStart, FX_INT32 nLen, const CFX_WideStringC &wsReplace);

-    FWL_ERR		DoClipboard(FX_INT32 iCmd);

+    FWL_ERR		Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace);

+    FWL_ERR		DoClipboard(int32_t iCmd);

     FX_BOOL		Redo(FX_BSTR bsRecord);

     FX_BOOL		Undo(FX_BSTR bsRecord);

     FWL_ERR		SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant);

-    FWL_ERR		SetNumberRange(FX_INT32 iMin, FX_INT32 iMax);

+    FWL_ERR		SetNumberRange(int32_t iMin, int32_t iMax);

     FWL_ERR     SetBackColor(FX_DWORD dwColor);

     FWL_ERR     SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize);

     FX_BOOL		CanUndo();

diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index 55eddabb48..a8d024abaa 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -20,9 +20,9 @@ public:
     FWL_HLISTITEM	AddString(FX_WSTR wsAdd, FX_BOOL bSelect = FALSE);

     FX_BOOL		DeleteString(FWL_HLISTITEM hItem);

     FX_BOOL		DeleteAll();

-    FX_INT32	CountSelItems();

-    FWL_HLISTITEM	GetSelItem(FX_INT32 nIndexSel);

-    FX_INT32	GetSelIndex(FX_INT32 nIndex);

+    int32_t	CountSelItems();

+    FWL_HLISTITEM	GetSelItem(int32_t nIndexSel);

+    int32_t	GetSelIndex(int32_t nIndex);

     FWL_ERR		SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE);

     FWL_ERR		GetItemText(FWL_HLISTITEM hItem, CFX_WideString &wsText);

     FWL_ERR		GetScrollPos(FX_FLOAT &fPos, FX_BOOL bVert = TRUE);

@@ -30,8 +30,8 @@ public:
     FWL_HLISTITEM	GetFocusItem();

     FWL_ERR		SetFocusItem(FWL_HLISTITEM hItem);

     FWL_ERR*	Sort(IFWL_ListBoxCompare *pCom);

-    FX_INT32	CountItems();

-    FWL_HLISTITEM	GetItem(FX_INT32 nIndex);

+    int32_t	CountItems();

+    FWL_HLISTITEM	GetItem(int32_t nIndex);

     FWL_ERR		SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText);

     FWL_ERR		GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText);

     FWL_ERR		SetItemData(FWL_HLISTITEM hItem, FX_LPVOID pData);

@@ -48,10 +48,10 @@ protected:
         ~CFWL_ListBoxDP();

         virtual FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);

 

-        virtual	FX_INT32		CountItems(IFWL_Widget *pWidget);

-        virtual	FWL_HLISTITEM	GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex);

-        virtual	FX_INT32		GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

-        virtual FX_BOOL			SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex);

+        virtual	int32_t		CountItems(IFWL_Widget *pWidget);

+        virtual	FWL_HLISTITEM	GetItem(IFWL_Widget *pWidget, int32_t nIndex);

+        virtual	int32_t		GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

+        virtual FX_BOOL			SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex);

 

         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);

diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h
index dd87d6806b..d15c2510a0 100644
--- a/xfa/include/fwl/lightwidget/picturebox.h
+++ b/xfa/include/fwl/lightwidget/picturebox.h
@@ -20,10 +20,10 @@ public:
     FWL_ERR			SetPicture(CFX_DIBitmap *pBitmap);

     FX_FLOAT		GetRotation();

     FWL_ERR			SetRotation(FX_FLOAT fRotation);

-    FX_INT32		GetFlipMode();

-    FWL_ERR			SetFlipMode(FX_INT32 iFlipMode);

-    FX_INT32		GetOpacity();

-    FWL_ERR			SetOpacity(FX_INT32 iOpacity);

+    int32_t		GetFlipMode();

+    FWL_ERR			SetFlipMode(int32_t iFlipMode);

+    int32_t		GetOpacity();

+    FWL_ERR			SetOpacity(int32_t iOpacity);

     FWL_ERR			GetScale(FX_FLOAT &fScaleX, FX_FLOAT &fScaleY);

     FWL_ERR			SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY);

     FWL_ERR			GetOffset(FX_FLOAT &fx, FX_FLOAT &fy);

@@ -47,12 +47,12 @@ protected:
         virtual CFX_DIBitmap*	GetPicture(IFWL_Widget *pWidget);

         virtual CFX_DIBitmap*	GetErrorPicture(IFWL_Widget *pWidget);

         virtual CFX_DIBitmap*	GetInitialPicture(IFWL_Widget *pWidget);

-        virtual FX_INT32		GetOpacity(IFWL_Widget *pWidget);

-        virtual FX_INT32		GetFlipMode(IFWL_Widget *pWidget);

+        virtual int32_t		GetOpacity(IFWL_Widget *pWidget);

+        virtual int32_t		GetFlipMode(IFWL_Widget *pWidget);

         virtual FWL_ERR			GetMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix);

         CFX_DIBitmap	*m_pBitmap;

-        FX_INT32		m_iOpacity;

-        FX_INT32		m_iFlipMode;

+        int32_t		m_iOpacity;

+        int32_t		m_iFlipMode;

         FX_FLOAT		m_fRotation;

         FX_FLOAT		m_fScaleX;

         FX_FLOAT		m_fScaleY;

diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h
index 114696ff13..821e042533 100644
--- a/xfa/include/fwl/lightwidget/tooltipctrl.h
+++ b/xfa/include/fwl/lightwidget/tooltipctrl.h
@@ -18,10 +18,10 @@ public:
     FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR			GetCaption(CFX_WideString &wsCaption);

     FWL_ERR			SetCaption(FX_WSTR wsCaption);

-    FX_INT32	 	GetInitialDelay();

-    FX_INT32	 	SetInitialDelay(FX_INT32 nDelayTime);

-    FX_INT32	 	GetAutoPopDelay();

-    FX_INT32	 	SetAutoPopDelay(FX_INT32 nDelayTime);

+    int32_t	 	GetInitialDelay();

+    int32_t	 	SetInitialDelay(int32_t nDelayTime);

+    int32_t	 	GetAutoPopDelay();

+    int32_t	 	SetAutoPopDelay(int32_t nDelayTime);

     CFX_DIBitmap*	GetToolTipIcon();

     FWL_ERR			SetToolTipIcon(CFX_DIBitmap* pBitmap);

     CFX_SizeF		GetToolTipIconSize();

@@ -37,14 +37,14 @@ protected:
     public:

         CFWL_ToolTipDP();

         FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);

-        FX_INT32	 	GetInitialDelay(IFWL_Widget *pWidget);

-        FX_INT32	 	GetAutoPopDelay(IFWL_Widget *pWidget);

+        int32_t	 	GetInitialDelay(IFWL_Widget *pWidget);

+        int32_t	 	GetAutoPopDelay(IFWL_Widget *pWidget);

         CFX_DIBitmap*	GetToolTipIcon(IFWL_Widget *pWidget);

         CFX_SizeF		GetToolTipIconSize(IFWL_Widget *pWidget);

         CFX_RectF		GetAnchor();

         CFX_WideString	m_wsCaption;

-        FX_INT32		m_nInitDelayTime;

-        FX_INT32		m_nAutoPopDelayTime;

+        int32_t		m_nInitDelayTime;

+        int32_t		m_nAutoPopDelayTime;

         CFX_DIBitmap*	m_pBitmap;

         CFX_SizeF		m_fIconSize;

         CFX_RectF		m_fAnchor;

diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index 222ce1c768..d581c7fb40 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -83,7 +83,7 @@ public:
     virtual ~CFWL_Widget();

     void		RegisterEventTarget(CFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK);

     void		DispatchEvent(CFWL_Event *pEvent);

-    CFX_SizeF	CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, FX_INT32 iLineWidth = -1);

+    CFX_SizeF	CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, int32_t iLineWidth = -1);

     IFWL_Widget			*m_pImp;

     IFWL_WidgetDelegate *m_pDelegate;

     CFWL_WidgetMgr		*m_pWidgetMgr;

@@ -94,7 +94,7 @@ class CFWL_WidgetDelegate
 public:

     CFWL_WidgetDelegate();

     virtual ~CFWL_WidgetDelegate();

-    virtual FX_INT32	OnProcessMessage(CFWL_Message *pMessage);

+    virtual int32_t	OnProcessMessage(CFWL_Message *pMessage);

     virtual FWL_ERR		OnProcessEvent(CFWL_Event *pEvent);

     virtual FWL_ERR		OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);

 };