FX_BOOL considered harmful, part 2.

fpdfsdk/src/pdfwindow/PWL_Note.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_Button.h"
 #include "../../include/pdfwindow/PWL_EditCtrl.h"
@@ skipping 42 matching lines @@
 {
         if (IsValid())
         {
                 ASSERT(m_pText != NULL);
 
                 CPDF_Rect rcClient = GetClientRect();
 
                 if (rcClient.Width() > 15.0f)
                 {
                         rcClient.right -= 15.0f;
-                        m_pText->Move(rcClient, TRUE, FALSE);
-                        m_pText->SetVisible(TRUE);
+                        m_pText->Move(rcClient, true, false);
+                        m_pText->SetVisible(true);
                 }
                 else
                 {
-                        m_pText->Move(CPDF_Rect(0,0,0,0), TRUE, FALSE);
-                        m_pText->SetVisible(FALSE);
+                        m_pText->Move(CPDF_Rect(0,0,0,0), true, false);
+                        m_pText->SetVisible(false);
                 }
         }
 }
 
 void CPWL_Note_Options::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
         m_pText = new CPWL_Label;
         PWL_CREATEPARAM tcp = cp;
         tcp.pParentWnd = this;
         tcp.dwFlags = PWS_CHILD | PWS_VISIBLE;
@@ skipping 35 matching lines @@
 {
         ASSERT(m_pText != NULL);
 
         CPDF_Rect rcText = m_pText->GetContentRect();
         rcText.right += 15.0f;
         return rcText;
 }
 
 /* ------------------------------- CPWL_Note_Edit ------------------------------ */
 
-CPWL_Note_Edit::CPWL_Note_Edit() : m_bEnableNotify(TRUE),
+CPWL_Note_Edit::CPWL_Note_Edit() : m_bEnableNotify(true),
         m_fOldItemHeight(0.0f),
-        m_bSizeChanged(FALSE),
+        m_bSizeChanged(false),
         m_fOldMin(0.0f),
         m_fOldMax(0.0f)
 {
 }
 
 CPWL_Note_Edit::~CPWL_Note_Edit()
 {
 }
 
 void CPWL_Note_Edit::RePosChildWnd()
 {
-        m_bEnableNotify = FALSE;
+        m_bEnableNotify = false;
         CPWL_Edit::RePosChildWnd();
-        m_bEnableNotify = TRUE;
+        m_bEnableNotify = true;
 
         m_fOldItemHeight = GetContentRect().Height();
 }
 
 void CPWL_Note_Edit::SetText(const FX_WCHAR* csText)
 {
-        m_bEnableNotify = FALSE;
+        m_bEnableNotify = false;
         CPWL_Edit::SetText(csText);
-        m_bEnableNotify = TRUE;
+        m_bEnableNotify = true;
         m_fOldItemHeight = GetContentRect().Height();
 }
 
 void CPWL_Note_Edit::OnSetFocus()
 {
-        m_bEnableNotify = FALSE;
+        m_bEnableNotify = false;
         CPWL_Edit::OnSetFocus();
-        m_bEnableNotify = TRUE;
+        m_bEnableNotify = true;
 
-        EnableSpellCheck(TRUE);
+        EnableSpellCheck(true);
 }
 
 void CPWL_Note_Edit::OnKillFocus()
 {
-        EnableSpellCheck(FALSE);
+        EnableSpellCheck(false);
 
         if (CPWL_Wnd* pParent = GetParentWindow())
         {
                 if (CPWL_Wnd* pGrand = pParent->GetParentWindow())
                 {
                         ASSERT(pGrand->GetClassName() == "CPWL_NoteItem");
 
                         CPWL_NoteItem* pNoteItem = (CPWL_NoteItem*)pGrand;
 
                         pNoteItem->OnContentsValidate();
@@ skipping 10 matching lines @@
                 if (wParam == SBT_VSCROLL)
                 {
                         switch (msg)
                         {
                         case PNM_SETSCROLLINFO:
                                 if (PWL_SCROLL_INFO* pInfo = (PWL_SCROLL_INFO*)lParam)
                                 {
                                         if (!IsFloatEqual(pInfo->fContentMax, m_fOldMax) ||
                                                 !IsFloatEqual(pInfo->fContentMin, m_fOldMin))
                                         {
-                                                m_bSizeChanged = TRUE;
+                                                m_bSizeChanged = true;
                                                 if (CPWL_Wnd * pParent = GetParentWindow())
                                                 {
                                                         pParent->OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
                                                 }
 
                                                 m_fOldMax = pInfo->fContentMax;
                                                 m_fOldMin = pInfo->fContentMin;
                                                 return;
                                         }
                                 }
                         }
                 }
         }
 
         CPWL_Edit::OnNotify(pWnd, msg, wParam, lParam);
 
         if (m_bEnableNotify)
         {
                 switch (msg)
                 {
                 case PNM_SETCARETINFO:
                         if (PWL_CARET_INFO * pInfo = (PWL_CARET_INFO*)wParam)
                         {
                                 PWL_CARET_INFO newInfo = *pInfo;
-                                newInfo.bVisible = TRUE;
+                                newInfo.bVisible = true;
                                 newInfo.ptHead = ChildToParent(pInfo->ptHead);
                                 newInfo.ptFoot = ChildToParent(pInfo->ptFoot);
 
                                 if (CPWL_Wnd * pParent = GetParentWindow())
                                 {
                                         pParent->OnNotify(this, PNM_SETCARETINFO, (intptr_t)&newInfo, 0);
                                 }
                         }
                         break;
                 }
         }
 }
 
 FX_FLOAT CPWL_Note_Edit::GetItemHeight(FX_FLOAT fLimitWidth)
 {
         if (fLimitWidth > 0)
         {
                 if (!m_bSizeChanged)
                         return m_fOldItemHeight;
 
-                m_bSizeChanged = FALSE;
+                m_bSizeChanged = false;
 
-                EnableNotify(FALSE);
-                EnableRefresh(FALSE);
-                m_pEdit->EnableNotify(FALSE);
+                EnableNotify(false);
+                EnableRefresh(false);
+                m_pEdit->EnableNotify(false);
 
-                Move(CPDF_Rect(0,0,fLimitWidth,0), TRUE, FALSE);
+                Move(CPDF_Rect(0,0,fLimitWidth,0), true, false);
                 FX_FLOAT fRet = GetContentRect().Height();
 
-                m_pEdit->EnableNotify(TRUE);
-                EnableNotify(TRUE);
-                EnableRefresh(TRUE);
+                m_pEdit->EnableNotify(true);
+                EnableNotify(true);
+                EnableRefresh(true);
 
                 return fRet;
         }
 
         return 0;
 }
 
 FX_FLOAT CPWL_Note_Edit::GetItemLeftMargin()
 {
         return POPUP_ITEM_TEXT_INDENT;
@@ skipping 78 matching lines @@
 }
 
 void CPWL_Note_Icon::DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device)
 {
         CPWL_Utils::DrawIconAppStream(pDevice, pUser2Device, m_nType, GetClientRect(),
                 GetBackgroundColor(), PWL_DEFAULT_BLACKCOLOR, GetTransparency());
 }
 
 /* --------------------------------- CPWL_Note_CloseBox ---------------------------------- */
 
-CPWL_Note_CloseBox::CPWL_Note_CloseBox() : m_bMouseDown(FALSE)
+CPWL_Note_CloseBox::CPWL_Note_CloseBox() : m_bMouseDown(false)
 {
 }
 
 CPWL_Note_CloseBox::~CPWL_Note_CloseBox()
 {
 }
 
 void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device)
 {
         CPWL_Button::DrawThisAppearance(pDevice, pUser2Device);
@@ skipping 17 matching lines @@
         pathCross.SetPointCount(4);
         pathCross.SetPoint(0, rcClient.left, rcClient.bottom, FXPT_MOVETO);
         pathCross.SetPoint(1, rcClient.right, rcClient.top, FXPT_LINETO);
         pathCross.SetPoint(2, rcClient.left, rcClient.top, FXPT_MOVETO);
         pathCross.SetPoint(3, rcClient.right, rcClient.bottom, FXPT_LINETO);
 
         pDevice->DrawPath(&pathCross, pUser2Device, &gsd,
                 0, CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()), FXFILL_ALTERNATE);
 }
 
-FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
+bool CPWL_Note_CloseBox::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
 {
         SetBorderStyle(PBS_INSET);
         InvalidateRect(NULL);
 
-        m_bMouseDown = TRUE;
+        m_bMouseDown = true;
 
         return CPWL_Button::OnLButtonDown(point,nFlag);
 }
 
-FX_BOOL CPWL_Note_CloseBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_Note_CloseBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
-        m_bMouseDown = FALSE;
+        m_bMouseDown = false;
 
         SetBorderStyle(PBS_BEVELED);
         InvalidateRect(NULL);
 
         return CPWL_Button::OnLButtonUp(point,nFlag);
 }
 
 /* ------------------------------ CPWL_Note_Contents ------------------------------- */
 
 CPWL_Note_Contents::CPWL_Note_Contents() : m_pEdit(NULL)
 {
 }
 
 CPWL_Note_Contents::~CPWL_Note_Contents()
 {
 }
 
 CFX_ByteString CPWL_Note_Contents::GetClassName() const
 {
         return "CPWL_Note_Contents";
 }
 
 void CPWL_Note_Contents::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
         m_pEdit = new CPWL_Note_Edit;
         PWL_CREATEPARAM ecp = cp;
         ecp.pParentWnd = this;
         ecp.dwFlags = PWS_VISIBLE | PWS_CHILD | PES_MULTILINE | PES_AUTORETURN | PES_TEXTOVERFLOW | PES_UNDO | PES_SPELLCHECK;
 
-        m_pEdit->EnableNotify(FALSE);
+        m_pEdit->EnableNotify(false);
         m_pEdit->Create(ecp);
-        m_pEdit->EnableNotify(TRUE);
+        m_pEdit->EnableNotify(true);
 }
 
 void CPWL_Note_Contents::SetText(const CFX_WideString& sText)
 {
         if (m_pEdit)
         {
-                m_pEdit->EnableNotify(FALSE);
+                m_pEdit->EnableNotify(false);
                 m_pEdit->SetText(sText.c_str());
-                m_pEdit->EnableNotify(TRUE);
+                m_pEdit->EnableNotify(true);
                 OnNotify(m_pEdit, PNM_NOTEEDITCHANGED, 0, 0);
         }
 }
 
 CFX_WideString CPWL_Note_Contents::GetText() const
 {
         if (m_pEdit)
                 return m_pEdit->GetText();
 
         return L"";
@@ skipping 90 matching lines @@
 
 void CPWL_Note_Contents::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
         switch (msg)
         {
         case PNM_NOTEEDITCHANGED:
                 {
                         int32_t nIndex = GetItemIndex(pWnd);
                         if (nIndex < 0) nIndex = 0;
 
-                        m_pEdit->EnableNotify(FALSE);
+                        m_pEdit->EnableNotify(false);
                         ResetContent(nIndex);
-                        m_pEdit->EnableNotify(TRUE);
+                        m_pEdit->EnableNotify(true);
 
                         for (int32_t i=nIndex+1, sz=m_aChildren.GetSize(); i<sz; i++)
                         {
                                 if (CPWL_Wnd* pChild = m_aChildren.GetAt(i))
                                         pChild->OnNotify(this, PNM_NOTERESET, 0, 0);
                         }
 
                         if (CPWL_Wnd * pParent = GetParentWindow())
                         {
                                 pParent->OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
                         }
                 }
                 return;
         case PNM_SCROLLWINDOW:
                 SetScrollPos(CPDF_Point(0.0f, *(FX_FLOAT*)lParam));
                 ResetFace();
                 InvalidateRect(NULL);
                 return;
         case PNM_SETCARETINFO:
                 if (PWL_CARET_INFO * pInfo = (PWL_CARET_INFO*)wParam)
                 {
                         PWL_CARET_INFO newInfo = *pInfo;
-                        newInfo.bVisible = TRUE;
+                        newInfo.bVisible = true;
                         newInfo.ptHead = ChildToParent(pInfo->ptHead);
                         newInfo.ptFoot = ChildToParent(pInfo->ptFoot);
 
                         if (CPWL_Wnd * pParent = GetParentWindow())
                         {
                                 pParent->OnNotify(this, PNM_SETCARETINFO, (intptr_t)&newInfo, 0);
                         }
                 }
                 return;
         case PNM_NOTERESET:
                 {
-                        m_pEdit->EnableNotify(FALSE);
+                        m_pEdit->EnableNotify(false);
                         ResetContent(0);
-                        m_pEdit->EnableNotify(TRUE);
+                        m_pEdit->EnableNotify(true);
 
                         for (int32_t i=1, sz=m_aChildren.GetSize(); i<sz; i++)
                         {
                                 if (CPWL_Wnd* pChild = m_aChildren.GetAt(i))
                                         pChild->OnNotify(this, PNM_NOTERESET, 0, 0);
                         }
 
-                        m_pEdit->EnableNotify(FALSE);
+                        m_pEdit->EnableNotify(false);
                         ResetContent(0);
-                        m_pEdit->EnableNotify(TRUE);
+                        m_pEdit->EnableNotify(true);
                 }
                 return;
         }
 
         CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
 }
 
-FX_BOOL CPWL_Note_Contents::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_Note_Contents::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
 {
-        if (CPWL_Wnd::OnLButtonDown(point,nFlag)) return TRUE;
+        if (CPWL_Wnd::OnLButtonDown(point,nFlag)) return true;
 
         if (!m_pEdit->IsFocused())
         {
                 m_pEdit->SetFocus();
         }
 
-        return TRUE;
+        return true;
 }
 
-void CPWL_Note_Contents::SetEditFocus(FX_BOOL bLast)
+void CPWL_Note_Contents::SetEditFocus(bool bLast)
 {
         if (!m_pEdit->IsFocused())
         {
                 m_pEdit->SetFocus();
                 m_pEdit->SetCaret(bLast ? m_pEdit->GetTotalWords() : 0);
         }
 }
 
 CPWL_Edit* CPWL_Note_Contents::GetEdit() const
 {
         return m_pEdit;
 }
 
-void CPWL_Note_Contents::EnableModify(FX_BOOL bEnabled)
+void CPWL_Note_Contents::EnableModify(bool bEnabled)
 {
         if (!bEnabled)
                 m_pEdit->AddFlag(PWS_READONLY);
         else
                 m_pEdit->RemoveFlag(PWS_READONLY);
 
         for (int32_t i=0,sz=m_aChildren.GetSize(); i<sz; i++)
         {
                 if (CPWL_Wnd* pChild = m_aChildren.GetAt(i))
                 {
                         if (pChild->GetClassName() == "CPWL_NoteItem")
                         {
                                 CPWL_NoteItem* pNoteItem = (CPWL_NoteItem*)pChild;
                                 pNoteItem->EnableModify(bEnabled);
                         }
                 }
         }
 }
 
-void CPWL_Note_Contents::EnableRead(FX_BOOL bEnabled)
+void CPWL_Note_Contents::EnableRead(bool bEnabled)
 {
         if (!bEnabled)
                 m_pEdit->AddFlag(PES_NOREAD);
         else
                 m_pEdit->RemoveFlag(PES_NOREAD);
 
         for (int32_t i=0,sz=m_aChildren.GetSize(); i<sz; i++)
         {
                 if (CPWL_Wnd* pChild = m_aChildren.GetAt(i))
                 {
                         if (pChild->GetClassName() == "CPWL_NoteItem")
                         {
                                 CPWL_NoteItem* pNoteItem = (CPWL_NoteItem*)pChild;
                                 pNoteItem->EnableRead(bEnabled);
                         }
                 }
         }
 }
 
 /* ---------------------------------- CPWL_NoteItem ---------------------------------- */
 
 CPWL_NoteItem::CPWL_NoteItem() :
         m_pSubject(NULL),
         m_pDateTime(NULL),
         m_pContents(NULL),
         m_pPrivateData(NULL),
         m_sAuthor(L""),
         m_fOldItemHeight(0.0f),
-        m_bSizeChanged(FALSE),
-        m_bAllowModify(TRUE)
+        m_bSizeChanged(false),
+        m_bAllowModify(true)
 {
 }
 
 CPWL_NoteItem::~CPWL_NoteItem()
 {
 }
 
 CFX_ByteString CPWL_NoteItem::GetClassName() const
 {
         return "CPWL_NoteItem";
@@ skipping 43 matching lines @@
                 ASSERT(m_pContents != NULL);
 
                 CPDF_Rect rcClient = GetClientRect();
 
                 CPDF_Rect rcSubject = rcClient;
                 rcSubject.left += POPUP_ITEM_TEXT_INDENT;
                 rcSubject.top = rcClient.top;
                 rcSubject.right = PWL_MIN(rcSubject.left + m_pSubject->GetContentRect().Width() + 1.0f, rcClient.right);
                 rcSubject.bottom = rcSubject.top - m_pSubject->GetContentRect().Height();
                 rcSubject.Normalize();
-                m_pSubject->Move(rcSubject, TRUE, FALSE);
+                m_pSubject->Move(rcSubject, true, false);
                 m_pSubject->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcSubject));
 
                 CPDF_Rect rcDate = rcClient;
                 rcDate.right -= POPUP_ITEM_TEXT_INDENT;
                 rcDate.left = PWL_MAX(rcDate.right - m_pDateTime->GetContentRect().Width() - 1.0f, rcSubject.right);
                 rcDate.bottom = rcDate.top - m_pDateTime->GetContentRect().Height();
                 rcDate.Normalize();
-                m_pDateTime->Move(rcDate, TRUE, FALSE);
+                m_pDateTime->Move(rcDate, true, false);
                 m_pDateTime->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcDate));
 
                 CPDF_Rect rcContents = rcClient;
                 rcContents.left += 1.0f;
                 rcContents.right -= 1.0f;
                 rcContents.top = rcDate.bottom - POPUP_ITEM_HEAD_BOTTOM;
                 rcContents.bottom += POPUP_ITEM_BOTTOMWIDTH;
                 rcContents.Normalize();
-                m_pContents->Move(rcContents, TRUE, FALSE);
+                m_pContents->Move(rcContents, true, false);
                 m_pContents->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcContents));
         }
 
         SetClipRect(CPWL_Utils::InflateRect(GetWindowRect(),1.0f));
 }
 
 void CPWL_NoteItem::SetPrivateData(void* pData)
 {
         m_pPrivateData = pData;
 }
@@ skipping 252 matching lines @@
         return NULL;
 }
 
 FX_FLOAT CPWL_NoteItem::GetItemHeight(FX_FLOAT fLimitWidth)
 {
         if (fLimitWidth > 0)
         {
                 if (!m_bSizeChanged)
                         return m_fOldItemHeight;
 
-                m_bSizeChanged = FALSE;
+                m_bSizeChanged = false;
 
                 ASSERT(m_pSubject != NULL);
                 ASSERT(m_pDateTime != NULL);
                 ASSERT(m_pContents != NULL);
 
                 FX_FLOAT fRet = m_pDateTime->GetContentRect().Height();
                 FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
                 if (fLimitWidth > fBorderWidth * 2)
                         fRet += m_pContents->GetContentsHeight(fLimitWidth - fBorderWidth * 2);
                 fRet += POPUP_ITEM_HEAD_BOTTOM + POPUP_ITEM_BOTTOMWIDTH + fBorderWidth * 2;
 
                 return m_fOldItemHeight = fRet;
         }
 
         return 0;
 }
 
 FX_FLOAT CPWL_NoteItem::GetItemLeftMargin()
 {
         return POPUP_ITEM_SIDEMARGIN;
 }
 
 FX_FLOAT CPWL_NoteItem::GetItemRightMargin()
 {
         return POPUP_ITEM_SIDEMARGIN;
 }
 
-FX_BOOL CPWL_NoteItem::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag)
+bool    CPWL_NoteItem::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag)
 {
         if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point)))
         {
-                SetNoteFocus(FALSE);
+                SetNoteFocus(false);
         }
 
         CPWL_Wnd::OnLButtonDown(point,nFlag);
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL CPWL_NoteItem::OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_NoteItem::OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
         if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point)))
         {
-                SetNoteFocus(FALSE);
+                SetNoteFocus(false);
                 PopupNoteItemMenu(point);
 
-                return TRUE;
+                return true;
         }
 
         return CPWL_Wnd::OnRButtonUp(point,nFlag);
 }
 
 void CPWL_NoteItem::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
         switch (msg)
         {
         case PNM_NOTEEDITCHANGED:
-                m_bSizeChanged = TRUE;
+                m_bSizeChanged = true;
 
                 if (CPWL_Wnd* pParent = GetParentWindow())
                 {
                         pParent->OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
                 }
                 return;
         case PNM_SETCARETINFO:
                 if (PWL_CARET_INFO * pInfo = (PWL_CARET_INFO*)wParam)
                 {
                         PWL_CARET_INFO newInfo = *pInfo;
-                        newInfo.bVisible = TRUE;
+                        newInfo.bVisible = true;
                         newInfo.ptHead = ChildToParent(pInfo->ptHead);
                         newInfo.ptFoot = ChildToParent(pInfo->ptFoot);
 
                         if (CPWL_Wnd * pParent = GetParentWindow())
                         {
                                 pParent->OnNotify(this, PNM_SETCARETINFO, (intptr_t)&newInfo, 0);
                         }
                 }
                 return;
         case PNM_NOTERESET:
-                m_bSizeChanged = TRUE;
+                m_bSizeChanged = true;
                 m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
 
                 return;
         }
 
         CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
 }
 
 void CPWL_NoteItem::PopupNoteItemMenu(const CPDF_Point& point)
 {
@@ skipping 39 matching lines @@
 }
 
 void CPWL_NoteItem::OnContentsValidate()
 {
         if (IPWL_NoteNotify* pNotify = GetNoteNotify())
         {
                 pNotify->OnSetContents(this);
         }
 }
 
-void CPWL_NoteItem::SetNoteFocus(FX_BOOL bLast)
+void CPWL_NoteItem::SetNoteFocus(bool bLast)
 {
         m_pContents->SetEditFocus(bLast);
 }
 
-void CPWL_NoteItem::EnableModify(FX_BOOL bEnabled)
+void CPWL_NoteItem::EnableModify(bool bEnabled)
 {
         m_pContents->EnableModify(bEnabled);
         m_bAllowModify = bEnabled;
 }
 
-void CPWL_NoteItem::EnableRead(FX_BOOL bEnabled)
+void CPWL_NoteItem::EnableRead(bool bEnabled)
 {
         m_pContents->EnableRead(bEnabled);
 }
 
 /* ---------------------------------- CPWL_Note ---------------------------------- */
 
 CPWL_Note::CPWL_Note(IPopup_Note* pPopupNote, IPWL_NoteNotify* pNoteNotify, IPWL_NoteHandler* pNoteHandler) :
         m_pAuthor(NULL),
         m_pIcon(NULL),
         m_pCloseBox(NULL),
         m_pLBBox(NULL),
         m_pRBBox(NULL),
         m_pContentsBar(NULL),
         m_pOptions(NULL),
         m_pNoteNotify(pNoteNotify),
-        m_bResizing(FALSE),
+        m_bResizing(false),
         m_rcCaption(0,0,0,0),
-        m_bEnalbleNotify(TRUE),
+        m_bEnalbleNotify(true),
         m_pPopupNote(pPopupNote)
 {
 }
 
 CPWL_Note::~CPWL_Note()
 {
 }
 
 IPWL_NoteItem* CPWL_Note::Reply()
 {
         return CreateNoteItem();
 }
 
-void CPWL_Note::EnableNotify(FX_BOOL bEnabled)
+void CPWL_Note::EnableNotify(bool bEnabled)
 {
         m_bEnalbleNotify = bEnabled;
 }
 
 void CPWL_Note::RePosChildWnd()
 {
         RePosNoteChildren();
         m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
         ResetScrollBar();
         m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
         OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
         if (const CPWL_Wnd* pWnd = GetFocused())
         {
                 if (pWnd->GetClassName() == "CPWL_Edit")
                 {
                         CPWL_Edit* pEdit = (CPWL_Edit*)pWnd;
                         pEdit->SetCaret(pEdit->GetCaret());
                 }
         }
 }
 
-FX_BOOL CPWL_Note::ResetScrollBar()
+bool CPWL_Note::ResetScrollBar()
 {
-        FX_BOOL bScrollChanged = FALSE;
+        bool bScrollChanged = false;
 
         if (ScrollBarShouldVisible())
         {
                 if (!m_pContentsBar->IsVisible())
                 {
-                        m_pContentsBar->SetVisible(TRUE);
+                        m_pContentsBar->SetVisible(true);
                         if (m_pContentsBar->IsVisible())
                         {
                                 m_pContentsBar->InvalidateRect(NULL);
-                                bScrollChanged = TRUE;
+                                bScrollChanged = true;
                         }
                 }
         }
         else
         {
                 if (m_pContentsBar->IsVisible())
                 {
-                        m_pContentsBar->SetVisible(FALSE);
+                        m_pContentsBar->SetVisible(false);
                         m_pContentsBar->InvalidateRect(NULL);
 
-                        bScrollChanged = TRUE;
+                        bScrollChanged = true;
                 }
         }
 
         if (bScrollChanged)
         {
                 CPDF_Rect rcNote = GetClientRect();
                 CPDF_Rect rcContents = m_pContents->GetWindowRect();
                 rcContents.right = rcNote.right - 3.0f;
                 if (m_pContentsBar->IsVisible())
                         rcContents.right -= PWL_SCROLLBAR_WIDTH;
-                m_pContents->Move(rcContents, TRUE, TRUE);
+                m_pContents->Move(rcContents, true, true);
                 m_pContents->SetScrollPos(CPDF_Point(0.0f,0.0f));
                 m_pContents->InvalidateRect(NULL);
         }
 
         return bScrollChanged;
 }
 
-FX_BOOL CPWL_Note::ScrollBarShouldVisible()
+bool CPWL_Note::ScrollBarShouldVisible()
 {
         CPDF_Rect rcContentsFact = m_pContents->GetScrollArea();
         CPDF_Rect rcContentsClient = m_pContents->GetClientRect();
 
         return rcContentsFact.Height() > rcContentsClient.Height();
 }
 
 void CPWL_Note::SetOptionsText(const CFX_WideString& sText)
 {
         if (m_pOptions)
                 m_pOptions->SetText(sText);
 
         RePosNoteChildren();
 }
 
 void CPWL_Note::RePosNoteChildren()
 {
         if (m_bResizing) return;
 
-        m_bResizing = TRUE;
+        m_bResizing = true;
 
         if (IsValid())
         {
                 ASSERT(m_pSubject != NULL);
                 ASSERT(m_pDateTime != NULL);
                 ASSERT(m_pContents != NULL);
                 ASSERT(m_pAuthor != NULL);
                 ASSERT(m_pCloseBox != NULL);
                 ASSERT(m_pIcon != NULL);
                 ASSERT(m_pLBBox != NULL);
                 ASSERT(m_pRBBox != NULL);
                 ASSERT(m_pContentsBar != NULL);
                 ASSERT(m_pOptions != NULL);
 
                 CPDF_Rect rcClient = GetClientRect();
 
                 CPDF_Rect rcIcon = rcClient;
                 rcIcon.top -= 2.0f;
                 rcIcon.right = rcIcon.left + 14.0f;
                 rcIcon.bottom = rcIcon.top - 14.0f;
                 rcIcon.Normalize();
-                m_pIcon->Move(rcIcon, TRUE, FALSE);
+                m_pIcon->Move(rcIcon, true, false);
                 m_pIcon->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcIcon));
 
                 CPDF_Rect rcCloseBox = rcClient;
                 rcCloseBox.right -= 1.0f;
                 rcCloseBox.top -= 1.0f;
                 rcCloseBox.left = rcCloseBox.right - 14.0f;
                 rcCloseBox.bottom = rcCloseBox.top - 14.0f;
                 rcCloseBox.Normalize();
-                m_pCloseBox->Move(rcCloseBox, TRUE, FALSE);
+                m_pCloseBox->Move(rcCloseBox, true, false);
                 m_pCloseBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcCloseBox));
 
                 CPDF_Rect rcDate = rcClient;
                 rcDate.right = rcCloseBox.left - POPUP_ITEM_TEXT_INDENT;
                 rcDate.left = PWL_MAX(rcDate.right - m_pDateTime->GetContentRect().Width() - 1.0f, rcIcon.right + 1.0f);
                 rcDate.top = rcClient.top - 2.0f;
                 rcDate.bottom = rcDate.top - m_pDateTime->GetContentRect().Height();
                 rcDate.Normalize();
-                m_pDateTime->Move(rcDate, TRUE, FALSE);
+                m_pDateTime->Move(rcDate, true, false);
                 m_pDateTime->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcDate));
 
                 CPDF_Rect rcSubject = rcClient;
                 rcSubject.top = rcClient.top - 2.0f;
                 rcSubject.left = rcIcon.right + POPUP_ITEM_TEXT_INDENT;
                 rcSubject.right = PWL_MIN(rcSubject.left + m_pSubject->GetContentRect().Width() + 1.0f, rcDate.left - 1.0f);
                 rcSubject.bottom = rcSubject.top - m_pSubject->GetContentRect().Height();
                 rcSubject.Normalize();
-                m_pSubject->Move(rcSubject, TRUE, FALSE);
+                m_pSubject->Move(rcSubject, true, false);
                 m_pSubject->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcSubject));
 
                 CPDF_Rect rcOptions = rcClient;
                 rcOptions.left = PWL_MAX(rcOptions.right - m_pOptions->GetContentRect().Width(), rcIcon.right + 1.0f);
                 rcOptions.top = rcSubject.bottom - 4.0f;
                 rcOptions.bottom = rcOptions.top - m_pOptions->GetContentRect().Height();
                 rcOptions.Normalize();
-                m_pOptions->Move(rcOptions, TRUE, FALSE);
+                m_pOptions->Move(rcOptions, true, false);
                 m_pOptions->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcOptions));
 
                 CPDF_Rect rcAuthor = rcClient;
                 rcAuthor.top = rcSubject.bottom - 4.0f;
                 rcAuthor.left = rcSubject.left;
                 rcAuthor.right = PWL_MIN(rcSubject.left + m_pAuthor->GetContentRect().Width() + 1.0f, rcOptions.left - 1.0f);
                 rcAuthor.bottom = rcAuthor.top - m_pAuthor->GetContentRect().Height();
                 rcAuthor.Normalize();
-                m_pAuthor->Move(rcAuthor, TRUE, FALSE);
+                m_pAuthor->Move(rcAuthor, true, false);
                 m_pAuthor->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcAuthor));
 
                 CPDF_Rect rcLBBox = rcClient;
                 rcLBBox.top = rcLBBox.bottom + 7.0f;
                 rcLBBox.right = rcLBBox.left + 7.0f;
                 rcLBBox.Normalize();
-                m_pLBBox->Move(rcLBBox, TRUE, FALSE);
+                m_pLBBox->Move(rcLBBox, true, false);
                 m_pLBBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcLBBox));
 
                 CPDF_Rect rcRBBox = rcClient;
                 rcRBBox.top = rcRBBox.bottom + 7.0f;
                 rcRBBox.left = rcRBBox.right - 7.0f;
                 rcRBBox.Normalize();
-                m_pRBBox->Move(rcRBBox, TRUE, FALSE);
+                m_pRBBox->Move(rcRBBox, true, false);
                 m_pRBBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcRBBox));
 
                 CPDF_Rect rcContents = rcClient;
                 rcContents.top = rcAuthor.bottom - POPUP_ITEM_HEAD_BOTTOM;
                 rcContents.left += 3.0f;
                 rcContents.right -= 3.0f;
                 if (m_pContentsBar->IsVisible())
                         rcContents.right -= PWL_SCROLLBAR_WIDTH;
                 rcContents.bottom += 14.0f;
                 rcContents.Normalize();
-                m_pContents->Move(rcContents, FALSE, FALSE);
+                m_pContents->Move(rcContents, false, false);
                 m_pContents->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcContents));
 
                 CPDF_Rect rcContentsBar = rcContents;
                 rcContentsBar.right = rcClient.right - 3.0f;
                 rcContentsBar.left = rcContentsBar.right - PWL_SCROLLBAR_WIDTH;
                 rcContentsBar.Normalize();
-                m_pContentsBar->Move(rcContentsBar, TRUE, FALSE);
+                m_pContentsBar->Move(rcContentsBar, true, false);
 
                 m_rcCaption = rcClient;
                 m_rcCaption.bottom = rcContents.top;
         }
 
-        m_bResizing = FALSE;
+        m_bResizing = false;
 }
 
 //0-normal / 1-caption / 2-leftbottom corner / 3-rightbottom corner / 4-close / 5-options
 int32_t CPWL_Note::NoteHitTest(const CPDF_Point& point) const
 {
         ASSERT(m_pSubject != NULL);
         ASSERT(m_pDateTime != NULL);
         ASSERT(m_pContents != NULL);
         ASSERT(m_pAuthor != NULL);
         ASSERT(m_pIcon != NULL);
@@ skipping 77 matching lines @@
         rcp.eCursorType = FXCT_NWSE;
         rcp.sTextColor = sTextColor;
         m_pRBBox->Create(rcp);
 
         m_pContentsBar = new CPWL_ScrollBar(SBT_VSCROLL);
         PWL_CREATEPARAM scp = cp;
         scp.pParentWnd = this;
         scp.sBackgroundColor = CPWL_Color(COLORTYPE_RGB, 240/255.0f, 240/255.0f, 240/255.0f);
         scp.dwFlags = PWS_CHILD | PWS_VISIBLE | PWS_BACKGROUND;
         m_pContentsBar->Create(scp);
-        m_pContentsBar->SetNotifyForever(TRUE);
+        m_pContentsBar->SetNotifyForever(true);
 }
 
 void CPWL_Note::SetSubjectName(const CFX_WideString& sName)
 {
         CPWL_NoteItem::SetSubjectName(sName);
         RePosChildWnd();
 }
 
 void CPWL_Note::SetAuthorName(const CFX_WideString& sName)
 {
@@ skipping 10 matching lines @@
 }
 
 CFX_WideString CPWL_Note::GetAuthorName() const
 {
         if (m_pAuthor)
                 return m_pAuthor->GetText();
 
         return L"";
 }
 
-FX_BOOL CPWL_Note::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
+bool CPWL_Note::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag)
 {
         CPDF_Point ptScroll = m_pContents->GetScrollPos();
         CPDF_Rect rcScroll = m_pContents->GetScrollArea();
         CPDF_Rect rcContents = m_pContents->GetClientRect();
 
         if (rcScroll.top - rcScroll.bottom > rcContents.Height())
         {
                 CPDF_Point ptNew = ptScroll;
 
                 if (zDelta > 0)
                         ptNew.y += 30;
                 else
                         ptNew.y -= 30;
 
                 if (ptNew.y > rcScroll.top)
                         ptNew.y = rcScroll.top;
                 if (ptNew.y < rcScroll.bottom + rcContents.Height())
                         ptNew.y = rcScroll.bottom + rcContents.Height();
                 if (ptNew.y < rcScroll.bottom)
                         ptNew.y = rcScroll.bottom;
 
                 if (ptNew.y != ptScroll.y)
                 {
                         m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
                         m_pContents->OnNotify(this, PNM_SCROLLWINDOW, SBT_VSCROLL, (intptr_t)&ptNew.y);
                         m_pContentsBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptNew.y);
 
-                        return TRUE;
+                        return true;
                 }
         }
 
-        return FALSE;
+        return false;
 }
 
 void CPWL_Note::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
         switch (msg)
         {
         case PNM_NOTEEDITCHANGED:
                 {
                         CPDF_Rect rcScroll = m_pContents->GetScrollArea();
 
 
                         PWL_SCROLL_INFO sInfo;
                         sInfo.fContentMin = rcScroll.bottom;
                         sInfo.fContentMax = rcScroll.top;
                         sInfo.fPlateWidth = m_pContents->GetClientRect().Height();
                         sInfo.fSmallStep = 13.0f;
                         sInfo.fBigStep = sInfo.fPlateWidth;
 
                         if (FXSYS_memcmp(&m_OldScrollInfo, &sInfo, sizeof(PWL_SCROLL_INFO)) != 0)
                         {
-                                FX_BOOL bScrollChanged = FALSE;
+                                bool bScrollChanged = false;
 
                                 if (lParam < 3) //·ÀÖ¹ËÀÑ­»· mantis:15759
                                 {
                                         bScrollChanged = ResetScrollBar();
                                         if (bScrollChanged)
                                         {
                                                 lParam++;
                                                 m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
                                                 OnNotify(this, PNM_NOTEEDITCHANGED, 0, lParam);
                                         }
@@ skipping 92 matching lines @@
         if (m_pAuthor)
                 m_pAuthor->SetTextColor(sTextColor);
         if (m_pOptions)
                 m_pOptions->SetTextColor(sTextColor);
         if (m_pLBBox)
                 m_pLBBox->SetTextColor(sTextColor);
         if (m_pRBBox)
                 m_pRBBox->SetTextColor(sTextColor);
 }
 
-FX_BOOL CPWL_Note::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag)
+bool    CPWL_Note::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag)
 {
         if (m_pOptions->WndHitTest(m_pOptions->ParentToChild(point)))
         {
                 if (IPWL_NoteNotify* pNotify = GetNoteNotify())
                 {
                         int32_t x, y;
                         PWLtoWnd(point, x, y);
                         if (IFX_SystemHandler* pSH = GetSystemHandler())
                                 pSH->ClientToScreen(GetAttachedHWnd(), x, y);
                         KillFocus();
                         pNotify->OnPopupMenu(x, y);
 
-                        return TRUE;
+                        return true;
                 }
         }
 
         return CPWL_Wnd::OnLButtonDown(point,nFlag);
 }
 
-FX_BOOL CPWL_Note::OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+bool    CPWL_Note::OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
         return CPWL_Wnd::OnRButtonUp(point,nFlag);
 }
 
 const CPWL_Note* CPWL_Note::GetNote() const
 {
         return this;
 }
 
 IPWL_NoteNotify* CPWL_Note::GetNoteNotify() const
 {
         if (m_bEnalbleNotify)
                 return m_pNoteNotify;
 
         return NULL;
 }
 
 void CPWL_Note::SetIconType(int32_t nType)
 {
         if (m_pIcon)
                 m_pIcon->SetIconType(nType);
 }
 
-void CPWL_Note::EnableModify(FX_BOOL bEnabled)
+void CPWL_Note::EnableModify(bool bEnabled)
 {
         m_pContents->EnableModify(bEnabled);
 }
 
-void CPWL_Note::EnableRead(FX_BOOL bEnabled)
+void CPWL_Note::EnableRead(bool bEnabled)
 {
         m_pContents->EnableRead(bEnabled);
 }
 
 CFX_WideString CPWL_Note::GetReplyString() const
 {
         return m_sReplyString;
 }
 
 void CPWL_Note::SetReplyString(const CFX_WideString& string)
 {
         m_sReplyString = string;
 }