Revert "FX Bool considered harmful, part 3"

fpdfsdk/src/formfiller/FFL_ListBox.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/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_ListBox.h"
 //#include "../../include/formfiller/FFL_Module.h"
@@ skipping 55 matching lines @@
         CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller();
         pWnd->SetFillerNotify(pIFormFiller);
 
         for (int32_t i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
                 pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str());
 
         if (pWnd->HasFlag(PLBS_MULTIPLESEL))
         {
                 m_OriginSelections.clear();
 
-                bool bSetCaret = false;
+                FX_BOOL bSetCaret = FALSE;
                 for (int32_t i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
                 {
                         if (m_pWidget->IsOptionSelected(i))
                         {
                                 if (!bSetCaret)
                                 {
                                         pWnd->SetCaret(i);
-                                        bSetCaret = true;
+                                        bSetCaret = TRUE;
                                 }
                                 pWnd->Select(i);
                                 m_OriginSelections.insert(i);
                         }
                 }
         }
         else
         {
                 for (int i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
                 {
                         if (m_pWidget->IsOptionSelected(i))
                         {
                                 pWnd->Select(i);
                                 break;
                         }
                 }
         }
 
         pWnd->SetTopVisibleIndex(m_pWidget->GetTopVisibleIndex());
 
         return pWnd;
 }
 
 
-bool    CFFL_ListBox::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags)
+FX_BOOL CFFL_ListBox::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags)
 {
         return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
 }
 
-bool CFFL_ListBox::IsDataChanged(CPDFSDK_PageView* pPageView)
+FX_BOOL CFFL_ListBox::IsDataChanged(CPDFSDK_PageView* pPageView)
 {
-    CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, false);
+    CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE);
     if (!pListBox)
-        return false;
+        return FALSE;
 
     if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) {
         int nSelCount = 0;
         for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; ++i) {
             if (pListBox->IsItemSelected(i)) {
                 if (m_OriginSelections.count(i) == 0)
-                    return true;
+                    return TRUE;
 
                 nSelCount++;
             }
         }
 
         return nSelCount != m_OriginSelections.size();
     }
     return pListBox->GetCurSel() != m_pWidget->GetSelectedIndex(0);
 }
 
 void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView)
 {
         ASSERT(m_pWidget != NULL);
 
-        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, false))
+        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE))
         {
                 CFX_IntArray aOldSelect, aNewSelect;
 
                 {
                         for (int i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
                         {
                                 if (m_pWidget->IsOptionSelected(i))
                                 {
                                         aOldSelect.Add(i);
                                 }
                         }
                 }
 
 
                 int32_t nNewTopIndex = pListBox->GetTopVisibleIndex();
 
-                m_pWidget->ClearSelection(false);
+                m_pWidget->ClearSelection(FALSE);
 
                 if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT)
                 {
                         for (int32_t i=0,sz=pListBox->GetCount(); i<sz; i++)
                         {
                                 if (pListBox->IsItemSelected(i))
                                 {
-                                        m_pWidget->SetOptionSelection(i, true, false);
+                                        m_pWidget->SetOptionSelection(i, TRUE, FALSE);
                                         aNewSelect.Add(i);
                                 }
                         }
                 }
                 else
                 {
-                        m_pWidget->SetOptionSelection(pListBox->GetCurSel(), true, false);
+                        m_pWidget->SetOptionSelection(pListBox->GetCurSel(), TRUE, FALSE);
                         aNewSelect.Add(pListBox->GetCurSel());
                 }
 
                 m_pWidget->SetTopVisibleIndex(nNewTopIndex);
-                m_pWidget->ResetFieldAppearance(true);
+                m_pWidget->ResetFieldAppearance(TRUE);
                 m_pWidget->UpdateField();
                 SetChangeMark();
         }
 }
 
 void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
                                                 PDFSDK_FieldAction& fa)
 {
         switch (type)
         {
         case CPDF_AAction::Validate:
                 if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT)
                 {
                         fa.sValue = L"";
                 }
                 else
                 {
-                        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, false))
+                        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE))
                         {
                                 ASSERT(m_pWidget != NULL);
                                 int32_t nCurSel = pListBox->GetCurSel();
                                 if (nCurSel >= 0)
                                         fa.sValue = m_pWidget->GetOptionLabel(nCurSel);
                         }
                 }
                 break;
         case CPDF_AAction::LoseFocus:
         case CPDF_AAction::GetFocus:
@@ skipping 17 matching lines @@
 
 void CFFL_ListBox::SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
                                                                 const PDFSDK_FieldAction& fa)
 {
 }
 
 void CFFL_ListBox::SaveState(CPDFSDK_PageView* pPageView)
 {
         ASSERT(pPageView != NULL);
 
-        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, false))
+        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE))
         {
                 for (int32_t i=0,sz=pListBox->GetCount(); i<sz; i++)
                 {
                         if (pListBox->IsItemSelected(i))
                         {
                                 m_State.Add(i);
                         }
                 }
         }
 }
 
 void CFFL_ListBox::RestoreState(CPDFSDK_PageView* pPageView)
 {
-        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, false))
+        if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE))
         {
                 for (int i=0,sz=m_State.GetSize(); i<sz; i++)
                         pListBox->Select(m_State[i]);
         }
 }
 
-CPWL_Wnd* CFFL_ListBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, bool bRestoreValue)
+CPWL_Wnd* CFFL_ListBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue)
 {
         if (bRestoreValue)
                 SaveState(pPageView);
 
         DestroyPDFWindow(pPageView);
 
         CPWL_Wnd* pRet = NULL;
 
         if (bRestoreValue)
         {
                 RestoreState(pPageView);
-                pRet = GetPDFWindow(pPageView, false);
+                pRet = GetPDFWindow(pPageView, FALSE);
         }
         else
-                pRet = GetPDFWindow(pPageView, true);
+                pRet = GetPDFWindow(pPageView, TRUE);
 
         m_pWidget->UpdateField();
 
         return pRet;
 }
 
-void CFFL_ListBox::OnKeyStroke(bool bKeyDown, FX_DWORD nFlag)
+void CFFL_ListBox::OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag)
 {
         ASSERT(m_pWidget != NULL);
 
         int nFlags = m_pWidget->GetFieldFlags();
 
         if (nFlags & FIELDFLAG_COMMITONSELCHANGE)
         {
                 if (m_bValid)
                 {
                         CPDFSDK_PageView* pPageView = GetCurPageView();
                         ASSERT(pPageView != NULL);
 
                         if (CommitData(pPageView, nFlag))
                         {
                                 DestroyPDFWindow(pPageView);
-                                m_bValid = false;
+                                m_bValid = FALSE;
                         }
                 }
         }
 }