Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: fpdfsdk/pdfwindow/PWL_ListBox.cpp

Issue 2453683011: Remove FX_BOOL from fpdfsdk. (Closed)
Patch Set: Regenerate patch after rebase. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « fpdfsdk/pdfwindow/PWL_ListBox.h ('k') | fpdfsdk/pdfwindow/PWL_ScrollBar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/pdfwindow/PWL_ListBox.cpp
diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
index 8739c3b51596e9f22cf788ec273090c00e65e9c2..12cad7b9daa311a5a8432bdfb3e7f3d0047599f7 100644
--- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
@@ -42,12 +42,12 @@ void CPWL_List_Notify::IOnSetScrollInfoY(FX_FLOAT fPlateMin,
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();
}
}
@@ -64,8 +64,8 @@ void CPWL_List_Notify::IOnInvalidateRect(CFX_FloatRect* pRect) {
CPWL_ListBox::CPWL_ListBox()
: m_pList(new CFX_ListCtrl),
- m_bMouseDown(FALSE),
- m_bHoverSel(FALSE),
+ m_bMouseDown(false),
+ m_bHoverSel(false),
m_pFillerNotify(nullptr) {}
CPWL_ListBox::~CPWL_ListBox() {
@@ -193,12 +193,12 @@ void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
}
-FX_BOOL CPWL_ListBox::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
+bool CPWL_ListBox::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
CPWL_Wnd::OnKeyDown(nChar, nFlag);
switch (nChar) {
default:
- return FALSE;
+ return false;
case FWL_VKEY_Up:
case FWL_VKEY_Down:
case FWL_VKEY_Home:
@@ -231,58 +231,57 @@ FX_BOOL CPWL_ListBox::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
break;
}
- FX_BOOL bExit = FALSE;
- OnNotifySelChanged(TRUE, bExit, nFlag);
+ bool bExit = false;
+ OnNotifySelChanged(true, bExit, nFlag);
- return TRUE;
+ return true;
}
-FX_BOOL CPWL_ListBox::OnChar(uint16_t nChar, uint32_t nFlag) {
+bool CPWL_ListBox::OnChar(uint16_t nChar, uint32_t nFlag) {
CPWL_Wnd::OnChar(nChar, nFlag);
if (!m_pList->OnChar(nChar, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag)))
- return FALSE;
+ return false;
- FX_BOOL bExit = FALSE;
- OnNotifySelChanged(TRUE, bExit, nFlag);
+ bool bExit = false;
+ OnNotifySelChanged(true, bExit, nFlag);
- return TRUE;
+ return true;
}
-FX_BOOL CPWL_ListBox::OnLButtonDown(const CFX_FloatPoint& point,
- uint32_t nFlag) {
+bool CPWL_ListBox::OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
if (ClientHitTest(point)) {
- m_bMouseDown = TRUE;
+ m_bMouseDown = true;
SetFocus();
SetCapture();
m_pList->OnMouseDown(point, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
}
- return TRUE;
+ return true;
}
-FX_BOOL CPWL_ListBox::OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
+bool CPWL_ListBox::OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
if (m_bMouseDown) {
ReleaseCapture();
- m_bMouseDown = FALSE;
+ m_bMouseDown = false;
}
- FX_BOOL bExit = FALSE;
- OnNotifySelChanged(FALSE, bExit, nFlag);
+ bool bExit = false;
+ OnNotifySelChanged(false, bExit, nFlag);
- return TRUE;
+ return true;
}
-void CPWL_ListBox::SetHoverSel(FX_BOOL bHoverSel) {
+void CPWL_ListBox::SetHoverSel(bool bHoverSel) {
m_bHoverSel = bHoverSel;
}
-FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) {
+bool CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnMouseMove(point, nFlag);
if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point))
@@ -290,7 +289,7 @@ FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) {
if (m_bMouseDown)
m_pList->OnMouseMove(point, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
- return TRUE;
+ return true;
}
void CPWL_ListBox::OnNotify(CPWL_Wnd* pWnd,
@@ -341,13 +340,13 @@ void CPWL_ListBox::RePosChildWnd() {
m_pList->SetPlateRect(GetListRect());
}
-void CPWL_ListBox::OnNotifySelChanged(FX_BOOL bKeyDown,
- FX_BOOL& bExit,
+void CPWL_ListBox::OnNotifySelChanged(bool bKeyDown,
+ bool& bExit,
uint32_t nFlag) {
if (!m_pFillerNotify)
return;
- FX_BOOL bRC = TRUE;
+ bool bRC = true;
CFX_WideString swChange = GetText();
CFX_WideString strChangeEx;
int nSelStart = 0;
@@ -407,7 +406,7 @@ void CPWL_ListBox::Reset() {
m_pList->Cancel();
}
-FX_BOOL CPWL_ListBox::IsMultipleSel() const {
+bool CPWL_ListBox::IsMultipleSel() const {
return m_pList->IsMultipleSel();
}
@@ -419,7 +418,7 @@ int32_t CPWL_ListBox::GetCurSel() const {
return m_pList->GetSelect();
}
-FX_BOOL CPWL_ListBox::IsItemSelected(int32_t nItemIndex) const {
+bool CPWL_ListBox::IsItemSelected(int32_t nItemIndex) const {
return m_pList->IsItemSelected(nItemIndex);
}
@@ -449,15 +448,15 @@ CFX_FloatRect CPWL_ListBox::GetListRect() const {
GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth()));
}
-FX_BOOL CPWL_ListBox::OnMouseWheel(short zDelta,
- const CFX_FloatPoint& point,
- uint32_t nFlag) {
+bool CPWL_ListBox::OnMouseWheel(short zDelta,
+ const CFX_FloatPoint& point,
+ uint32_t nFlag) {
if (zDelta < 0)
m_pList->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
else
m_pList->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
- FX_BOOL bExit = FALSE;
- OnNotifySelChanged(FALSE, bExit, nFlag);
- return TRUE;
+ bool bExit = false;
+ OnNotifySelChanged(false, bExit, nFlag);
+ return true;
}
« no previous file with comments | « fpdfsdk/pdfwindow/PWL_ListBox.h ('k') | fpdfsdk/pdfwindow/PWL_ScrollBar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698