Revert "FX_BOOL considered harmful, part 2."

fpdfsdk/src/pdfwindow/PWL_ComboBox.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_EditCtrl.h"
 #include "../../include/pdfwindow/PWL_Edit.h"
 #include "../../include/pdfwindow/PWL_ListBox.h"
 #include "../../include/pdfwindow/PWL_ComboBox.h"
 #include "../../include/pdfwindow/PWL_Utils.h"
 
 #define PWLCB_DEFAULTFONTSIZE  12.0f
 
 #define IsFloatZero(f)                      ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa,fb)                ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa,fb)               ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatEqual(fa,fb)                 IsFloatZero((fa)-(fb))
 
 
 /* ---------------------------- CPWL_CBListBox ---------------------------- */
 
-bool CPWL_CBListBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_CBListBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
     CPWL_Wnd::OnLButtonUp(point,nFlag);
 
     if (m_bMouseDown)
     {
         ReleaseCapture();
-        m_bMouseDown = false;
+        m_bMouseDown = FALSE;
 
         if (ClientHitTest(point))
         {
             if (CPWL_Wnd * pParent = GetParentWindow())
             {
                 pParent->OnNotify(this,PNM_LBUTTONUP,0,PWL_MAKEDWORD(point.x,point.y));
             }
 
-            bool bExit = false;
-            OnNotifySelChanged(false,bExit, nFlag);
-            if (bExit) return false;
+            FX_BOOL bExit = FALSE;
+            OnNotifySelChanged(FALSE,bExit, nFlag);
+            if (bExit) return FALSE;
         }
     }
 
-    return true;
+    return TRUE;
 }
 
-bool CPWL_CBListBox::OnKeyDownWithExit(FX_WORD nChar, bool & bExit, FX_DWORD nFlag)
+FX_BOOL CPWL_CBListBox::OnKeyDownWithExit(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD 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;
     }
 
-    OnNotifySelChanged(true,bExit, nFlag);
+    OnNotifySelChanged(TRUE,bExit, nFlag);
 
-    return true;
+    return TRUE;
 }
 
-bool CPWL_CBListBox::OnCharWithExit(FX_WORD nChar, bool & bExit, FX_DWORD nFlag)
+FX_BOOL CPWL_CBListBox::OnCharWithExit(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD 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;
 
     if (CPWL_ComboBox* pComboBox = (CPWL_ComboBox*)GetParentWindow())
     {
         pComboBox->SetSelectText();
     }
 
-    OnNotifySelChanged(true,bExit,nFlag);
+    OnNotifySelChanged(TRUE,bExit,nFlag);
 
-    return true;
+    return TRUE;
 }
 
 /* ---------------------------- CPWL_CBButton ---------------------------- */
 
 void CPWL_CBButton::GetThisAppearanceStream(CFX_ByteTextBuf & sAppStream)
 {
     CPWL_Wnd::GetThisAppearanceStream(sAppStream);
 
     CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect();
 
@@ skipping 50 matching lines @@
             path.SetPoint(2, pt3.x, pt3.y, FXPT_LINETO);
             path.SetPoint(3, pt1.x, pt1.y, FXPT_LINETO);
 
             pDevice->DrawPath(&path, pUser2Device, NULL,
                 CPWL_Utils::PWLColorToFXColor(PWL_DEFAULT_BLACKCOLOR,GetTransparency()),
                 0, FXFILL_ALTERNATE);
         }
     }
 }
 
-bool CPWL_CBButton::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_CBButton::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag)
 {
     CPWL_Wnd::OnLButtonDown(point,nFlag);
 
     SetCapture();
 
     if (CPWL_Wnd * pParent = GetParentWindow())
     {
         pParent->OnNotify(this,PNM_LBUTTONDOWN,0,PWL_MAKEDWORD(point.x,point.y));
     }
 
-    return true;
+    return TRUE;
 }
 
-bool CPWL_CBButton::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
+FX_BOOL CPWL_CBButton::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
 {
     CPWL_Wnd::OnLButtonUp(point, nFlag);
 
     ReleaseCapture();
 
-    return true;
+    return TRUE;
 }
 
 /* ---------------------------- CPWL_ComboBox ---------------------------- */
 
 CPWL_ComboBox::CPWL_ComboBox() : m_pEdit(NULL),
     m_pButton(NULL),
     m_pList(NULL),
-    m_bPopup(false),
+    m_bPopup(FALSE),
     m_nPopupWhere(0),
     m_nSelectItem(-1),
     m_pFillerNotify(NULL)
 {
 }
 
 CFX_ByteString CPWL_ComboBox::GetClassName() const
 {
     return "CPWL_ComboBox";
 }
 
 void CPWL_ComboBox::OnCreate(PWL_CREATEPARAM & cp)
 {
     cp.dwFlags &= ~PWS_HSCROLL;
     cp.dwFlags &= ~PWS_VSCROLL;
 }
 
 void CPWL_ComboBox::SetFocus()
 {
     if (m_pEdit)
         m_pEdit->SetFocus();
 }
 
 void CPWL_ComboBox::KillFocus()
 {
-    SetPopup(false);
+    SetPopup(FALSE);
     CPWL_Wnd::KillFocus();
 }
 
 CFX_WideString CPWL_ComboBox::GetText() const
 {
     if (m_pEdit)
     {
         return m_pEdit->GetText();
     }
     return CFX_WideString();
@@ skipping 187 matching lines @@
                 rcEdit.right = rcEdit.left;
 
             rcEdit.top = rcEdit.bottom + fOldClientHeight;
 
             rcList.bottom += fOldWindowHeight;
 
             break;
         }
 
         if (m_pButton)
-            m_pButton->Move(rcButton,true,false);
+            m_pButton->Move(rcButton,TRUE,FALSE);
 
         if (m_pEdit)
-            m_pEdit->Move(rcEdit,true,false);
+            m_pEdit->Move(rcEdit,TRUE,FALSE);
 
         if (m_pList)
         {
-            m_pList->SetVisible(true);
-            m_pList->Move(rcList,true,false);
+            m_pList->SetVisible(TRUE);
+            m_pList->Move(rcList,TRUE,FALSE);
             m_pList->ScrollToListItem(m_nSelectItem);
         }
     }
     else
     {
         CPDF_Rect rcButton = rcClient;
 
         rcButton.left = rcButton.right - PWL_COMBOBOX_BUTTON_WIDTH;
 
         if (rcButton.left < rcClient.left)
             rcButton.left = rcClient.left;
 
         if (m_pButton)
-            m_pButton->Move(rcButton,true,false);
+            m_pButton->Move(rcButton,TRUE,FALSE);
 
         CPDF_Rect rcEdit = rcClient;
         rcEdit.right = rcButton.left - 1.0f;
 
         if (rcEdit.left < rcClient.left)
             rcEdit.left = rcClient.left;
 
         if (rcEdit.right < rcEdit.left)
             rcEdit.right = rcEdit.left;
 
         if (m_pEdit)
-            m_pEdit->Move(rcEdit,true,false);
+            m_pEdit->Move(rcEdit,TRUE,FALSE);
 
         if (m_pList)
-            m_pList->SetVisible(false);
+            m_pList->SetVisible(FALSE);
     }
 }
 
 void CPWL_ComboBox::SelectAll()
 {
     if (m_pEdit && HasFlag(PCBS_ALLOWCUSTOMTEXT))
         m_pEdit->SelectAll();
 }
 
 CPDF_Rect CPWL_ComboBox::GetFocusRect() const
 {
     return CPDF_Rect();
 }
 
-void CPWL_ComboBox::SetPopup(bool bPopup)
+void CPWL_ComboBox::SetPopup(FX_BOOL bPopup)
 {
     if (!m_pList) return;
     if (bPopup == m_bPopup) return;
     FX_FLOAT fListHeight = m_pList->GetContentRect().Height();
     if (!IsFloatBigger(fListHeight,0.0f)) return;
 
     if (bPopup)
     {
         if (m_pFillerNotify)
         {
@@ skipping 16 matching lines @@
                 default:
                 case 0:
                     rcWindow.bottom -= fPopupRet;
                     break;
                 case 1:
                     rcWindow.top += fPopupRet;
                     break;
                 }
 
                 m_nPopupWhere = nWhere;
-                Move(rcWindow, true, true);
+                Move(rcWindow, TRUE, TRUE);
             }
         }
     }
     else
     {
         m_bPopup = bPopup;
-        Move(m_rcOldWindow, true, true);
+        Move(m_rcOldWindow, TRUE, TRUE);
     }
 }
 
-bool CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
+FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
 {
-    if (!m_pList) return false;
-    if (!m_pEdit) return false;
+    if (!m_pList) return FALSE;
+    if (!m_pEdit) return FALSE;
 
     m_nSelectItem = -1;
 
     switch (nChar)
     {
     case FWL_VKEY_Up:
         if (m_pList->GetCurSel() > 0)
         {
-            bool bExit = false;
+            FX_BOOL bExit = FALSE;
             if (m_pList->OnKeyDownWithExit(nChar,bExit,nFlag))
             {
-                if (bExit) return false;
+                if (bExit) return FALSE;
                 SetSelectText();
             }
         }
-        return true;
+        return TRUE;
     case FWL_VKEY_Down:
         if (m_pList->GetCurSel() < m_pList->GetCount() - 1)
         {
-            bool bExit = false;
+            FX_BOOL bExit = FALSE;
             if (m_pList->OnKeyDownWithExit(nChar,bExit,nFlag))
             {
-                if (bExit) return false;
+                if (bExit) return FALSE;
                 SetSelectText();
             }
         }
-        return true;
+        return TRUE;
     }
 
     if (HasFlag(PCBS_ALLOWCUSTOMTEXT))
         return m_pEdit->OnKeyDown(nChar,nFlag);
 
-    return false;
+    return FALSE;
 }
 
-bool CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag)
+FX_BOOL CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag)
 {
     if (!m_pList)
-        return false;
+        return FALSE;
 
     if (!m_pEdit)
-        return false;
+        return FALSE;
 
     m_nSelectItem = -1;
     if (HasFlag(PCBS_ALLOWCUSTOMTEXT))
         return m_pEdit->OnChar(nChar,nFlag);
 
-    bool bExit = false;
-    return m_pList->OnCharWithExit(nChar,bExit,nFlag) ? bExit : false;
+    FX_BOOL bExit = FALSE;
+    return m_pList->OnCharWithExit(nChar,bExit,nFlag) ? bExit : FALSE;
 }
 
 void CPWL_ComboBox::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam)
 {
     switch (msg)
     {
     case PNM_LBUTTONDOWN:
         if (pWnd == m_pButton)
         {
             SetPopup(!m_bPopup);
             return;
         }
         break;
     case PNM_LBUTTONUP:
         if (m_pEdit && m_pList)
         {
             if (pWnd == m_pList)
             {
                 SetSelectText();
                 SelectAll();
                 m_pEdit->SetFocus();
-                SetPopup(false);
+                SetPopup(FALSE);
                 return;
             }
         }
     }
 
     CPWL_Wnd::OnNotify(pWnd,msg,wParam,lParam);
 }
 
-bool CPWL_ComboBox::IsPopup() const
+FX_BOOL CPWL_ComboBox::IsPopup() const
 {
     return m_bPopup;
 }
 
 void CPWL_ComboBox::SetSelectText()
 {
     CFX_WideString swText = m_pList->GetText();
     m_pEdit->SelectAll();
     m_pEdit->ReplaceSel(m_pList->GetText().c_str());
     m_pEdit->SelectAll();
 
     m_nSelectItem = m_pList->GetCurSel();
 }
 
-bool CPWL_ComboBox::IsModified() const
+FX_BOOL CPWL_ComboBox::IsModified() const
 {
     return m_pEdit->IsModified();
 }
 
 void CPWL_ComboBox::SetFillerNotify(IPWL_Filler_Notify* pNotify)
 {
      m_pFillerNotify = pNotify;
 
      if (m_pEdit)
          m_pEdit->SetFillerNotify(pNotify);
 
      if (m_pList)
          m_pList->SetFillerNotify(pNotify);
 }