Revert "FX_BOOL considered harmful, part 2."

fpdfsdk/src/pdfwindow/PWL_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/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
 #include "../../include/pdfwindow/PWL_ListBox.h"
 #include "../../include/pdfwindow/PWL_Utils.h"
@@ skipping 31 matching lines @@
 
         m_pList->OnNotify(m_pList,PNM_SETSCROLLINFO,SBT_VSCROLL,(intptr_t)&Info);
 
         if (CPWL_ScrollBar * pScroll = m_pList->GetVScrollBar())
         {
                 if (IsFloatBigger(Info.fPlateWidth,Info.fContentMax-Info.fContentMin)
                         || IsFloatEqual(Info.fPlateWidth,Info.fContentMax-Info.fContentMin))
                 {
                         if (pScroll->IsVisible())
                         {
-                                pScroll->SetVisible(false);
+                                pScroll->SetVisible(FALSE);
                                 m_pList->RePosChildWnd();
                         }
                 }
                 else
                 {
                         if (!pScroll->IsVisible())
                         {
-                                pScroll->SetVisible(true);
+                                pScroll->SetVisible(TRUE);
                                 m_pList->RePosChildWnd();
                         }
                 }
         }
 }
 
 void CPWL_List_Notify::IOnSetScrollPosY(FX_FLOAT fy)
 {
         m_pList->OnNotify(m_pList,PNM_SETSCROLLPOS,SBT_VSCROLL,(intptr_t)&fy);
 }
 
 void CPWL_List_Notify::IOnInvalidateRect(CPDF_Rect * pRect)
 {
         m_pList->InvalidateRect(pRect);
 }
 
 /* --------------------------- CPWL_ListBox ---------------------------- */
 
 CPWL_ListBox::CPWL_ListBox() :
         m_pList(NULL),
         m_pListNotify(NULL),
-        m_bMouseDown(false),
-        m_bHoverSel(false),
+        m_bMouseDown(FALSE),
+        m_bHoverSel(FALSE),
         m_pFillerNotify(NULL)
 {
         m_pList = IFX_List::NewList();
 
         ASSERT(m_pList != NULL);
 }
 
 CPWL_ListBox::~CPWL_ListBox()
 {
     IFX_List::DelList(m_pList);
@@ skipping 128 matching lines @@
                                 IFX_Edit::DrawEdit(pDevice, pUser2Device, m_pList->GetItemEdit(i),
                                                 CPWL_Utils::PWLColorToFXColor(GetTextColor()),
                                                 CPWL_Utils::PWLColorToFXColor(GetTextStrokeColor()),
                                                 rcList, ptOffset, NULL,pSysHandler, NULL);
 
                         }
                 }
         }
 }
 
-bool CPWL_ListBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
+FX_BOOL CPWL_ListBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
 {
         CPWL_Wnd::OnKeyDown(nChar, nFlag);
 
-        if (!m_pList) return false;
+        if (!m_pList) return FALSE;
 
         switch (nChar)
         {
         default:
-                return false;
+                return FALSE;
         case FWL_VKEY_Up:
         case FWL_VKEY_Down:
         case FWL_VKEY_Home:
         case FWL_VKEY_Left:
         case FWL_VKEY_End:
         case FWL_VKEY_Right:
                 break;
         }
 
         switch (nChar)
@@ skipping 13 matching lines @@
         case FWL_VKEY_End:
                 m_pList->OnVK_END(IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag));
                 break;
         case FWL_VKEY_Right:
                 m_pList->OnVK_RIGHT(IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag));
                 break;
         case FWL_VKEY_Delete:
                 break;
         }
 
-        bool bExit = false;
-        OnNotifySelChanged(true,bExit,nFlag);
+        FX_BOOL bExit = FALSE;
+        OnNotifySelChanged(TRUE,bExit,nFlag);
 
-        return true;
+        return TRUE;
 }
 
-bool CPWL_ListBox::OnChar(FX_WORD nChar, FX_DWORD nFlag)
+FX_BOOL CPWL_ListBox::OnChar(FX_WORD nChar, FX_DWORD nFlag)
 {
         CPWL_Wnd::OnChar(nChar,nFlag);
 
-        if (!m_pList) return false;
+        if (!m_pList) return FALSE;
 
-        if (!m_pList->OnChar(nChar,IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag))) return false;
+        if (!m_pList->OnChar(nChar,IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag))) return FALSE;
 
-        bool bExit = false;
-        OnNotifySelChanged(true,bExit, nFlag);
+        FX_BOOL bExit = FALSE;
+        OnNotifySelChanged(TRUE,bExit, nFlag);
 
-        return true;
+        return TRUE;
 }
 
-bool CPWL_ListBox::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_ListBox::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
 {
         CPWL_Wnd::OnLButtonDown(point,nFlag);
 
         if (ClientHitTest(point))
         {
-                m_bMouseDown = true;
+                m_bMouseDown = TRUE;
                 SetFocus();
                 SetCapture();
 
                 if (m_pList)
                         m_pList->OnMouseDown(point,IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag));
         }
 
-        return true;
+        return TRUE;
 }
 
-bool CPWL_ListBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_ListBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
         CPWL_Wnd::OnLButtonUp(point,nFlag);
 
         if (m_bMouseDown)
         {
                 ReleaseCapture();
-                m_bMouseDown = false;
+                m_bMouseDown = FALSE;
         }
 
-        bool bExit = false;
-        OnNotifySelChanged(false,bExit,nFlag);
+        FX_BOOL bExit = FALSE;
+        OnNotifySelChanged(FALSE,bExit,nFlag);
 
-        return true;
+        return TRUE;
 }
 
-void CPWL_ListBox::SetHoverSel(bool bHoverSel)
+void CPWL_ListBox::SetHoverSel(FX_BOOL bHoverSel)
 {
         m_bHoverSel = bHoverSel;
 }
 
-bool CPWL_ListBox::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_ListBox::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag)
 {
         CPWL_Wnd::OnMouseMove(point, nFlag);
 
         if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point))
         {
                 if (m_pList)
                         m_pList->Select(m_pList->GetItemIndex(point));
         }
 
         if (m_bMouseDown)
         {
                 if (m_pList)
                         m_pList->OnMouseMove(point,IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag));
         }
 
-        return true;
+        return TRUE;
 }
 
 void CPWL_ListBox::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
         CPWL_Wnd::OnNotify(pWnd,msg,wParam,lParam);
 
         FX_FLOAT fPos;
 
         switch (msg)
         {
@@ skipping 38 matching lines @@
 }
 
 void CPWL_ListBox::RePosChildWnd()
 {
         CPWL_Wnd::RePosChildWnd();
 
         if (m_pList)
                 m_pList->SetPlateRect(GetListRect());
 }
 
-void CPWL_ListBox::OnNotifySelChanged(bool bKeyDown, bool & bExit,  FX_DWORD nFlag)
+void CPWL_ListBox::OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL & bExit,  FX_DWORD nFlag)
 {
         if (m_pFillerNotify)
         {
-                bool bRC = true;
+                FX_BOOL bRC = TRUE;
                 CFX_WideString swChange = GetText();
                 CFX_WideString strChangeEx;
                 int nSelStart = 0;
                 int nSelEnd = swChange.GetLength();
-                m_pFillerNotify->OnBeforeKeyStroke(false, GetAttachedData(), 0, swChange, strChangeEx, nSelStart, nSelEnd, bKeyDown, bRC, bExit, nFlag);
+                m_pFillerNotify->OnBeforeKeyStroke(FALSE, GetAttachedData(), 0, swChange, strChangeEx, nSelStart, nSelEnd, bKeyDown, bRC, bExit, nFlag);
                 if (bExit) return;
 
-                m_pFillerNotify->OnAfterKeyStroke(false, GetAttachedData(), bExit,nFlag);
+                m_pFillerNotify->OnAfterKeyStroke(FALSE, GetAttachedData(), bExit,nFlag);
         }
 }
 
 CPDF_Rect CPWL_ListBox::GetFocusRect() const
 {
         if (m_pList && m_pList->IsMultipleSel())
         {
                 CPDF_Rect rcCaret = m_pList->GetItemRect(m_pList->GetCaret());
                 rcCaret.Intersect(GetClientRect());
                 return rcCaret;
@@ skipping 60 matching lines @@
         if (m_pList)
                 m_pList->Empty();
 }
 
 void CPWL_ListBox::Reset()
 {
         if (m_pList)
                 m_pList->Cancel();
 }
 
-bool CPWL_ListBox::IsMultipleSel() const
+FX_BOOL CPWL_ListBox::IsMultipleSel() const
 {
         if (m_pList)
                 return m_pList->IsMultipleSel();
 
-        return false;
+        return FALSE;
 }
 
 int32_t CPWL_ListBox::GetCaretIndex() const
 {
         if (m_pList)
                 return m_pList->GetCaret();
 
         return -1;
 }
 
 int32_t CPWL_ListBox::GetCurSel() const
 {
         if (m_pList)
                 return m_pList->GetSelect();
 
         return -1;
 }
 
-bool CPWL_ListBox::IsItemSelected(int32_t nItemIndex) const
+FX_BOOL CPWL_ListBox::IsItemSelected(int32_t nItemIndex) const
 {
         if (m_pList)
                 return m_pList->IsItemSelected(nItemIndex);
 
-        return false;
+        return FALSE;
 }
 
 int32_t CPWL_ListBox::GetTopVisibleIndex() const
 {
         if (m_pList)
         {
                 m_pList->ScrollToListItem(m_pList->GetFirstSelected());
                 return m_pList->GetTopItem();
         }
 
@@ skipping 30 matching lines @@
                 return m_pList->GetFirstHeight();
 
         return 0.0f;
 }
 
 CPDF_Rect CPWL_ListBox::GetListRect() const
 {
         return CPWL_Utils::DeflateRect(GetWindowRect(),(FX_FLOAT)(GetBorderWidth()+GetInnerBorderWidth()));
 }
 
-bool    CPWL_ListBox::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_ListBox::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
 {
-        if (!m_pList) return false;
+        if (!m_pList) return FALSE;
 
         if (zDelta < 0)
         {
                 m_pList->OnVK_DOWN(IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag));
         }
         else
         {
                 m_pList->OnVK_UP(IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag));
         }
 
-        bool bExit = false;
-        OnNotifySelChanged(false,bExit, nFlag);
-        return true;
+        FX_BOOL bExit = FALSE;
+        OnNotifySelChanged(FALSE,bExit, nFlag);
+        return TRUE;
 }