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

fpdfsdk/src/fxedit/fxet_edit.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/fxedit/fxet_stub.h"
 #include "../../include/fxedit/fxet_edit.h"
 
 #define FX_EDIT_UNDO_MAXITEM                            10000
@@ skipping 87 matching lines @@
 
         if (m_pVTIterator->GetSection(section))
         {
                 section.rcSection = m_pEdit->VTToEdit(section.rcSection);
                 return TRUE;
         }
 
         return FALSE;
 }
 
-void CFX_Edit_Iterator::SetAt(FX_INT32 nWordIndex)
+void CFX_Edit_Iterator::SetAt(int32_t nWordIndex)
 {
         ASSERT(m_pVTIterator != NULL);
 
         m_pVTIterator->SetAt(nWordIndex);
 }
 
 void CFX_Edit_Iterator::SetAt(const CPVT_WordPlace & place)
 {
         ASSERT(m_pVTIterator != NULL);
 
@@ skipping 21 matching lines @@
 
 CFX_Edit_Provider::~CFX_Edit_Provider()
 {
 }
 
 IFX_Edit_FontMap* CFX_Edit_Provider::GetFontMap()
 {
         return m_pFontMap;
 }
 
-FX_INT32 CFX_Edit_Provider::GetCharWidth(FX_INT32 nFontIndex, FX_WORD word, FX_INT32 nWordStyle)
+int32_t CFX_Edit_Provider::GetCharWidth(int32_t nFontIndex, FX_WORD word, int32_t nWordStyle)
 {
         if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex))
         {
                 FX_DWORD charcode = word;
 
                 if (pPDFFont->IsUnicodeCompatible())            
                         charcode = pPDFFont->CharCodeFromUnicode(word); 
                 else
                         charcode = m_pFontMap->CharCodeFromUnicode(nFontIndex, word);
 
                 if (charcode != -1)                     
                         return pPDFFont->GetCharWidthF(charcode);
         }
 
         return 0;
 }
 
-FX_INT32 CFX_Edit_Provider::GetTypeAscent(FX_INT32 nFontIndex)
+int32_t CFX_Edit_Provider::GetTypeAscent(int32_t nFontIndex)
 {
         if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex))
                 return pPDFFont->GetTypeAscent();
 
         return 0;
 }
 
-FX_INT32 CFX_Edit_Provider::GetTypeDescent(FX_INT32 nFontIndex)
+int32_t CFX_Edit_Provider::GetTypeDescent(int32_t nFontIndex)
 {
         if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex))
                 return pPDFFont->GetTypeDescent();
 
         return 0;
 }
 
-FX_INT32 CFX_Edit_Provider::GetWordFontIndex(FX_WORD word, FX_INT32 charset, FX_INT32 nFontIndex)
+int32_t CFX_Edit_Provider::GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex)
 {
         return m_pFontMap->GetWordFontIndex(word,charset,nFontIndex);
 }
 
-FX_INT32 CFX_Edit_Provider::GetDefaultFontIndex()
+int32_t CFX_Edit_Provider::GetDefaultFontIndex()
 {
         return 0;
 }
 
 FX_BOOL CFX_Edit_Provider::IsLatinWord(FX_WORD word)
 {
         return FX_EDIT_ISLATINWORD(word);
 }
 
 /* --------------------------------- CFX_Edit_Refresh --------------------------------- */
@@ skipping 13 matching lines @@
 }
 
 void CFX_Edit_Refresh::Push(const CPVT_WordRange & linerange,const CPDF_Rect & rect)
 {
         m_NewLineRects.Add(linerange,rect);
 }
 
 void CFX_Edit_Refresh::NoAnalyse()
 {
         {
-                for (FX_INT32 i = 0, sz = m_OldLineRects.GetSize(); i < sz; i++)
+                for (int32_t i = 0, sz = m_OldLineRects.GetSize(); i < sz; i++)
                         if (CFX_Edit_LineRect * pOldRect = m_OldLineRects.GetAt(i))
                                 m_RefreshRects.Add(pOldRect->m_rcLine);
         }
 
         {
-                for (FX_INT32 i = 0, sz = m_NewLineRects.GetSize(); i < sz; i++)
+                for (int32_t i = 0, sz = m_NewLineRects.GetSize(); i < sz; i++)
                         if (CFX_Edit_LineRect * pNewRect = m_NewLineRects.GetAt(i))
                                 m_RefreshRects.Add(pNewRect->m_rcLine);
         }
 }
 
-void CFX_Edit_Refresh::Analyse(FX_INT32 nAlignment)
+void CFX_Edit_Refresh::Analyse(int32_t nAlignment)
 {
         FX_BOOL bLineTopChanged = FALSE;
         CPDF_Rect rcResult;
         FX_FLOAT fWidthDiff;
 
-        FX_INT32 szMax = FX_EDIT_MAX(m_OldLineRects.GetSize(),m_NewLineRects.GetSize());
-        FX_INT32 i = 0;
+        int32_t szMax = FX_EDIT_MAX(m_OldLineRects.GetSize(),m_NewLineRects.GetSize());
+        int32_t i = 0;
 
         while (i < szMax)
         {
                 CFX_Edit_LineRect * pOldRect = m_OldLineRects.GetAt(i);
                 CFX_Edit_LineRect * pNewRect = m_NewLineRects.GetAt(i);
 
                 if (pOldRect)
                 {
                         if (pNewRect)
                         {
@@ skipping 86 matching lines @@
         return &m_RefreshRects;
 }
 
 void CFX_Edit_Refresh::EndRefresh()
 {
         m_RefreshRects.Empty();
 }
 
 /* ------------------------------------- CFX_Edit_Undo ------------------------------------- */
 
-CFX_Edit_Undo::CFX_Edit_Undo(FX_INT32 nBufsize) : m_nCurUndoPos(0),
+CFX_Edit_Undo::CFX_Edit_Undo(int32_t nBufsize) : m_nCurUndoPos(0),
         m_nBufSize(nBufsize),
         m_bModified(FALSE),
         m_bVirgin(TRUE),
         m_bWorking(FALSE)
 {
 }
 
 CFX_Edit_Undo::~CFX_Edit_Undo()
 {
         Reset();
@@ skipping 24 matching lines @@
 
 FX_BOOL CFX_Edit_Undo::CanRedo() const
 {
         return m_nCurUndoPos < m_UndoItemStack.GetSize();
 }
 
 void CFX_Edit_Undo::Redo()
 {
         m_bWorking = TRUE;
 
-        FX_INT32 nStackSize = m_UndoItemStack.GetSize();
+        int32_t nStackSize = m_UndoItemStack.GetSize();
 
         if (m_nCurUndoPos < nStackSize)
         {
                 IFX_Edit_UndoItem * pItem = m_UndoItemStack.GetAt(m_nCurUndoPos);
                 ASSERT(pItem != NULL);
 
                 pItem->Redo();
 
                 m_nCurUndoPos++;
                 m_bModified = (m_nCurUndoPos != 0);             
@@ skipping 29 matching lines @@
 }
 
 FX_BOOL CFX_Edit_Undo::IsModified() const
 {
         if (m_bVirgin)
                 return m_bModified;
         else
                 return TRUE;
 }
 
-IFX_Edit_UndoItem* CFX_Edit_Undo::GetItem(FX_INT32 nIndex)
+IFX_Edit_UndoItem* CFX_Edit_Undo::GetItem(int32_t nIndex)
 {
         if (nIndex>=0 && nIndex < m_UndoItemStack.GetSize())
                 return m_UndoItemStack.GetAt(nIndex);
 
         return NULL;
 }
 
 void CFX_Edit_Undo::RemoveHeads()
 {
         ASSERT(m_UndoItemStack.GetSize() > 1);
 
         delete m_UndoItemStack.GetAt(0);
         m_UndoItemStack.RemoveAt(0);
 }
 
 void CFX_Edit_Undo::RemoveTails()
 {
-        for (FX_INT32 i = m_UndoItemStack.GetSize()-1; i >= m_nCurUndoPos; i--)
+        for (int32_t i = m_UndoItemStack.GetSize()-1; i >= m_nCurUndoPos; i--)
         {
                 delete m_UndoItemStack.GetAt(i);
                 m_UndoItemStack.RemoveAt(i);
         }
 }
 
 void CFX_Edit_Undo::Reset()
 {
-        for (FX_INT32 i=0, sz=m_UndoItemStack.GetSize(); i < sz; i++)
+        for (int32_t i=0, sz=m_UndoItemStack.GetSize(); i < sz; i++)
         {
                 delete m_UndoItemStack.GetAt(i);
         }
         m_nCurUndoPos = 0;
         m_UndoItemStack.RemoveAll();
 }
 
 /* -------------------------------- CFX_Edit_GroupUndoItem -------------------------------- */
 
 CFX_Edit_GroupUndoItem::CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle) : m_sTitle(sTitle)
@@ skipping 60 matching lines @@
 }
 
 CFX_WideString CFX_Edit_GroupUndoItem::GetUndoTitle()
 {
         return m_sTitle;
 }
 
 /* ------------------------------------- CFX_Edit_UndoItem derived classes ------------------------------------- */
 
 CFXEU_InsertWord::CFXEU_InsertWord(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace,
-                                                                 FX_WORD word, FX_INT32 charset, const CPVT_WordProps * pWordProps) 
+                                                                 FX_WORD word, int32_t charset, const CPVT_WordProps * pWordProps) 
         : m_pEdit(pEdit), m_wpOld(wpOldPlace), m_wpNew(wpNewPlace), m_Word(word), m_nCharset(charset), m_WordProps()
 {
         if (pWordProps)
                 m_WordProps = *pWordProps;
 }
 
 CFXEU_InsertWord::~CFXEU_InsertWord()
 {
 }
 
@@ skipping 54 matching lines @@
                 m_pEdit->SelectNone();
                 m_pEdit->SetCaret(m_wpNew);
                 m_pEdit->Backspace(FALSE,TRUE);
         }
 }
 
 /* -------------------------------------------------------------------------- */
 //CFXEU_Backspace
 
 CFXEU_Backspace::CFXEU_Backspace(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace,
-                                                           FX_WORD word, FX_INT32 charset,
+                                                           FX_WORD word, int32_t charset,
                                                            const CPVT_SecProps & SecProps, const CPVT_WordProps & WordProps) :
                         m_pEdit(pEdit),
                         m_wpOld(wpOldPlace),
                         m_wpNew(wpNewPlace),
                         m_Word(word),
                         m_nCharset(charset),
                         m_SecProps(SecProps),
                         m_WordProps(WordProps)                                                                   
 {
 }
@@ skipping 26 matching lines @@
                 {
                         m_pEdit->InsertWord(m_Word,m_nCharset,&m_WordProps,FALSE,TRUE);
                 }
         }
 }
 
 /* -------------------------------------------------------------------------- */
 //CFXEU_Delete
 
 CFXEU_Delete::CFXEU_Delete(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace,
-                                                           FX_WORD word, FX_INT32 charset,
+                                                           FX_WORD word, int32_t charset,
                                                            const CPVT_SecProps & SecProps, const CPVT_WordProps & WordProps, FX_BOOL bSecEnd) :
                         m_pEdit(pEdit),
                         m_wpOld(wpOldPlace),
                         m_wpNew(wpNewPlace),
                         m_Word(word),
                         m_nCharset(charset),
                         m_SecProps(SecProps),
                         m_WordProps(WordProps),
                         m_bSecEnd(bSecEnd)
 {
@@ skipping 62 matching lines @@
                 m_pEdit->SetCaret(m_wrSel.BeginPos);
                 m_pEdit->InsertText(m_swText.c_str(), DEFAULT_CHARSET, NULL, NULL, FALSE, TRUE);
                 m_pEdit->SetSel(m_wrSel.BeginPos,m_wrSel.EndPos);
         }
 }
 
 /* -------------------------------------------------------------------------- */
 //CFXEU_ClearRich
 
 CFXEU_ClearRich::CFXEU_ClearRich(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace,
-                                                           const CPVT_WordRange & wrSel, FX_WORD word, FX_INT32 charset,
+                                                           const CPVT_WordRange & wrSel, FX_WORD word, int32_t charset,
                                                            const CPVT_SecProps & SecProps, const CPVT_WordProps & WordProps) :
                         m_pEdit(pEdit),
                         m_wpOld(wpOldPlace),
                         m_wpNew(wpNewPlace),
                         m_wrSel(wrSel),
                         m_Word(word),
                         m_nCharset(charset),
                         m_SecProps(SecProps),
                         m_WordProps(WordProps)                                                                   
 {
@@ skipping 32 matching lines @@
                 {
                         m_pEdit->PaintInsertText(m_wrSel.BeginPos,m_wrSel.EndPos);
                         m_pEdit->SetSel(m_wrSel.BeginPos,m_wrSel.EndPos);
                 }
         }
 }
 /* -------------------------------------------------------------------------- */
 //CFXEU_InsertText
 
 CFXEU_InsertText::CFXEU_InsertText(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace,
-                                                           const CFX_WideString & swText, FX_INT32 charset,
+                                                           const CFX_WideString & swText, int32_t charset,
                                                            const CPVT_SecProps * pSecProps, const CPVT_WordProps * pWordProps) :
                         m_pEdit(pEdit),
                         m_wpOld(wpOldPlace),
                         m_wpNew(wpNewPlace),
                         m_swText(swText),
                         m_nCharset(charset),
                         m_SecProps(),
                         m_WordProps()                                                                    
 {
         if (pSecProps)
@@ skipping 218 matching lines @@
         return NULL;
 }
 
 void CFX_Edit::SetPlateRect(const CPDF_Rect & rect, FX_BOOL bPaint/* = TRUE*/)
 {       
         m_pVT->SetPlateRect(rect);
         m_ptScrollPos = CPDF_Point(rect.left,rect.top);                 
         if (bPaint) Paint();
 }
 
-void CFX_Edit::SetAlignmentH(FX_INT32 nFormat/* =0 */, FX_BOOL bPaint/* = TRUE*/)
+void CFX_Edit::SetAlignmentH(int32_t nFormat/* =0 */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetAlignment(nFormat);
         if (bPaint) Paint();
 }
 
-void CFX_Edit::SetAlignmentV(FX_INT32 nFormat/* =0 */, FX_BOOL bPaint/* = TRUE*/)
+void CFX_Edit::SetAlignmentV(int32_t nFormat/* =0 */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_nAlignment = nFormat;
         if (bPaint) Paint();
 }
 
 void CFX_Edit::SetPasswordChar(FX_WORD wSubWord/* ='*' */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetPasswordChar(wSubWord);
         if (bPaint) Paint();
 }
 
-void CFX_Edit::SetLimitChar(FX_INT32 nLimitChar/* =0 */, FX_BOOL bPaint/* = TRUE*/)
+void CFX_Edit::SetLimitChar(int32_t nLimitChar/* =0 */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetLimitChar(nLimitChar);
         if (bPaint) Paint();
 }
 
-void CFX_Edit::SetCharArray(FX_INT32 nCharArray/* =0 */, FX_BOOL bPaint/* = TRUE*/)
+void CFX_Edit::SetCharArray(int32_t nCharArray/* =0 */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetCharArray(nCharArray);
         if (bPaint) Paint();
 }
 
 void CFX_Edit::SetCharSpace(FX_FLOAT fCharSpace/* =0.0f */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetCharSpace(fCharSpace);
         if (bPaint) Paint();
 }
 
-void CFX_Edit::SetHorzScale(FX_INT32 nHorzScale/* =100 */, FX_BOOL bPaint/* = TRUE*/)
+void CFX_Edit::SetHorzScale(int32_t nHorzScale/* =100 */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetHorzScale(nHorzScale);
         if (bPaint) Paint();
 }
 
 void CFX_Edit::SetMultiLine(FX_BOOL bMultiLine/* =TRUE */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetMultiLine(bMultiLine);
         if (bPaint) Paint();
 }
@@ skipping 27 matching lines @@
         m_bEnableScroll = bAuto;
         if (bPaint) Paint();
 }
 
 void CFX_Edit::SetTextOverflow(FX_BOOL bAllowed /*= FALSE*/, FX_BOOL bPaint/* = TRUE*/)
 {
         m_bEnableOverflow = bAllowed;
         if (bPaint) Paint();
 }
 
-void CFX_Edit::SetSel(FX_INT32 nStartChar,FX_INT32 nEndChar)
+void CFX_Edit::SetSel(int32_t nStartChar,int32_t nEndChar)
 {
         if (m_pVT->IsValid())
         {
                 if (nStartChar == 0 && nEndChar < 0)
                 {
                         SelectAll();
                 }
                 else if (nStartChar < 0)
                 {       
                         this->SelectNone();
@@ skipping 30 matching lines @@
                         SetCaretInfo();
                 }
                 else
                 {               
                         ScrollToCaret();
                         SetCaretInfo();
                 }
         }
 }
 
-void CFX_Edit::GetSel(FX_INT32 & nStartChar, FX_INT32 & nEndChar) const
+void CFX_Edit::GetSel(int32_t & nStartChar, int32_t & nEndChar) const
 {
         nStartChar = -1;
         nEndChar = -1;
 
         if (m_pVT->IsValid())
         {
                 if (m_SelState.IsExist())
                 {
                         if (m_SelState.BeginPos.WordCmp(m_SelState.EndPos)<0)
                         {
                                 nStartChar = m_pVT->WordPlaceToWordIndex(m_SelState.BeginPos);
                                 nEndChar = m_pVT->WordPlaceToWordIndex(m_SelState.EndPos);
                         }
                         else
                         {
                                 nStartChar = m_pVT->WordPlaceToWordIndex(m_SelState.EndPos);
                                 nEndChar = m_pVT->WordPlaceToWordIndex(m_SelState.BeginPos);
                         }
                 }
                 else
                 {
                         nStartChar = m_pVT->WordPlaceToWordIndex(m_wpCaret);
                         nEndChar = m_pVT->WordPlaceToWordIndex(m_wpCaret);
                 }
         }
 }
 
-FX_INT32 CFX_Edit::GetCaret() const
+int32_t CFX_Edit::GetCaret() const
 {
         if (m_pVT->IsValid())
                 return m_pVT->WordPlaceToWordIndex(m_wpCaret);
 
         return -1;
 }
 
 CPVT_WordPlace CFX_Edit::GetCaretWordPlace() const
 {
         return m_wpCaret;
@@ skipping 89 matching lines @@
         }
 
         return swRet;
 }
 
 CFX_WideString CFX_Edit::GetSelText() const
 {
         return GetRangeText(m_SelState.ConvertToWordRange());
 }
 
-FX_INT32 CFX_Edit::GetTotalWords() const
+int32_t CFX_Edit::GetTotalWords() const
 {
         return m_pVT->GetTotalWords();
 }
 
-FX_INT32 CFX_Edit::GetTotalLines() const
+int32_t CFX_Edit::GetTotalLines() const
 {
-        FX_INT32 nLines = 0;
+        int32_t nLines = 0;
 
         if (IPDF_VariableText_Iterator * pIterator = m_pVT->GetIterator())
         {
                 pIterator->SetAt(0);
                 while (pIterator->NextLine())
                         nLines++;
         }
 
         return nLines+1;
 }
@@ skipping 32 matching lines @@
 {
         return m_pVT->IsRichText();
 }
 
 void CFX_Edit::SetRichText(FX_BOOL bRichText/* =TRUE */, FX_BOOL bPaint/* = TRUE*/)
 {
         m_pVT->SetRichText(bRichText);
         if (bPaint) Paint();
 }
 
-FX_BOOL CFX_Edit::SetRichFontIndex(FX_INT32 nFontIndex)
+FX_BOOL CFX_Edit::SetRichFontIndex(int32_t nFontIndex)
 {
         CPVT_WordProps WordProps;
         WordProps.nFontIndex = nFontIndex;
         return SetRichTextProps(EP_FONTINDEX,NULL,&WordProps);  
 }
 
 FX_BOOL CFX_Edit::SetRichFontSize(FX_FLOAT fFontSize)
 {       
         CPVT_WordProps WordProps;
         WordProps.fFontSize = fFontSize;
         return SetRichTextProps(EP_FONTSIZE,NULL,&WordProps);   
 }
 
 FX_BOOL CFX_Edit::SetRichTextColor(FX_COLORREF dwColor)
 {
         CPVT_WordProps WordProps;
         WordProps.dwWordColor = dwColor;
         return SetRichTextProps(EP_WORDCOLOR,NULL,&WordProps);  
 }
 
-FX_BOOL CFX_Edit::SetRichTextScript(FX_INT32 nScriptType)
+FX_BOOL CFX_Edit::SetRichTextScript(int32_t nScriptType)
 {
         CPVT_WordProps WordProps;
         WordProps.nScriptType = nScriptType;
         return SetRichTextProps(EP_SCRIPTTYPE,NULL,&WordProps); 
 }
 
 FX_BOOL CFX_Edit::SetRichTextBold(FX_BOOL bBold)
 {
         CPVT_WordProps WordProps;
         if (bBold)
@@ skipping 25 matching lines @@
         return SetRichTextProps(EP_CROSSOUT,NULL,&WordProps);
 }
 
 FX_BOOL CFX_Edit::SetRichTextCharSpace(FX_FLOAT fCharSpace)
 {
         CPVT_WordProps WordProps;
         WordProps.fCharSpace = fCharSpace;
         return SetRichTextProps(EP_CHARSPACE,NULL,&WordProps);  
 }
 
-FX_BOOL CFX_Edit::SetRichTextHorzScale(FX_INT32 nHorzScale /*= 100*/)
+FX_BOOL CFX_Edit::SetRichTextHorzScale(int32_t nHorzScale /*= 100*/)
 {
         CPVT_WordProps WordProps;
         WordProps.nHorzScale = nHorzScale;
         return SetRichTextProps(EP_HORZSCALE,NULL,&WordProps);  
 }
 
 FX_BOOL CFX_Edit::SetRichTextLineLeading(FX_FLOAT fLineLeading)
 {
         CPVT_SecProps SecProps;
         SecProps.fLineLeading = fLineLeading;
         return SetRichTextProps(EP_LINELEADING,&SecProps,NULL); 
 }
 
 FX_BOOL CFX_Edit::SetRichTextLineIndent(FX_FLOAT fLineIndent)
 {
         CPVT_SecProps SecProps;
         SecProps.fLineIndent = fLineIndent;
         return SetRichTextProps(EP_LINEINDENT,&SecProps,NULL);
 }
 
-FX_BOOL CFX_Edit::SetRichTextAlignment(FX_INT32 nAlignment)
+FX_BOOL CFX_Edit::SetRichTextAlignment(int32_t nAlignment)
 {
         CPVT_SecProps SecProps;
         SecProps.nAlignment = nAlignment;
         return SetRichTextProps(EP_ALIGNMENT,&SecProps,NULL);
 }
 
 FX_BOOL CFX_Edit::SetRichTextProps(EDIT_PROPS_E eProps, const CPVT_SecProps * pSecProps, const CPVT_WordProps * pWordProps)
 {
         FX_BOOL bSet = FALSE;
         FX_BOOL bSet1,bSet2;
@@ skipping 433 matching lines @@
                         }
                         
                         pIterator->SetAt(oldplace);
                         return bSet;
                 }
         }
 
         return FALSE;
 }
 
-void CFX_Edit::SetText(FX_LPCWSTR text,FX_INT32 charset /*= DEFAULT_CHARSET*/,
+void CFX_Edit::SetText(FX_LPCWSTR text,int32_t charset /*= DEFAULT_CHARSET*/,
                                                 const CPVT_SecProps * pSecProps /*= NULL*/,const CPVT_WordProps * pWordProps /*= NULL*/)
 {
         SetText(text,charset,pSecProps,pWordProps,TRUE,TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertWord(FX_WORD word, FX_INT32 charset /*= DEFAULT_CHARSET*/, const CPVT_WordProps * pWordProps /*= NULL*/)
+FX_BOOL CFX_Edit::InsertWord(FX_WORD word, int32_t charset /*= DEFAULT_CHARSET*/, const CPVT_WordProps * pWordProps /*= NULL*/)
 {
         return InsertWord(word,charset,pWordProps,TRUE,TRUE);
 }
 
 FX_BOOL CFX_Edit::InsertReturn(const CPVT_SecProps * pSecProps /*= NULL*/,const CPVT_WordProps * pWordProps /*= NULL*/)
 {
         return InsertReturn(pSecProps,pWordProps,TRUE,TRUE);
 }
 
 FX_BOOL CFX_Edit::Backspace()
 {
         return Backspace(TRUE,TRUE);
 }
 
 FX_BOOL CFX_Edit::Delete()
 {
         return Delete(TRUE,TRUE);
 }
 
 FX_BOOL CFX_Edit::Clear()
 {
         return Clear(TRUE,TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertText(FX_LPCWSTR text, FX_INT32 charset /*= DEFAULT_CHARSET*/,
+FX_BOOL CFX_Edit::InsertText(FX_LPCWSTR text, int32_t charset /*= DEFAULT_CHARSET*/,
                                                                 const CPVT_SecProps * pSecProps /*= NULL*/,const CPVT_WordProps * pWordProps /*= NULL*/)
 {
         return InsertText(text,charset,pSecProps,pWordProps,TRUE,TRUE);
 }
 
 FX_FLOAT CFX_Edit::GetFontSize() const
 {
         return m_pVT->GetFontSize();
 }
 
 FX_WORD CFX_Edit::GetPasswordChar() const
 {
         return m_pVT->GetPasswordChar();
 }
 
-FX_INT32 CFX_Edit::GetCharArray() const
+int32_t CFX_Edit::GetCharArray() const
 {
         return m_pVT->GetCharArray();
 }
 
 CPDF_Rect CFX_Edit::GetPlateRect() const
 {
         return m_pVT->GetPlateRect();
 }
 
 CPDF_Rect CFX_Edit::GetContentRect() const
 {
         return VTToEdit(m_pVT->GetContentRect());
 }
 
-FX_INT32 CFX_Edit::GetHorzScale() const
+int32_t CFX_Edit::GetHorzScale() const
 {
         return m_pVT->GetHorzScale();
 }
 
 FX_FLOAT CFX_Edit::GetCharSpace() const
 {
         return m_pVT->GetCharSpace();
 }
 
 // inner methods
@@ skipping 409 matching lines @@
 //                      }
 //              }               
 
                 if (m_bNotify && m_pNotify)
                 {
                         if (!m_bNotifyFlag)
                         {
                                 m_bNotifyFlag = TRUE;
                                 if (const CFX_Edit_RectArray * pRects = m_Refresh.GetRefreshRects())
                                 {
-                                        for (FX_INT32 i = 0, sz = pRects->GetSize(); i < sz; i++)
+                                        for (int32_t i = 0, sz = pRects->GetSize(); i < sz; i++)
                                                 m_pNotify->IOnInvalidateRect(pRects->GetAt(i));
                                 }
                                 m_bNotifyFlag = FALSE;
                         }
                 }
 
                 m_Refresh.EndRefresh();
         }
 }
 
@@ skipping 213 matching lines @@
                 
                 if (!m_bNotifyFlag)
                 {
                         m_bNotifyFlag = TRUE;
                         m_pNotify->IOnCaretChange(SecProps,WordProps);
                         m_bNotifyFlag = FALSE;
                 }
         }       
 }
 
-void CFX_Edit::SetCaret(FX_INT32 nPos)
+void CFX_Edit::SetCaret(int32_t nPos)
 {
         if (m_pVT->IsValid())
         {
                 SelectNone();           
                 SetCaret(m_pVT->WordIndexToWordPlace(nPos));
                 m_SelState.Set(m_wpCaret,m_wpCaret);
 
                 ScrollToCaret();
                 SetCaretOrigin();
                 SetCaretInfo();
@@ skipping 294 matching lines @@
                                         SetCaret(m_pVT->GetLineEndPlace(m_wpCaret));
                                                 
                                 ScrollToCaret();                        
                                 SetCaretOrigin();
                                 SetCaretInfo();
                         }
                 }
         }
 }
 
-void CFX_Edit::SetText(FX_LPCWSTR text,FX_INT32 charset,
+void CFX_Edit::SetText(FX_LPCWSTR text,int32_t charset,
                                                 const CPVT_SecProps * pSecProps,const CPVT_WordProps * pWordProps, FX_BOOL bAddUndo, FX_BOOL bPaint)
 {
         Empty();
         DoInsertText(CPVT_WordPlace(0,0,-1), text, charset, pSecProps, pWordProps);
         if (bPaint) Paint();
         if (m_bOprNotify && m_pOprNotify)
                 m_pOprNotify->OnSetText(m_wpCaret, m_wpOldCaret);
         //if (bAddUndo)
 }
 
-FX_BOOL CFX_Edit::InsertWord(FX_WORD word, FX_INT32 charset, const CPVT_WordProps * pWordProps, FX_BOOL bAddUndo, FX_BOOL bPaint)
+FX_BOOL CFX_Edit::InsertWord(FX_WORD word, int32_t charset, const CPVT_WordProps * pWordProps, FX_BOOL bAddUndo, FX_BOOL bPaint)
 {
         if (IsTextOverflow()) return FALSE;
 
         if (m_pVT->IsValid())
         {
                 m_pVT->UpdateWordPlace(m_wpCaret);
 
                 SetCaret(m_pVT->InsertWord(m_wpCaret,word,GetCharSetFromUnicode(word, charset),pWordProps));
                 m_SelState.Set(m_wpCaret,m_wpCaret);
 
@@ skipping 270 matching lines @@
                         if (m_bOprNotify && m_pOprNotify)
                                 m_pOprNotify->OnClear(m_wpCaret, m_wpOldCaret);
 
                         return TRUE;
                 }
         }
 
         return FALSE;
 }
 
-FX_BOOL CFX_Edit::InsertText(FX_LPCWSTR text, FX_INT32 charset,
+FX_BOOL CFX_Edit::InsertText(FX_LPCWSTR text, int32_t charset,
                                         const CPVT_SecProps * pSecProps, const CPVT_WordProps * pWordProps, FX_BOOL bAddUndo, FX_BOOL bPaint)
 {
         if (IsTextOverflow()) return FALSE;
 
         m_pVT->UpdateWordPlace(m_wpCaret);
         SetCaret(DoInsertText(m_wpCaret, text, charset, pSecProps, pWordProps));
         m_SelState.Set(m_wpCaret,m_wpCaret);
 
         if (m_wpCaret != m_wpOldCaret)
         {
@@ skipping 75 matching lines @@
                         }
                         else if (pIterator->GetLine(line))
                         {                               
                                 m_ptCaret.x = line.ptLine.x;
                                 m_ptCaret.y = line.ptLine.y;
                         }
                 }                               
         }       
 }
 
-FX_INT32 CFX_Edit::WordPlaceToWordIndex(const CPVT_WordPlace & place) const
+int32_t CFX_Edit::WordPlaceToWordIndex(const CPVT_WordPlace & place) const
 {
         if (m_pVT->IsValid())
                 return m_pVT->WordPlaceToWordIndex(place);
 
         return -1;
 }
 
-CPVT_WordPlace CFX_Edit::WordIndexToWordPlace(FX_INT32 index) const
+CPVT_WordPlace CFX_Edit::WordIndexToWordPlace(int32_t index) const
 {
         if (m_pVT->IsValid())
                 return m_pVT->WordIndexToWordPlace(index);
 
         return CPVT_WordPlace();
 }
 
 FX_BOOL CFX_Edit::IsTextFull() const
 {
-        FX_INT32 nTotalWords = m_pVT->GetTotalWords();
-        FX_INT32 nLimitChar = m_pVT->GetLimitChar();
-        FX_INT32 nCharArray = m_pVT->GetCharArray();
+        int32_t nTotalWords = m_pVT->GetTotalWords();
+        int32_t nLimitChar = m_pVT->GetLimitChar();
+        int32_t nCharArray = m_pVT->GetCharArray();
 
         return IsTextOverflow() || (nLimitChar>0 && nTotalWords >= nLimitChar)
                 || (nCharArray>0 && nTotalWords >= nCharArray);
 }
 
 FX_BOOL CFX_Edit::IsTextOverflow() const
 {
         if (!m_bEnableScroll && !m_bEnableOverflow)
         {
                 CPDF_Rect rcPlate = m_pVT->GetPlateRect();
@@ skipping 109 matching lines @@
                 pIterator->GetLine(line);
 
                 pIterator->SetAt(wpOld);
 
                 return line.ptLine.y + line.fLineDescent;
         }
 
         return 0.0f;
 }
 
-CPVT_WordPlace CFX_Edit::DoInsertText(const CPVT_WordPlace& place, FX_LPCWSTR text, FX_INT32 charset, 
+CPVT_WordPlace CFX_Edit::DoInsertText(const CPVT_WordPlace& place, FX_LPCWSTR text, int32_t charset, 
                                                                           const CPVT_SecProps * pSecProps, const CPVT_WordProps * pWordProps)
 {
         CPVT_WordPlace wp = place;
 
         if (m_pVT->IsValid())
         {
                 CFX_WideString sText = text;
 
-                for (FX_INT32 i = 0, sz = sText.GetLength(); i < sz; i++)
+                for (int32_t i = 0, sz = sText.GetLength(); i < sz; i++)
                 {
                         FX_WORD word = sText[i];
                         switch (word)
                         {
                         case 0x0D:
                                 wp = m_pVT->InsertSection(wp,pSecProps,pWordProps);
                                 if (sText[i+1] == 0x0A)
                                         i++;
                                 break;
                         case 0x0A:      
                                 wp = m_pVT->InsertSection(wp,pSecProps,pWordProps);
                                 if (sText[i+1] == 0x0D)
                                         i++;
                                 break;
                         case 0x09:
                                 word = 0x20;
                         default:
                                 wp = m_pVT->InsertWord(wp,word,GetCharSetFromUnicode(word, charset),pWordProps);
                                 break;
                         }
                 }
         }
 
         return wp;
 }
 
-FX_INT32 CFX_Edit::GetCharSetFromUnicode(FX_WORD word, FX_INT32 nOldCharset)
+int32_t CFX_Edit::GetCharSetFromUnicode(FX_WORD word, int32_t nOldCharset)
 {
         if (IFX_Edit_FontMap* pFontMap = this->GetFontMap())
                 return pFontMap->CharSetFromUnicode(word, nOldCharset);
         else
                 return nOldCharset;
 }
 
 void CFX_Edit::BeginGroupUndo(const CFX_WideString& sTitle)
 {
         ASSERT(m_pGroupUndoItem == NULL);
@@ skipping 24 matching lines @@
         }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem)
 {
         m_Undo.AddItem(pUndoItem);
         if (m_bOprNotify && m_pOprNotify)
                 m_pOprNotify->OnAddUndo(pUndoItem);
 }