FX_BOOL considered harmful, part 2.

fpdfsdk/src/fsdk_baseform.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 "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 19 matching lines @@
                     m_nValueAge(0)
 {
     ASSERT(m_pInterForm != NULL);
 }
 
 CPDFSDK_Widget::~CPDFSDK_Widget()
 {
 
 }
 
-FX_BOOL     CPDFSDK_Widget::IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode)
+bool     CPDFSDK_Widget::IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode)
 {
     CPDF_Dictionary* pAP = m_pAnnot->GetAnnotDict()->GetDict("AP");
-    if (pAP == NULL) return FALSE;
+    if (pAP == NULL) return false;
 
     // Choose the right sub-ap
     const FX_CHAR* ap_entry = "N";
     if (mode == CPDF_Annot::Down)
         ap_entry = "D";
     else if (mode == CPDF_Annot::Rollover)
         ap_entry = "R";
     if (!pAP->KeyExist(ap_entry))
         ap_entry = "N";
 
     // Get the AP stream or subdirectory
     CPDF_Object* psub = pAP->GetElementValue(ap_entry);
-    if (psub == NULL) return FALSE;
+    if (psub == NULL) return false;
 
     int nFieldType = GetFieldType();
     switch (nFieldType)
     {
     case FIELDTYPE_PUSHBUTTON:
     case FIELDTYPE_COMBOBOX:
     case FIELDTYPE_LISTBOX:
     case FIELDTYPE_TEXTFIELD:
     case FIELDTYPE_SIGNATURE:
         return psub->GetType() == PDFOBJ_STREAM;
     case FIELDTYPE_CHECKBOX:
     case FIELDTYPE_RADIOBUTTON:
         if (psub->GetType() == PDFOBJ_DICTIONARY) {
             CPDF_Dictionary* pSubDict = (CPDF_Dictionary*)psub;
             return pSubDict->GetStream(GetAppState()) != NULL;
         }
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 int CPDFSDK_Widget::GetFieldType() const
 {
     CPDF_FormField* pField = GetFormField();
     ASSERT(pField != NULL);
 
     return pField->GetFieldType();
 }
 
@@ skipping 47 matching lines @@
 }
 
 int CPDFSDK_Widget::GetRotate() const
 {
     CPDF_FormControl* pCtrl = GetFormControl();
     ASSERT(pCtrl != NULL);
 
     return pCtrl->GetRotation() % 360;
 }
 
-FX_BOOL CPDFSDK_Widget::GetFillColor(FX_COLORREF& color) const
+bool CPDFSDK_Widget::GetFillColor(FX_COLORREF& color) const
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     int iColorType = 0;
     color = FX_ARGBTOCOLORREF(pFormCtrl->GetBackgroundColor(iColorType));
 
     return iColorType != COLORTYPE_TRANSPARENT;
 }
 
-FX_BOOL CPDFSDK_Widget::GetBorderColor(FX_COLORREF& color) const
+bool CPDFSDK_Widget::GetBorderColor(FX_COLORREF& color) const
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     int iColorType = 0;
     color = FX_ARGBTOCOLORREF(pFormCtrl->GetBorderColor(iColorType));
 
     return iColorType != COLORTYPE_TRANSPARENT;
 }
 
-FX_BOOL CPDFSDK_Widget::GetTextColor(FX_COLORREF& color) const
+bool CPDFSDK_Widget::GetTextColor(FX_COLORREF& color) const
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     CPDF_DefaultAppearance da = pFormCtrl->GetDefaultAppearance();
     if (da.HasColor())
     {
         FX_ARGB argb;
         int iColorType = COLORTYPE_TRANSPARENT;
         da.GetColor(argb, iColorType);
         color = FX_ARGBTOCOLORREF(argb);
 
         return iColorType != COLORTYPE_TRANSPARENT;
     }
 
-    return FALSE;
+    return false;
 }
 
 FX_FLOAT CPDFSDK_Widget::GetFontSize() const
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     CPDF_DefaultAppearance pDa = pFormCtrl->GetDefaultAppearance();
     CFX_ByteString csFont = "";
     FX_FLOAT fFontSize = 0.0f;
@@ skipping 35 matching lines @@
 }
 
 int CPDFSDK_Widget::CountOptions() const
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     return pFormField->CountOptions();
 }
 
-FX_BOOL CPDFSDK_Widget::IsOptionSelected(int nIndex) const
+bool CPDFSDK_Widget::IsOptionSelected(int nIndex) const
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     return pFormField->IsItemSelected(nIndex);
 }
 
 int CPDFSDK_Widget::GetTopVisibleIndex() const
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     return pFormField->GetTopVisibleIndex();
 }
 
-FX_BOOL CPDFSDK_Widget::IsChecked() const
+bool CPDFSDK_Widget::IsChecked() const
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     return pFormCtrl->IsChecked();
 }
 
 int CPDFSDK_Widget::GetAlignment() const
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     return pFormCtrl->GetControlAlignment();
 }
 
 int CPDFSDK_Widget::GetMaxLen() const
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     return pFormField->GetMaxLen();
 }
 
-void CPDFSDK_Widget::SetCheck(FX_BOOL bChecked, FX_BOOL bNotify)
+void CPDFSDK_Widget::SetCheck(bool bChecked, bool bNotify)
 {
     CPDF_FormControl* pFormCtrl = GetFormControl();
     ASSERT(pFormCtrl != NULL);
 
     CPDF_FormField* pFormField = pFormCtrl->GetField();
     ASSERT(pFormField != NULL);
 
     pFormField->CheckControl(pFormField->GetControlIndex(pFormCtrl), bChecked, bNotify);
 }
 
-void CPDFSDK_Widget::SetValue(const CFX_WideString& sValue, FX_BOOL bNotify)
+void CPDFSDK_Widget::SetValue(const CFX_WideString& sValue, bool bNotify)
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     pFormField->SetValue(sValue, bNotify);
 }
 
 void CPDFSDK_Widget::SetDefaultValue(const CFX_WideString& sValue)
 {
 }
-void CPDFSDK_Widget::SetOptionSelection(int index, FX_BOOL bSelected, FX_BOOL bNotify)
+void CPDFSDK_Widget::SetOptionSelection(int index, bool bSelected, bool bNotify)
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     pFormField->SetItemSelection(index, bSelected, bNotify);
 }
 
-void CPDFSDK_Widget::ClearSelection(FX_BOOL bNotify)
+void CPDFSDK_Widget::ClearSelection(bool bNotify)
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     pFormField->ClearSelection(bNotify);
 }
 
 void CPDFSDK_Widget::SetTopVisibleIndex(int index)
 {
 }
 
 void CPDFSDK_Widget::SetAppModified()
 {
-    m_bAppModified = TRUE;
+    m_bAppModified = true;
 }
 
 void CPDFSDK_Widget::ClearAppModified()
 {
-    m_bAppModified = FALSE;
+    m_bAppModified = false;
 }
 
-FX_BOOL CPDFSDK_Widget::IsAppModified() const
+bool CPDFSDK_Widget::IsAppModified() const
 {
     return m_bAppModified;
 }
 
-void CPDFSDK_Widget::ResetAppearance(const FX_WCHAR* sValue, FX_BOOL bValueChanged)
+void CPDFSDK_Widget::ResetAppearance(const FX_WCHAR* sValue, bool bValueChanged)
 {
     SetAppModified();
 
     m_nAppAge++;
     if (m_nAppAge > 999999)
         m_nAppAge = 0;
     if (bValueChanged)
         m_nValueAge++;
 
     int nFieldType = GetFieldType();
@@ skipping 17 matching lines @@
         break;
     case FIELDTYPE_TEXTFIELD:
         ResetAppearance_TextField(sValue);
         break;
     }
 
     ASSERT(m_pAnnot != NULL);
     m_pAnnot->ClearCachedAP();
 }
 
-CFX_WideString CPDFSDK_Widget::OnFormat(FX_BOOL& bFormated)
+CFX_WideString CPDFSDK_Widget::OnFormat(bool& bFormated)
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
     return m_pInterForm->OnFormat(pFormField, bFormated);
 }
 
-void CPDFSDK_Widget::ResetFieldAppearance(FX_BOOL bValueChanged)
+void CPDFSDK_Widget::ResetFieldAppearance(bool bValueChanged)
 {
     CPDF_FormField* pFormField = GetFormField();
     ASSERT(pFormField != NULL);
 
     ASSERT(m_pInterForm != NULL);
 
     m_pInterForm->ResetFieldAppearance(pFormField, NULL, bValueChanged);
 }
 
 void    CPDFSDK_Widget::DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
@@ skipping 619 matching lines @@
 
     CFX_ByteTextBuf sBody, sLines;
 
     CPDF_Rect rcClient = GetClientRect();
     CPDF_Rect rcButton = rcClient;
     rcButton.left = rcButton.right - 13;
     rcButton.Normalize();
 
     if (IFX_Edit * pEdit = IFX_Edit::NewEdit())
     {
-        pEdit->EnableRefresh(FALSE);
+        pEdit->EnableRefresh(false);
 
         CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
         ASSERT(pDoc != NULL);
         CPDFDoc_Environment* pEnv = pDoc->GetEnv();
         CBA_FontMap FontMap(this,pEnv->GetSysHandler());
         FontMap.Initial();
         pEdit->SetFontMap(&FontMap);
 
         CPDF_Rect rcEdit = rcClient;
         rcEdit.right = rcButton.left;
         rcEdit.Normalize();
 
         pEdit->SetPlateRect(rcEdit);
         pEdit->SetAlignmentV(1);
 
         FX_FLOAT fFontSize = GetFontSize();
         if (IsFloatZero(fFontSize))
-            pEdit->SetAutoFontSize(TRUE);
+            pEdit->SetAutoFontSize(true);
         else
             pEdit->SetFontSize(fFontSize);
 
         pEdit->Initialize();
 
         if (sValue)
             pEdit->SetText(sValue);
         else
         {
             int32_t nCurSel = pField->GetSelectedIndex(0);
@@ skipping 37 matching lines @@
     ASSERT(pControl != NULL);
     CPDF_FormField* pField = pControl->GetField();
     ASSERT(pField != NULL);
 
     CPDF_Rect rcClient = GetClientRect();
 
     CFX_ByteTextBuf sBody, sLines;
 
     if (IFX_Edit * pEdit = IFX_Edit::NewEdit())
     {
-        pEdit->EnableRefresh(FALSE);
+        pEdit->EnableRefresh(false);
 
         CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
         ASSERT(pDoc != NULL);
         CPDFDoc_Environment* pEnv = pDoc->GetEnv();
 
         CBA_FontMap FontMap(this,pEnv->GetSysHandler());
         FontMap.Initial();
         pEdit->SetFontMap(&FontMap);
 
         pEdit->SetPlateRect(CPDF_Rect(rcClient.left,0.0f,rcClient.right,0.0f));
 
         FX_FLOAT fFontSize = GetFontSize();
 
         if (IsFloatZero(fFontSize))
             pEdit->SetFontSize(12.0f);
         else
             pEdit->SetFontSize(fFontSize);
 
         pEdit->Initialize();
 
         CFX_ByteTextBuf sList;
         FX_FLOAT fy = rcClient.top;
 
         int32_t nTop = pField->GetTopVisibleIndex();
         int32_t nCount = pField->CountOptions();
         int32_t nSelCount = pField->CountSelectedItems();
 
         for (int32_t i=nTop; i<nCount; i++)
         {
-            FX_BOOL bSelected = FALSE;
+            bool bSelected = false;
             for (int32_t j=0; j<nSelCount; j++)
             {
                 if (pField->GetSelectedIndex(j) == i)
                 {
-                    bSelected = TRUE;
+                    bSelected = true;
                     break;
                 }
             }
 
             pEdit->SetText(pField->GetOptionLabel(i).c_str());
 
             CPDF_Rect rcContent = pEdit->GetContentRect();
             FX_FLOAT fItemHeight = rcContent.Height();
 
             if (bSelected)
             {
                 CPDF_Rect rcItem = CPDF_Rect(rcClient.left,fy-fItemHeight,rcClient.right,fy);
-                sList << "q\n" << CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_RGB,0,51.0f/255.0f,113.0f/255.0f),TRUE)
+                sList << "q\n" << CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_RGB,0,51.0f/255.0f,113.0f/255.0f),true)
                     << rcItem.left << " " << rcItem.bottom << " " << rcItem.Width() << " " << rcItem.Height() << " re f\n" << "Q\n";
 
-                sList << "BT\n" << CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_GRAY,1),TRUE) <<
+                sList << "BT\n" << CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_GRAY,1),true) <<
                     CPWL_Utils::GetEditAppStream(pEdit,CPDF_Point(0.0f,fy)) << "ET\n";
             }
             else
             {
                 CPWL_Color crText = GetTextPWLColor();
-                sList << "BT\n" << CPWL_Utils::GetColorAppStream(crText,TRUE) <<
+                sList << "BT\n" << CPWL_Utils::GetColorAppStream(crText,true) <<
                 CPWL_Utils::GetEditAppStream(pEdit,CPDF_Point(0.0f,fy)) << "ET\n";
             }
 
             fy -= fItemHeight;
         }
 
         if (sList.GetSize() > 0)
         {
             sBody << "/Tx BMC\n" << "q\n" << rcClient.left << " " << rcClient.bottom << " "
                     << rcClient.Width() << " " << rcClient.Height() << " re\nW\nn\n";
@@ skipping 12 matching lines @@
 {
     CPDF_FormControl* pControl = GetFormControl();
     ASSERT(pControl != NULL);
     CPDF_FormField* pField = pControl->GetField();
     ASSERT(pField != NULL);
 
     CFX_ByteTextBuf sBody, sLines;
 
     if (IFX_Edit * pEdit = IFX_Edit::NewEdit())
     {
-        pEdit->EnableRefresh(FALSE);
+        pEdit->EnableRefresh(false);
 
         CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
         ASSERT(pDoc != NULL);
         CPDFDoc_Environment* pEnv = pDoc->GetEnv();
 
         CBA_FontMap FontMap(this,pEnv->GetSysHandler());//, ISystemHandle::GetSystemHandler(m_pBaseForm->GetEnv()));
         FontMap.Initial();
         pEdit->SetFontMap(&FontMap);
 
         CPDF_Rect rcClient = GetClientRect();
         pEdit->SetPlateRect(rcClient);
         pEdit->SetAlignmentH(pControl->GetControlAlignment());
 
         FX_DWORD dwFieldFlags = pField->GetFieldFlags();
-        FX_BOOL bMultiLine = (dwFieldFlags >> 12) & 1;
+        bool bMultiLine = (dwFieldFlags >> 12) & 1;
 
         if (bMultiLine)
         {
-            pEdit->SetMultiLine(TRUE);
-            pEdit->SetAutoReturn(TRUE);
+            pEdit->SetMultiLine(true);
+            pEdit->SetAutoReturn(true);
         }
         else
         {
             pEdit->SetAlignmentV(1);
         }
 
         FX_WORD subWord = 0;
         if ((dwFieldFlags >> 13) & 1)
         {
             subWord = '*';
             pEdit->SetPasswordChar(subWord);
         }
 
         int nMaxLen = pField->GetMaxLen();
-        FX_BOOL bCharArray = (dwFieldFlags >> 24) & 1;
+        bool bCharArray = (dwFieldFlags >> 24) & 1;
         FX_FLOAT fFontSize = GetFontSize();
 
         if (nMaxLen > 0)
         {
             if (bCharArray)
             {
                 pEdit->SetCharArray(nMaxLen);
 
                 if (IsFloatZero(fFontSize))
                 {
                     fFontSize = CPWL_Edit::GetCharArrayAutoFontSize(FontMap.GetPDFFont(0),rcClient,nMaxLen);
                 }
             }
             else
             {
                 if (sValue)
                     nMaxLen = wcslen((const wchar_t*)sValue);
                 pEdit->SetLimitChar(nMaxLen);
             }
         }
 
         if (IsFloatZero(fFontSize))
-            pEdit->SetAutoFontSize(TRUE);
+            pEdit->SetAutoFontSize(true);
         else
             pEdit->SetFontSize(fFontSize);
 
         pEdit->Initialize();
 
         if (sValue)
             pEdit->SetText(sValue);
         else
             pEdit->SetText(pField->GetValue().c_str());
 
@@ skipping 14 matching lines @@
             CPWL_Color crText = GetTextPWLColor();
             sBody << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit << "ET\n" << "Q\nEMC\n";
         }
 
         if (bCharArray)
         {
             switch (GetBorderStyle())
             {
             case BBS_SOLID:
                 {
-                    CFX_ByteString sColor = CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE);
+                    CFX_ByteString sColor = CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),false);
                     if (sColor.GetLength() > 0)
                     {
                         sLines << "q\n" << GetBorderWidth() << " w\n"
-                            << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE) << " 2 J 0 j\n";
+                            << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),false) << " 2 J 0 j\n";
 
                         for (int32_t i=1;i<nMaxLen;i++)
                         {
                             sLines << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                 << rcClient.bottom << " m\n"
                                 << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                 << rcClient.top << " l S\n";
                         }
 
                         sLines << "Q\n";
                     }
                 }
                 break;
             case BBS_DASH:
                 {
-                    CFX_ByteString sColor = CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE);
+                    CFX_ByteString sColor = CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),false);
                     if (sColor.GetLength() > 0)
                     {
                         CPWL_Dash dsBorder = CPWL_Dash(3, 3, 0);
 
                         sLines << "q\n" << GetBorderWidth() << " w\n"
-                            << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE)
+                            << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),false)
                             << "[" << dsBorder.nDash << " "
                             << dsBorder.nGap << "] "
                             << dsBorder.nPhase << " d\n";
 
                         for (int32_t i=1;i<nMaxLen;i++)
                         {
                             sLines << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                 << rcClient.bottom << " m\n"
                                 << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                 << rcClient.top << " l S\n";
@@ skipping 226 matching lines @@
 }
 
 void CPDFSDK_Widget::RemoveAppearance(const CFX_ByteString& sAPType)
 {
     if (CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP"))
     {
         pAPDict->RemoveAt(sAPType);
     }
 }
 
-FX_BOOL CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type, PDFSDK_FieldAction& data, CPDFSDK_PageView* pPageView)
+bool CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type, PDFSDK_FieldAction& data, CPDFSDK_PageView* pPageView)
 {
     CPDF_Action action = GetAAction(type);
 
     if (action && action.GetType() != CPDF_Action::Unknown)
     {
         CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
         ASSERT(pDocument != NULL);
 
         CPDFDoc_Environment* pEnv = pDocument->GetEnv();
         ASSERT(pEnv != NULL);
 
         CPDFSDK_ActionHandler* pActionHandler = pEnv->GetActionHander();/*(CPDFSDK_ActionHandler*)pApp->GetActionHandler();*/
         ASSERT(pActionHandler != NULL);
 
         return pActionHandler->DoAction_Field(action, type, pDocument, GetFormField(), data);
     }
 
-    return FALSE;
+    return false;
 }
 
 CPDF_Action CPDFSDK_Widget::GetAAction(CPDF_AAction::AActionType eAAT)
 {
     switch (eAAT)
     {
     case CPDF_AAction::CursorEnter:
     case CPDF_AAction::CursorExit:
     case CPDF_AAction::ButtonDown:
     case CPDF_AAction::ButtonUp:
@@ skipping 36 matching lines @@
 {
     return m_nAppAge;
 }
 
 int32_t CPDFSDK_Widget::GetValueAge() const
 {
     return m_nValueAge;
 }
 
 
-FX_BOOL CPDFSDK_Widget::HitTest(FX_FLOAT pageX, FX_FLOAT pageY)
+bool CPDFSDK_Widget::HitTest(FX_FLOAT pageX, FX_FLOAT pageY)
 {
     CPDF_Annot* pAnnot = GetPDFAnnot();
     CFX_FloatRect annotRect;
     pAnnot->GetRect(annotRect);
     if(annotRect.Contains(pageX, pageY))
     {
-        if (!IsVisible()) return FALSE;
+        if (!IsVisible()) return false;
 
         int nFieldFlags = GetFieldFlags();
         if ((nFieldFlags & FIELDFLAG_READONLY) == FIELDFLAG_READONLY)
-            return FALSE;
+            return false;
 
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
 CPDFSDK_InterForm::CPDFSDK_InterForm(CPDFSDK_Document* pDocument)
     :m_pDocument(pDocument),
     m_pInterForm(NULL),
-    m_bCalculate(TRUE),
-    m_bBusy(FALSE)
+    m_bCalculate(true),
+    m_bBusy(false)
 {
     ASSERT(m_pDocument != NULL);
-    m_pInterForm = new CPDF_InterForm(m_pDocument->GetDocument(), FALSE);
+    m_pInterForm = new CPDF_InterForm(m_pDocument->GetDocument(), false);
     ASSERT(m_pInterForm != NULL);
     m_pInterForm->SetFormNotify(this);
 
     for(int i=0; i<6; i++)
-        m_bNeedHightlight[i] = FALSE;
+        m_bNeedHightlight[i] = false;
     m_iHighlightAlpha = 0;
 }
 
 CPDFSDK_InterForm::~CPDFSDK_InterForm()
 {
     delete m_pInterForm;
     m_pInterForm = nullptr;
     m_Map.clear();
 }
 
-FX_BOOL CPDFSDK_InterForm::HighlightWidgets()
+bool CPDFSDK_InterForm::HighlightWidgets()
 {
-    return FALSE;
+    return false;
 }
 
-CPDFSDK_Widget* CPDFSDK_InterForm::GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const
+CPDFSDK_Widget* CPDFSDK_InterForm::GetSibling(CPDFSDK_Widget* pWidget, bool bNext) const
 {
     nonstd::unique_ptr<CBA_AnnotIterator> pIterator(
         new CBA_AnnotIterator(pWidget->GetPageView(), "Widget", ""));
 
     if (bNext) {
         return (CPDFSDK_Widget*)pIterator->GetNextAnnot(pWidget);
     }
     return (CPDFSDK_Widget*)pIterator->GetPrevAnnot(pWidget);
 }
 
@@ skipping 91 matching lines @@
 void CPDFSDK_InterForm::AddMap(CPDF_FormControl* pControl, CPDFSDK_Widget* pWidget)
 {
     m_Map[pControl] = pWidget;
 }
 
 void CPDFSDK_InterForm::RemoveMap(CPDF_FormControl* pControl)
 {
     m_Map.erase(pControl);
 }
 
-void CPDFSDK_InterForm::EnableCalculate(FX_BOOL bEnabled)
+void CPDFSDK_InterForm::EnableCalculate(bool bEnabled)
 {
     m_bCalculate = bEnabled;
 }
 
-FX_BOOL CPDFSDK_InterForm::IsCalculateEnabled() const
+bool CPDFSDK_InterForm::IsCalculateEnabled() const
 {
     return m_bCalculate;
 }
 
 #ifdef _WIN32
 CPDF_Stream* CPDFSDK_InterForm::LoadImageFromFile(const CFX_WideString& sFile)
 {
     ASSERT(m_pDocument != NULL);
     CPDF_Document* pDocument = m_pDocument->GetDocument();
     ASSERT(pDocument != NULL);
 
     CPDF_Stream* pRetStream = NULL;
 
     if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile.c_str()))
     {
         int nWidth = pBmp->GetWidth();
         int nHeight = pBmp->GetHeight();
 
         CPDF_Image Image(pDocument);
-        Image.SetImage(pBmp, FALSE);
+        Image.SetImage(pBmp, false);
         CPDF_Stream* pImageStream = Image.GetStream();
         if (pImageStream)
         {
             if (pImageStream->GetObjNum() == 0)
                 pDocument->AddIndirectObject(pImageStream);
 
             CPDF_Dictionary* pStreamDict = new CPDF_Dictionary();
             pStreamDict->SetAtName("Subtype", "Form");
             pStreamDict->SetAtName("Name", "IMG");
             CPDF_Array* pMatrix = new CPDF_Array();
@@ skipping 39 matching lines @@
 void CPDFSDK_InterForm::OnCalculate(CPDF_FormField* pFormField)
 {
     ASSERT(m_pDocument != NULL);
     CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();
     ASSERT(pEnv);
     if(!pEnv->IsJSInitiated())
         return;
 
     if (m_bBusy) return;
 
-    m_bBusy = TRUE;
+    m_bBusy = true;
 
     if (IsCalculateEnabled())
     {
         IFXJS_Runtime* pRuntime = m_pDocument->GetJsRuntime();
         ASSERT(pRuntime != NULL);
 
         pRuntime->SetReaderDocument(m_pDocument);
 
         int nSize = m_pInterForm->CountFieldsInCalculationOrder();
         for (int i=0; i<nSize; i++)
@@ skipping 11 matching lines @@
                         if (action)
                         {
                             CFX_WideString csJS = action.GetJavaScript();
                             if (!csJS.IsEmpty())
                             {
                                 IFXJS_Context* pContext = pRuntime->NewContext();
                                 ASSERT(pContext != NULL);
 
                                 CFX_WideString sOldValue = pField->GetValue();
                                 CFX_WideString sValue = sOldValue;
-                                FX_BOOL bRC = TRUE;
+                                bool bRC = true;
                                 pContext->OnField_Calculate(pFormField, pField, sValue, bRC);
 
                                 CFX_WideString sInfo;
-                                FX_BOOL bRet = pContext->RunScript(csJS, sInfo);
+                                bool bRet = pContext->RunScript(csJS, sInfo);
                                 pRuntime->ReleaseContext(pContext);
 
                                 if (bRet)
                                 {
                                     if (bRC)
                                     {
                                         if (sValue.Compare(sOldValue) != 0)
-                                            pField->SetValue(sValue, TRUE);
+                                            pField->SetValue(sValue, true);
                                     }
                                 }
                             }
                         }
                     }
                 }
             }
         }
 
 
     }
 
-    m_bBusy = FALSE;
+    m_bBusy = false;
 }
 
-CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, FX_BOOL& bFormated)
+CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, bool& bFormated)
 {
     ASSERT(m_pDocument != NULL);
     ASSERT(pFormField != NULL);
 
     CFX_WideString sValue = pFormField->GetValue();
     CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();
     ASSERT(pEnv);
     if(!pEnv->IsJSInitiated())
     {
-        bFormated = FALSE;
+        bFormated = false;
         return sValue;
     }
 
     IFXJS_Runtime* pRuntime = m_pDocument->GetJsRuntime();
     ASSERT(pRuntime != NULL);
 
     pRuntime->SetReaderDocument(m_pDocument);
 
     if (pFormField->GetFieldType() == FIELDTYPE_COMBOBOX)
     {
         if (pFormField->CountSelectedItems() > 0)
         {
             int index = pFormField->GetSelectedIndex(0);
             if (index >= 0)
                 sValue = pFormField->GetOptionLabel(index);
         }
     }
 
-    bFormated = FALSE;
+    bFormated = false;
 
     CPDF_AAction aAction = pFormField->GetAdditionalAction();
     if (aAction != NULL && aAction.ActionExist(CPDF_AAction::Format))
     {
         CPDF_Action action = aAction.GetAction(CPDF_AAction::Format);
         if (action)
         {
             CFX_WideString script = action.GetJavaScript();
             if (!script.IsEmpty())
             {
                 CFX_WideString Value = sValue;
 
                 IFXJS_Context* pContext = pRuntime->NewContext();
                 ASSERT(pContext != NULL);
 
-                pContext->OnField_Format(pFormField, Value, TRUE);
+                pContext->OnField_Format(pFormField, Value, true);
 
                 CFX_WideString sInfo;
-                FX_BOOL bRet = pContext->RunScript(script, sInfo);
+                bool bRet = pContext->RunScript(script, sInfo);
                 pRuntime->ReleaseContext(pContext);
 
                 if (bRet)
                 {
                     sValue = Value;
-                    bFormated = TRUE;
+                    bFormated = true;
                 }
             }
         }
     }
 
     return sValue;
 }
 
-void CPDFSDK_InterForm::ResetFieldAppearance(CPDF_FormField* pFormField, const FX_WCHAR* sValue, FX_BOOL bValueChanged)
+void CPDFSDK_InterForm::ResetFieldAppearance(CPDF_FormField* pFormField, const FX_WCHAR* sValue, bool bValueChanged)
 {
     ASSERT(pFormField != NULL);
 
     for (int i=0,sz=pFormField->CountControls(); i<sz; i++)
     {
         CPDF_FormControl* pFormCtrl = pFormField->GetControl(i);
         ASSERT(pFormCtrl != NULL);
 
         ASSERT(m_pInterForm != NULL);
         if(CPDFSDK_Widget* pWidget = GetWidget(pFormCtrl))
             pWidget->ResetAppearance(sValue, bValueChanged);
     }
 }
 
 void CPDFSDK_InterForm::UpdateField(CPDF_FormField* pFormField)
 {
     ASSERT(pFormField != NULL);
 
     for (int i=0,sz=pFormField->CountControls(); i<sz; i++)
     {
         CPDF_FormControl* pFormCtrl = pFormField->GetControl(i);
         ASSERT(pFormCtrl != NULL);
 
         if(CPDFSDK_Widget* pWidget = GetWidget(pFormCtrl))
         {
             CPDFDoc_Environment * pEnv = m_pDocument->GetEnv();
             CFFL_IFormFiller* pIFormFiller = pEnv->GetIFormFiller();
 
             CPDF_Page * pPage = pWidget->GetPDFPage();
-            CPDFSDK_PageView * pPageView = m_pDocument->GetPageView(pPage,FALSE);
+            CPDFSDK_PageView * pPageView = m_pDocument->GetPageView(pPage,false);
 
             FX_RECT rcBBox = pIFormFiller->GetViewBBox(pPageView, pWidget);
 
             pEnv->FFI_Invalidate(pPage,rcBBox.left, rcBBox.top, rcBBox.right, rcBBox.bottom);
         }
     }
 }
 
-void CPDFSDK_InterForm::OnKeyStrokeCommit(CPDF_FormField* pFormField, CFX_WideString& csValue, FX_BOOL& bRC)
+void CPDFSDK_InterForm::OnKeyStrokeCommit(CPDF_FormField* pFormField, CFX_WideString& csValue, bool& bRC)
 {
     ASSERT(pFormField != NULL);
 
     CPDF_AAction aAction = pFormField->GetAdditionalAction();
     if (aAction != NULL && aAction.ActionExist(CPDF_AAction::KeyStroke))
     {
         CPDF_Action action = aAction.GetAction(CPDF_AAction::KeyStroke);
         if (action)
         {
             ASSERT(m_pDocument != NULL);
             CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();
             ASSERT(pEnv != NULL);
 
             CPDFSDK_ActionHandler* pActionHandler = pEnv->GetActionHander();
             ASSERT(pActionHandler != NULL);
 
             PDFSDK_FieldAction fa;
             fa.bModifier = pEnv->FFI_IsCTRLKeyDown(0);
             fa.bShift = pEnv->FFI_IsSHIFTKeyDown(0);
             fa.sValue = csValue;
 
             pActionHandler->DoAction_FieldJavaScript(action, CPDF_AAction::KeyStroke,
                 m_pDocument, pFormField, fa);
             bRC = fa.bRC;
         }
     }
 }
 
-void CPDFSDK_InterForm::OnValidate(CPDF_FormField* pFormField, CFX_WideString& csValue, FX_BOOL& bRC)
+void CPDFSDK_InterForm::OnValidate(CPDF_FormField* pFormField, CFX_WideString& csValue, bool& bRC)
 {
     ASSERT(pFormField != NULL);
 
     CPDF_AAction aAction = pFormField->GetAdditionalAction();
     if (aAction != NULL && aAction.ActionExist(CPDF_AAction::Validate))
     {
         CPDF_Action action = aAction.GetAction(CPDF_AAction::Validate);
         if (action)
         {
             ASSERT(m_pDocument != NULL);
@@ skipping 10 matching lines @@
 
             pActionHandler->DoAction_FieldJavaScript(action, CPDF_AAction::Validate, m_pDocument, pFormField, fa);
             bRC = fa.bRC;
 
         }
     }
 }
 
 /* ----------------------------- action ----------------------------- */
 
-FX_BOOL CPDFSDK_InterForm::DoAction_Hide(const CPDF_Action& action)
+bool CPDFSDK_InterForm::DoAction_Hide(const CPDF_Action& action)
 {
     ASSERT(action);
 
     CPDF_ActionFields af = action.GetWidgets();
     CFX_PtrArray fieldObjects;
     af.GetAllFields(fieldObjects);
     CFX_PtrArray widgetArray;
     CFX_PtrArray fields;
     GetFieldFromObjects(fieldObjects, fields);
 
-    FX_BOOL bHide = action.GetHideStatus();
+    bool bHide = action.GetHideStatus();
 
-    FX_BOOL bChanged = FALSE;
+    bool bChanged = false;
 
     for (int i=0, sz=fields.GetSize(); i<sz; i++)
     {
         CPDF_FormField* pField = (CPDF_FormField*)fields[i];
         ASSERT(pField != NULL);
 
 
         for (int j=0,jsz=pField->CountControls(); j<jsz; j++)
         {
             CPDF_FormControl* pControl = pField->GetControl(j);
@@ skipping 14 matching lines @@
                     nFlags &= (~ANNOTFLAG_HIDDEN);
                     nFlags &= (~ANNOTFLAG_NOVIEW);
                 }
                 pWidget->SetFlags(nFlags);
 
                 CPDFSDK_PageView* pPageView = pWidget->GetPageView();
                 ASSERT(pPageView != NULL);
 
                 pPageView->UpdateView(pWidget);
 
-                bChanged = TRUE;
+                bChanged = true;
             }
         }
     }
 
     return bChanged;
 }
 
-FX_BOOL CPDFSDK_InterForm::DoAction_SubmitForm(const CPDF_Action& action)
+bool CPDFSDK_InterForm::DoAction_SubmitForm(const CPDF_Action& action)
 {
     ASSERT(m_pInterForm != NULL);
     CFX_WideString sDestination = action.GetFilePath();
     if (sDestination.IsEmpty())
-        return FALSE;
+        return false;
 
     CPDF_Dictionary* pActionDict = action.GetDict();
     if (pActionDict->KeyExist("Fields"))
     {
         CPDF_ActionFields af = action.GetWidgets();
         FX_DWORD dwFlags = action.GetFlags();
         CFX_PtrArray fieldObjects;
         af.GetAllFields(fieldObjects);
 
         CFX_PtrArray fields;
         GetFieldFromObjects(fieldObjects, fields);
         if (fields.GetSize() != 0)
         {
-            FX_BOOL bIncludeOrExclude = !(dwFlags & 0x01);
+            bool bIncludeOrExclude = !(dwFlags & 0x01);
             if (m_pInterForm->CheckRequiredFields(&fields, bIncludeOrExclude))
-                return FALSE;
+                return false;
 
-            return SubmitFields(sDestination, fields, bIncludeOrExclude, FALSE);
+            return SubmitFields(sDestination, fields, bIncludeOrExclude, false);
         }
     }
     if (m_pInterForm->CheckRequiredFields())
-        return FALSE;
+        return false;
 
-    return SubmitForm(sDestination, FALSE);
+    return SubmitForm(sDestination, false);
 }
 
-FX_BOOL CPDFSDK_InterForm::SubmitFields(const CFX_WideString& csDestination, const CFX_PtrArray& fields,
-                                    FX_BOOL bIncludeOrExclude, FX_BOOL bUrlEncoded)
+bool CPDFSDK_InterForm::SubmitFields(const CFX_WideString& csDestination, const CFX_PtrArray& fields,
+                                    bool bIncludeOrExclude, bool bUrlEncoded)
 {
     CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();
     ASSERT(pEnv != NULL);
 
     CFX_ByteTextBuf textBuf;
     ExportFieldsToFDFTextBuf(fields, bIncludeOrExclude, textBuf);
 
     uint8_t* pBuffer = textBuf.GetBuffer();
     FX_STRSIZE nBufSize = textBuf.GetLength();
 
     if (bUrlEncoded)
     {
         if(!FDFToURLEncodedData(pBuffer, nBufSize))
-            return FALSE;
+            return false;
     }
 
     pEnv->JS_docSubmitForm(pBuffer, nBufSize, csDestination.c_str());
 
-    return TRUE;
+    return true;
 }
 
 void CPDFSDK_InterForm::DoFDFBuffer(CFX_ByteString sBuffer)
 {
     ASSERT(m_pDocument != NULL);
 
     if (CFDF_Document *pFDFDocument = CFDF_Document::ParseMemory((const unsigned char *)sBuffer.GetBuffer(sBuffer.GetLength()), sBuffer.GetLength()))
     {
         CPDF_Dictionary* pRootDic = pFDFDocument->GetRoot();
         if(pRootDic)
@@ skipping 18 matching lines @@
 
                 }
             }
         }
         delete pFDFDocument;
     }
 
     sBuffer.ReleaseBuffer();
 }
 
-FX_BOOL CPDFSDK_InterForm::FDFToURLEncodedData(CFX_WideString csFDFFile, CFX_WideString csTxtFile)
+bool CPDFSDK_InterForm::FDFToURLEncodedData(CFX_WideString csFDFFile, CFX_WideString csTxtFile)
 {
-    return TRUE;
+    return true;
 }
 
-FX_BOOL CPDFSDK_InterForm::FDFToURLEncodedData(uint8_t*& pBuf, FX_STRSIZE& nBufSize)
+bool CPDFSDK_InterForm::FDFToURLEncodedData(uint8_t*& pBuf, FX_STRSIZE& nBufSize)
 {
     CFDF_Document* pFDF = CFDF_Document::ParseMemory(pBuf, nBufSize);
     if (pFDF)
     {
         CPDF_Dictionary* pMainDict = pFDF->GetRoot()->GetDict("FDF");
-        if (pMainDict == NULL) return FALSE;
+        if (pMainDict == NULL) return false;
 
         // Get fields
         CPDF_Array* pFields = pMainDict->GetArray("Fields");
-        if (pFields == NULL) return FALSE;
+        if (pFields == NULL) return false;
 
         CFX_ByteTextBuf fdfEncodedData;
 
         for (FX_DWORD i = 0; i < pFields->GetCount(); i ++)
         {
             CPDF_Dictionary* pField = pFields->GetDict(i);
             if (pField == NULL) continue;
             CFX_WideString name;
             name = pField->GetUnicodeText("T");
             CFX_ByteString name_b = CFX_ByteString::FromUnicode(name);
             CFX_ByteString csBValue = pField->GetString("V");
             CFX_WideString csWValue = PDF_DecodeText(csBValue);
             CFX_ByteString csValue_b = CFX_ByteString::FromUnicode(csWValue);
 
             fdfEncodedData = fdfEncodedData<<name_b.GetBuffer(name_b.GetLength());
             name_b.ReleaseBuffer();
             fdfEncodedData = fdfEncodedData<<"=";
             fdfEncodedData = fdfEncodedData<<csValue_b.GetBuffer(csValue_b.GetLength());
             csValue_b.ReleaseBuffer();
             if(i != pFields->GetCount()-1)
                 fdfEncodedData = fdfEncodedData<<"&";
         }
 
         nBufSize = fdfEncodedData.GetLength();
         pBuf = FX_Alloc(uint8_t, nBufSize);
         FXSYS_memcpy(pBuf, fdfEncodedData.GetBuffer(), nBufSize);
     }
-    return TRUE;
+    return true;
 }
 
-FX_BOOL CPDFSDK_InterForm::ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields,FX_BOOL bIncludeOrExclude, CFX_ByteTextBuf& textBuf)
+bool CPDFSDK_InterForm::ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields,bool bIncludeOrExclude, CFX_ByteTextBuf& textBuf)
 {
     ASSERT(m_pDocument != NULL);
     ASSERT(m_pInterForm != NULL);
 
     CFDF_Document* pFDF = m_pInterForm->ExportToFDF(m_pDocument->GetPath(),(CFX_PtrArray&)fields, bIncludeOrExclude);
-    if (!pFDF) return FALSE;
-    FX_BOOL bRet = pFDF->WriteBuf(textBuf); // = FALSE;//
+    if (!pFDF) return false;
+    bool bRet = pFDF->WriteBuf(textBuf); // = false;//
     delete pFDF;
 
     return bRet;
 }
 
 CFX_WideString CPDFSDK_InterForm::GetTemporaryFileName(const CFX_WideString& sFileExt)
 {
     CFX_WideString sFileName;
     return L"";
 }
 
-FX_BOOL CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination, FX_BOOL bUrlEncoded)
+bool CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination, bool bUrlEncoded)
 {
-    if (sDestination.IsEmpty()) return FALSE;
+    if (sDestination.IsEmpty()) return false;
 
     CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();
     ASSERT(pEnv != NULL);
 
-    if(NULL == m_pDocument) return FALSE;
+    if(NULL == m_pDocument) return false;
     CFX_WideString wsPDFFilePath = m_pDocument->GetPath();
 
-    if(NULL == m_pInterForm) return FALSE;
+    if(NULL == m_pInterForm) return false;
     CFDF_Document* pFDFDoc = m_pInterForm->ExportToFDF(wsPDFFilePath);
-    if (NULL == pFDFDoc) return FALSE;
+    if (NULL == pFDFDoc) return false;
 
     CFX_ByteTextBuf FdfBuffer;
-    FX_BOOL bRet = pFDFDoc->WriteBuf(FdfBuffer);
+    bool bRet = pFDFDoc->WriteBuf(FdfBuffer);
     delete pFDFDoc;
-    if (!bRet) return FALSE;
+    if (!bRet) return false;
 
     uint8_t* pBuffer = FdfBuffer.GetBuffer();
     FX_STRSIZE nBufSize = FdfBuffer.GetLength();
 
     if (bUrlEncoded)
     {
         if(!FDFToURLEncodedData(pBuffer, nBufSize))
-            return FALSE;
+            return false;
     }
 
     pEnv->JS_docSubmitForm(pBuffer, nBufSize, sDestination.c_str());
 
     if (bUrlEncoded && pBuffer)
     {
         FX_Free(pBuffer);
         pBuffer = NULL;
     }
 
-    return TRUE;
+    return true;
 }
 
-FX_BOOL CPDFSDK_InterForm::ExportFormToFDFTextBuf(CFX_ByteTextBuf& textBuf)
+bool CPDFSDK_InterForm::ExportFormToFDFTextBuf(CFX_ByteTextBuf& textBuf)
 {
 
     ASSERT(m_pInterForm != NULL);
     ASSERT(m_pDocument != NULL);
 
     CFDF_Document* pFDF = m_pInterForm->ExportToFDF(m_pDocument->GetPath());
-    if (!pFDF) return FALSE;
+    if (!pFDF) return false;
 
-    FX_BOOL bRet = pFDF->WriteBuf(textBuf);
+    bool bRet = pFDF->WriteBuf(textBuf);
     delete pFDF;
 
     return bRet;
 }
 
 
-FX_BOOL CPDFSDK_InterForm::DoAction_ResetForm(const CPDF_Action& action)
+bool CPDFSDK_InterForm::DoAction_ResetForm(const CPDF_Action& action)
 {
     ASSERT(action);
 
     CPDF_Dictionary* pActionDict = action.GetDict();
     if (pActionDict->KeyExist("Fields"))
     {
         CPDF_ActionFields af = action.GetWidgets();
         FX_DWORD dwFlags = action.GetFlags();
 
         CFX_PtrArray fieldObjects;
         af.GetAllFields(fieldObjects);
         CFX_PtrArray fields;
         GetFieldFromObjects(fieldObjects, fields);
-        return m_pInterForm->ResetForm(fields, !(dwFlags & 0x01), TRUE);
+        return m_pInterForm->ResetForm(fields, !(dwFlags & 0x01), true);
     }
 
-    return m_pInterForm->ResetForm(TRUE);
+    return m_pInterForm->ResetForm(true);
 }
 
-FX_BOOL CPDFSDK_InterForm::DoAction_ImportData(const CPDF_Action& action)
+bool CPDFSDK_InterForm::DoAction_ImportData(const CPDF_Action& action)
 {
-    return FALSE;
+    return false;
 }
 
 void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects, CFX_PtrArray& fields)
 {
     ASSERT(m_pInterForm != NULL);
 
     int iCount = objects.GetSize();
     for (int i = 0; i < iCount; i ++)
     {
         CPDF_Object* pObject = (CPDF_Object*)objects[i];
@@ skipping 16 matching lines @@
 }
 
 /* ----------------------------- CPDF_FormNotify ----------------------------- */
 
 int CPDFSDK_InterForm::BeforeValueChange(const CPDF_FormField* pField, CFX_WideString& csValue)
 {
     CPDF_FormField* pFormField = (CPDF_FormField*)pField;
     int nType = pFormField->GetFieldType();
     if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD)
     {
-        FX_BOOL bRC = TRUE;
+        bool bRC = true;
         OnKeyStrokeCommit(pFormField, csValue, bRC);
         if (bRC)
         {
             OnValidate(pFormField, csValue, bRC);
             return bRC ? 1 : -1;
         }
         return -1;
     }
     return 0;
 }
 
 int CPDFSDK_InterForm::AfterValueChange(const CPDF_FormField* pField)
 {
     CPDF_FormField* pFormField = (CPDF_FormField*)pField;
     int nType = pFormField->GetFieldType();
     if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD)
     {
         OnCalculate(pFormField);
-        FX_BOOL bFormated = FALSE;
+        bool bFormated = false;
         CFX_WideString sValue = OnFormat(pFormField, bFormated);
         if (bFormated)
-            ResetFieldAppearance(pFormField, sValue.c_str(), TRUE);
+            ResetFieldAppearance(pFormField, sValue.c_str(), true);
         else
-            ResetFieldAppearance(pFormField, NULL, TRUE);
+            ResetFieldAppearance(pFormField, NULL, true);
         UpdateField(pFormField);
     }
     return 0;
 }
 
 int CPDFSDK_InterForm::BeforeSelectionChange(const CPDF_FormField* pField, CFX_WideString& csValue)
 {
     CPDF_FormField* pFormField = (CPDF_FormField*)pField;
     if (pFormField->GetFieldType() != FIELDTYPE_LISTBOX)
         return 0;
 
-    FX_BOOL bRC = TRUE;
+    bool bRC = true;
     OnKeyStrokeCommit(pFormField, csValue, bRC);
     if (!bRC)
         return -1;
 
     OnValidate(pFormField, csValue, bRC);
     if (!bRC)
         return -1;
 
     return 1;
 }
 
 int CPDFSDK_InterForm::AfterSelectionChange(const CPDF_FormField* pField)
 {
     CPDF_FormField* pFormField = (CPDF_FormField*)pField;
     if (pFormField->GetFieldType() == FIELDTYPE_LISTBOX)
     {
         OnCalculate(pFormField);
-        ResetFieldAppearance(pFormField, NULL, TRUE);
+        ResetFieldAppearance(pFormField, NULL, true);
         UpdateField(pFormField);
     }
     return 0;
 }
 
 int CPDFSDK_InterForm::AfterCheckedStatusChange(const CPDF_FormField* pField, const CFX_ByteArray& statusArray)
 {
     CPDF_FormField* pFormField = (CPDF_FormField*)pField;
     int nType = pFormField->GetFieldType();
     if (nType == FIELDTYPE_CHECKBOX || nType == FIELDTYPE_RADIOBUTTON)
@@ skipping 19 matching lines @@
 {
     return 0;
 }
 
 int CPDFSDK_InterForm::AfterFormImportData(const CPDF_InterForm* pForm)
 {
     OnCalculate(nullptr);
     return 0;
 }
 
-FX_BOOL CPDFSDK_InterForm::IsNeedHighLight(int nFieldType)
+bool CPDFSDK_InterForm::IsNeedHighLight(int nFieldType)
 {
     if(nFieldType <1 || nFieldType > 6)
-        return FALSE;
+        return false;
     return m_bNeedHightlight[nFieldType-1];
 }
 
 void CPDFSDK_InterForm::RemoveAllHighLight()
 {
-    memset((void*)m_bNeedHightlight, 0, 6*sizeof(FX_BOOL));
+    memset((void*)m_bNeedHightlight, 0, 6*sizeof(bool));
 }
 void   CPDFSDK_InterForm::SetHighlightColor(FX_COLORREF clr, int nFieldType)
 {
     if(nFieldType <0 || nFieldType > 6) return;
     switch(nFieldType)
     {
     case 0:
         {
             for(int i=0; i<6; i++)
             {
                 m_aHighlightColor[i] = clr;
-                m_bNeedHightlight[i] = TRUE;
+                m_bNeedHightlight[i] = true;
             }
             break;
         }
     default:
         {
             m_aHighlightColor[nFieldType-1] = clr;
-            m_bNeedHightlight[nFieldType-1] = TRUE;
+            m_bNeedHightlight[nFieldType-1] = true;
             break;
         }
     }
 
 }
 
 FX_COLORREF CPDFSDK_InterForm::GetHighlightColor(int nFieldType)
 {
     if (nFieldType < 0 || nFieldType > 6)
         return FXSYS_RGB(255,255,255);
@@ skipping 225 matching lines @@
                     ASSERT(pAnnot != NULL);
 
                     if (pAnnot->GetType() == m_sType
                         && pAnnot->GetSubType() == m_sSubType)
                         sa.Add(pAnnot);
                 }
             }
 
             if (sa.GetSize() > 0)
             {
-                sa.Sort(CBA_AnnotIterator::CompareByTop, FALSE);
+                sa.Sort(CBA_AnnotIterator::CompareByTop, false);
             }
 
             while (sa.GetSize() > 0)
             {
                 int nLeftTopIndex = -1;
 
                 {
                     FX_FLOAT fLeft = -1.0f;
 
                     for (int i=sa.GetSize()-1; i>=0; i--)
@@ skipping 72 matching lines @@
 
     CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
     ASSERT(pPDFAnnot != NULL);
 
     CPDF_Rect rcAnnot;
     pPDFAnnot->GetRect(rcAnnot);
 
     return rcAnnot;
 }