FX Bool considered harmful, part 3

fpdfsdk/src/pdfwindow/PWL_IconList.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_ListCtrl.h"
 #include "../../include/pdfwindow/PWL_IconList.h"
 #include "../../include/pdfwindow/PWL_Utils.h"
 #include "../../include/pdfwindow/PWL_ScrollBar.h"
 #include "../../include/pdfwindow/PWL_Label.h"
 
 #define PWL_IconList_ITEM_ICON_LEFTMARGIN               10.0f
 #define PWL_IconList_ITEM_WIDTH                                 20.0f
 #define PWL_IconList_ITEM_HEIGHT                                20.0f
 #define PWL_IconList_ITEM_SPACE                                 4.0f
 
 /* ------------------ CPWL_IconList_Item ------------------- */
 
 CPWL_IconList_Item::CPWL_IconList_Item() :
         m_nIconIndex(-1),
         m_pData(NULL),
-        m_bSelected(FALSE),
+        m_bSelected(false),
         m_pText(NULL)
 {
 }
 
 CPWL_IconList_Item::~CPWL_IconList_Item()
 {
 }
 
 CFX_ByteString CPWL_IconList_Item::GetClassName() const
 {
@@ skipping 24 matching lines @@
         }
 
         CPDF_Rect rcIcon = rcClient;
         rcIcon.left += PWL_IconList_ITEM_ICON_LEFTMARGIN;
         rcIcon.right = rcIcon.left + PWL_IconList_ITEM_WIDTH;
 
         CPWL_Utils::DrawIconAppStream(pDevice, pUser2Device, m_nIconIndex, rcIcon,
                 m_crIcon, m_pText->GetTextColor(), GetTransparency());
 }
 
-void CPWL_IconList_Item::SetSelect(FX_BOOL bSelected)
+void CPWL_IconList_Item::SetSelect(bool bSelected)
 {
         m_bSelected = bSelected;
 
         if (bSelected)
                 m_pText->SetTextColor(PWL_DEFAULT_WHITECOLOR);
         else
                 m_pText->SetTextColor(PWL_DEFAULT_BLACKCOLOR);
 
 }
 
-FX_BOOL CPWL_IconList_Item::IsSelected() const
+bool    CPWL_IconList_Item::IsSelected() const
 {
         return m_bSelected;
 }
 
 void CPWL_IconList_Item::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
         m_pText = new CPWL_Label;
 
         PWL_CREATEPARAM lcp = cp;
         lcp.pParentWnd = this;
@@ skipping 22 matching lines @@
 {
         return m_pText->GetText();
 }
 
 void CPWL_IconList_Item::RePosChildWnd()
 {
         CPDF_Rect rcClient = GetClientRect();
 
         rcClient.left += (PWL_IconList_ITEM_ICON_LEFTMARGIN + PWL_IconList_ITEM_WIDTH + PWL_IconList_ITEM_ICON_LEFTMARGIN);
 
-        m_pText->Move(rcClient, TRUE, FALSE);
+        m_pText->Move(rcClient, true, false);
 }
 
 void CPWL_IconList_Item::SetIconFillColor(const CPWL_Color& color)
 {
         m_crIcon = color;
 }
 
 void CPWL_IconList_Item::OnEnabled()
 {
         if (m_bSelected)
                 m_pText->SetTextColor(PWL_DEFAULT_WHITECOLOR);
         else
                 m_pText->SetTextColor(PWL_DEFAULT_BLACKCOLOR);
 
         InvalidateRect();
 }
 
 void CPWL_IconList_Item::OnDisabled()
 {
         m_pText->SetTextColor(PWL_DEFAULT_HEAVYGRAYCOLOR);
 
         InvalidateRect();
 }
 
 /* ----------------- CPWL_IconList_Content ----------------- */
 
 CPWL_IconList_Content::CPWL_IconList_Content(int32_t nListCount) :
         m_nSelectIndex(-1),
         m_pNotify(NULL),
-        m_bEnableNotify(TRUE),
-        m_bMouseDown(FALSE),
+        m_bEnableNotify(true),
+        m_bMouseDown(false),
         m_nListCount(nListCount)
 {
 }
 
 CPWL_IconList_Content::~CPWL_IconList_Content()
 {
 }
 
 void CPWL_IconList_Content::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
@@ skipping 19 matching lines @@
                 sInfo.fContentMin = rcScroll.bottom;
                 sInfo.fContentMax = rcScroll.top;
                 sInfo.fPlateWidth = GetClientRect().Height();
                 sInfo.fSmallStep = 13.0f;
                 sInfo.fBigStep = sInfo.fPlateWidth;
 
                 pParent->OnNotify(this, PNM_SETSCROLLINFO, SBT_VSCROLL, (intptr_t)&sInfo);
         }
 }
 
-FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_IconList_Content::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
 {
         SetFocus();
 
         SetCapture();
-        m_bMouseDown = TRUE;
+        m_bMouseDown = true;
 
         int32_t nItemIndex = FindItemIndex(point);
         SetSelect(nItemIndex);
         ScrollToItem(nItemIndex);
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_IconList_Content::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
-        m_bMouseDown = FALSE;
+        m_bMouseDown = false;
         ReleaseCapture();
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL CPWL_IconList_Content::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag)
+bool CPWL_IconList_Content::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag)
 {
         if (m_bMouseDown)
         {
                 int32_t nItemIndex = FindItemIndex(point);
                 SetSelect(nItemIndex);
                 ScrollToItem(nItemIndex);
         }
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL CPWL_IconList_Content::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
+bool    CPWL_IconList_Content::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
 {
         switch (nChar)
         {
         case FWL_VKEY_Up:
                 if (m_nSelectIndex > 0)
                 {
                         int32_t nItemIndex = m_nSelectIndex - 1;
                         SetSelect(nItemIndex);
                         ScrollToItem(nItemIndex);
                 }
-                return TRUE;
+                return true;
         case FWL_VKEY_Down:
                 if (m_nSelectIndex < m_nListCount-1)
                 {
                         int32_t nItemIndex = m_nSelectIndex + 1;
                         SetSelect(nItemIndex);
                         ScrollToItem(nItemIndex);
                 }
-                return TRUE;
+                return true;
         }
 
-        return FALSE;
+        return false;
 }
 
 int32_t CPWL_IconList_Content::FindItemIndex(const CPDF_Point& point)
 {
         int32_t nIndex = 0;
         for (int32_t i=0,sz=m_aChildren.GetSize(); i<sz; i++)
         {
                 if (CPWL_Wnd * pChild = m_aChildren.GetAt(i))
                 {
                         CPDF_Rect rcWnd = pChild->ChildToParent(pChild->GetWindowRect());
@@ skipping 38 matching lines @@
                                 pParent->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptScroll.y);
                         }
                 }
         }
 }
 
 void CPWL_IconList_Content::SetSelect(int32_t nIndex)
 {
         if (m_nSelectIndex != nIndex)
         {
-                SelectItem(m_nSelectIndex, FALSE);
-                SelectItem(nIndex, TRUE);
+                SelectItem(m_nSelectIndex, false);
+                SelectItem(nIndex, true);
                 m_nSelectIndex = nIndex;
 
                 if (IPWL_IconList_Notify* pNotify = GetNotify())
                         pNotify->OnNoteListSelChanged(nIndex);
         }
 }
 
 int32_t CPWL_IconList_Content::GetSelect() const
 {
         return m_nSelectIndex;
 }
 
 IPWL_IconList_Notify* CPWL_IconList_Content::GetNotify() const
 {
         if (m_bEnableNotify)
                 return m_pNotify;
         return NULL;
 }
 
 void CPWL_IconList_Content::SetNotify(IPWL_IconList_Notify* pNotify)
 {
         m_pNotify = pNotify;
 }
 
-void CPWL_IconList_Content::EnableNotify(FX_BOOL bNotify)
+void CPWL_IconList_Content::EnableNotify(bool bNotify)
 {
         m_bEnableNotify = bNotify;
 }
 
-void CPWL_IconList_Content::SelectItem(int32_t nItemIndex, FX_BOOL bSelect)
+void CPWL_IconList_Content::SelectItem(int32_t nItemIndex, bool bSelect)
 {
         if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex))
         {
                 pItem->SetSelect(bSelect);
                 pItem->InvalidateRect();
         }
 }
 
 CPWL_IconList_Item* CPWL_IconList_Content::GetListItem(int32_t nItemIndex) const
 {
@@ skipping 64 matching lines @@
 
 CPWL_IconList::~CPWL_IconList()
 {
 }
 
 void CPWL_IconList::RePosChildWnd()
 {
         CPWL_Wnd::RePosChildWnd();
 
         if (m_pListContent)
-                m_pListContent->Move(GetClientRect(), TRUE, FALSE);
+                m_pListContent->Move(GetClientRect(), true, false);
 }
 
 void CPWL_IconList::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
         m_pListContent = new CPWL_IconList_Content(m_nListCount);
 
         PWL_CREATEPARAM ccp = cp;
         ccp.pParentWnd = this;
         ccp.dwFlags = PWS_CHILD | PWS_VISIBLE;
         m_pListContent->Create(ccp);
 }
 
 void CPWL_IconList::OnCreated()
 {
         if (CPWL_ScrollBar* pScrollBar = GetVScrollBar())
         {
                 pScrollBar->RemoveFlag(PWS_AUTOTRANSPARENT);
                 pScrollBar->SetTransparency(255);
-                pScrollBar->SetNotifyForever(TRUE);
+                pScrollBar->SetNotifyForever(true);
         }
 }
 
 void CPWL_IconList::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
         CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
 
         if (wParam == SBT_VSCROLL)
         {
                 switch (msg)
                 {
                 case PNM_SETSCROLLINFO:
                         if (PWL_SCROLL_INFO* pInfo = (PWL_SCROLL_INFO*)lParam)
                         {
                                 if (CPWL_ScrollBar* pScrollBar = GetVScrollBar())
                                 {
                                         if (pInfo->fContentMax - pInfo->fContentMin > pInfo->fPlateWidth)
                                         {
                                                 if (!pScrollBar->IsVisible())
                                                 {
-                                                        pScrollBar->SetVisible(TRUE);
+                                                        pScrollBar->SetVisible(true);
                                                         RePosChildWnd();
                                                 }
                                                 else
                                                 {
                                                 }
                                         }
                                         else
                                         {
                                                 if (pScrollBar->IsVisible())
                                                 {
-                                                        pScrollBar->SetVisible(FALSE);
+                                                        pScrollBar->SetVisible(false);
                                                         RePosChildWnd();
                                                 }
 
                                                 if (m_pListContent)
                                                         m_pListContent->SetScrollPos(CPDF_Point(0.0f,0.0f));
                                         }
 
                                         pScrollBar->OnNotify(pWnd,PNM_SETSCROLLINFO,wParam,lParam);
                                 }
                         }
@@ skipping 27 matching lines @@
 int32_t CPWL_IconList::GetSelect() const
 {
         return m_pListContent->GetSelect();
 }
 
 void CPWL_IconList::SetNotify(IPWL_IconList_Notify* pNotify)
 {
         m_pListContent->SetNotify(pNotify);
 }
 
-void CPWL_IconList::EnableNotify(FX_BOOL bNotify)
+void CPWL_IconList::EnableNotify(bool bNotify)
 {
         m_pListContent->EnableNotify(bNotify);
 }
 
 void CPWL_IconList::SetListData(int32_t nItemIndex, void* pData)
 {
         m_pListContent->SetListData(nItemIndex, pData);
 }
 
 void CPWL_IconList::SetListIcon(int32_t nItemIndex, int32_t nIconIndex)
 {
         m_pListContent->SetListIcon(nItemIndex, nIconIndex);
 }
 
 void CPWL_IconList::SetListString(int32_t nItemIndex, const CFX_WideString& str)
 {
         m_pListContent->SetListString(nItemIndex, str);
 }
 
 CFX_WideString CPWL_IconList::GetListString(int32_t nItemIndex) const
 {
         return m_pListContent->GetListString(nItemIndex);
 }
 
 void CPWL_IconList::SetIconFillColor(const CPWL_Color& color)
 {
         m_pListContent->SetIconFillColor(color);
 }
 
-FX_BOOL CPWL_IconList::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_IconList::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
 {
         CPDF_Point ptScroll = m_pListContent->GetScrollPos();
         CPDF_Rect rcScroll = m_pListContent->GetScrollArea();
         CPDF_Rect rcContents = m_pListContent->GetClientRect();
 
         if (rcScroll.top - rcScroll.bottom > rcContents.Height())
         {
                 CPDF_Point ptNew = ptScroll;
 
                 if (zDelta > 0)
@@ skipping 10 matching lines @@
 
                 if (ptNew.y != ptScroll.y)
                 {
                         m_pListContent->SetScrollPos(ptNew);
                         m_pListContent->ResetFace();
                         m_pListContent->InvalidateRect(NULL);
 
                         if (CPWL_ScrollBar* pScrollBar = GetVScrollBar())
                                 pScrollBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptNew.y);
 
-                        return TRUE;
+                        return true;
                 }
         }
 
-        return FALSE;
+        return false;
 }