From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp | 108 ++++++++++++++++----------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp') diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp index 0d14587f66..11e1fe7d37 100644 --- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp @@ -22,7 +22,7 @@ CPWL_EditCtrl::CPWL_EditCtrl() : m_pEdit(NULL), m_pEditCaret(NULL), - m_bMouseDown(FALSE), + m_bMouseDown(false), m_pEditNotify(NULL), m_nCharSet(DEFAULT_CHARSET), m_nCodePage(0) @@ -50,7 +50,7 @@ void CPWL_EditCtrl::OnCreated() m_pEdit->Initialize(); } -FX_BOOL CPWL_EditCtrl::IsWndHorV() +bool CPWL_EditCtrl::IsWndHorV() { CPDF_Matrix mt = GetWindowMatrix(); CPDF_Point point1(0,1); @@ -167,17 +167,17 @@ FX_FLOAT CPWL_EditCtrl::GetFontSize() const return m_pEdit->GetFontSize(); } -FX_BOOL CPWL_EditCtrl::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) +bool CPWL_EditCtrl::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { - if (m_bMouseDown) return TRUE; + if (m_bMouseDown) return true; - FX_BOOL bRet = CPWL_Wnd::OnKeyDown(nChar,nFlag); + bool bRet = CPWL_Wnd::OnKeyDown(nChar,nFlag); //FILTER switch (nChar) { default: - return FALSE; + return false; case FWL_VKEY_Delete: case FWL_VKEY_Up: case FWL_VKEY_Down: @@ -209,35 +209,35 @@ FX_BOOL CPWL_EditCtrl::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { case FWL_VKEY_Delete: Delete(); - return TRUE; + return true; case FWL_VKEY_Insert: if (IsSHIFTpressed(nFlag)) PasteText(); - return TRUE; + return true; case FWL_VKEY_Up: - m_pEdit->OnVK_UP(IsSHIFTpressed(nFlag),FALSE); - return TRUE; + m_pEdit->OnVK_UP(IsSHIFTpressed(nFlag),false); + return true; case FWL_VKEY_Down: - m_pEdit->OnVK_DOWN(IsSHIFTpressed(nFlag),FALSE); - return TRUE; + m_pEdit->OnVK_DOWN(IsSHIFTpressed(nFlag),false); + return true; case FWL_VKEY_Left: - m_pEdit->OnVK_LEFT(IsSHIFTpressed(nFlag),FALSE); - return TRUE; + m_pEdit->OnVK_LEFT(IsSHIFTpressed(nFlag),false); + return true; case FWL_VKEY_Right: - m_pEdit->OnVK_RIGHT(IsSHIFTpressed(nFlag),FALSE); - return TRUE; + m_pEdit->OnVK_RIGHT(IsSHIFTpressed(nFlag),false); + return true; case FWL_VKEY_Home: m_pEdit->OnVK_HOME(IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag)); - return TRUE; + return true; case FWL_VKEY_End: m_pEdit->OnVK_END(IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag)); - return TRUE; + return true; case FWL_VKEY_Unknown: if (!IsSHIFTpressed(nFlag)) Clear(); else CutText(); - return TRUE; + return true; default: break; } @@ -245,9 +245,9 @@ FX_BOOL CPWL_EditCtrl::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) return bRet; } -FX_BOOL CPWL_EditCtrl::OnChar(FX_WORD nChar, FX_DWORD nFlag) +bool CPWL_EditCtrl::OnChar(FX_WORD nChar, FX_DWORD nFlag) { - if (m_bMouseDown) return TRUE; + if (m_bMouseDown) return true; CPWL_Wnd::OnChar(nChar,nFlag); @@ -256,14 +256,14 @@ FX_BOOL CPWL_EditCtrl::OnChar(FX_WORD nChar, FX_DWORD nFlag) { case 0x0A: case 0x1B: - return FALSE; + return false; default: break; } - FX_BOOL bCtrl = IsCTRLpressed(nFlag); - FX_BOOL bAlt = IsALTpressed(nFlag); - FX_BOOL bShift = IsSHIFTpressed(nFlag); + bool bCtrl = IsCTRLpressed(nFlag); + bool bAlt = IsALTpressed(nFlag); + bool bShift = IsSHIFTpressed(nFlag); FX_WORD word = nChar; @@ -273,29 +273,29 @@ FX_BOOL CPWL_EditCtrl::OnChar(FX_WORD nChar, FX_DWORD nFlag) { case 'C' - 'A' + 1: CopyText(); - return TRUE; + return true; case 'V' - 'A' + 1: PasteText(); - return TRUE; + return true; case 'X' - 'A' + 1: CutText(); - return TRUE; + return true; case 'A' - 'A' + 1: SelectAll(); - return TRUE; + return true; case 'Z' - 'A' + 1: if (bShift) Redo(); else Undo(); - return TRUE; + return true; default: if (nChar < 32) - return FALSE; + return false; } } - if (IsReadOnly()) return TRUE; + if (IsReadOnly()) return true; if (m_pEdit->IsSelected() && word == FWL_VKEY_Back) word = FWL_VKEY_Unknown; @@ -319,10 +319,10 @@ FX_BOOL CPWL_EditCtrl::OnChar(FX_WORD nChar, FX_DWORD nFlag) break; } - return TRUE; + return true; } -FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag) +bool CPWL_EditCtrl::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point,nFlag); @@ -331,16 +331,16 @@ FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag) if (m_bMouseDown) InvalidateRect(); - m_bMouseDown = TRUE; + m_bMouseDown = true; SetCapture(); m_pEdit->OnMouseDown(point,IsSHIFTpressed(nFlag),IsCTRLpressed(nFlag)); } - return TRUE; + return true; } -FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag) +bool CPWL_EditCtrl::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point,nFlag); @@ -351,20 +351,20 @@ FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag) SetFocus(); ReleaseCapture(); - m_bMouseDown = FALSE; + m_bMouseDown = false; } - return TRUE; + return true; } -FX_BOOL CPWL_EditCtrl::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag) +bool CPWL_EditCtrl::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag) { CPWL_Wnd::OnMouseMove(point,nFlag); if (m_bMouseDown) - m_pEdit->OnMouseMove(point,FALSE,FALSE); + m_pEdit->OnMouseMove(point,false,false); - return TRUE; + return true; } CPDF_Rect CPWL_EditCtrl::GetContentRect() const @@ -372,7 +372,7 @@ CPDF_Rect CPWL_EditCtrl::GetContentRect() const return m_pEdit->GetContentRect(); } -void CPWL_EditCtrl::SetEditCaret(FX_BOOL bVisible) +void CPWL_EditCtrl::SetEditCaret(bool bVisible) { CPDF_Point ptHead(0,0),ptFoot(0,0); @@ -418,18 +418,18 @@ void CPWL_EditCtrl::GetCaretPos(int32_t& x, int32_t& y) const PWLtoWnd(ptHead, x, y); } -void CPWL_EditCtrl::SetCaret(FX_BOOL bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot) +void CPWL_EditCtrl::SetCaret(bool bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot) { if (m_pEditCaret) { if (!IsFocused() || m_pEdit->IsSelected()) - bVisible = FALSE; + bVisible = false; m_pEditCaret->SetCaret(bVisible, ptHead, ptFoot); } } -FX_BOOL CPWL_EditCtrl::IsModified() const +bool CPWL_EditCtrl::IsModified() const { return m_pEdit->IsModified(); } @@ -466,7 +466,7 @@ void CPWL_EditCtrl::Paint() m_pEdit->Paint(); } -void CPWL_EditCtrl::EnableRefresh(FX_BOOL bRefresh) +void CPWL_EditCtrl::EnableRefresh(bool bRefresh) { if (m_pEdit) m_pEdit->EnableRefresh(bRefresh); @@ -578,7 +578,7 @@ void CPWL_EditCtrl::CutText() { } -void CPWL_EditCtrl::ShowVScrollBar(FX_BOOL bShow) +void CPWL_EditCtrl::ShowVScrollBar(bool bShow) { } @@ -612,12 +612,12 @@ void CPWL_EditCtrl::Backspace() m_pEdit->Backspace(); } -FX_BOOL CPWL_EditCtrl::CanUndo() const +bool CPWL_EditCtrl::CanUndo() const { return !IsReadOnly() && m_pEdit->CanUndo(); } -FX_BOOL CPWL_EditCtrl::CanRedo() const +bool CPWL_EditCtrl::CanRedo() const { return !IsReadOnly() && m_pEdit->CanRedo(); } @@ -651,11 +651,11 @@ void CPWL_EditCtrl::IOnSetScrollInfoY(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax, if (IsFloatBigger(Info.fPlateWidth,Info.fContentMax-Info.fContentMin) || IsFloatEqual(Info.fPlateWidth,Info.fContentMax-Info.fContentMin)) { - ShowVScrollBar(FALSE); + ShowVScrollBar(false); } else { - ShowVScrollBar(TRUE); + ShowVScrollBar(true); } } @@ -664,7 +664,7 @@ void CPWL_EditCtrl::IOnSetScrollPosY(FX_FLOAT fy) OnNotify(this, PNM_SETSCROLLPOS,SBT_VSCROLL, (intptr_t)&fy); } -void CPWL_EditCtrl::IOnSetCaret(FX_BOOL bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot, const CPVT_WordPlace& place) +void CPWL_EditCtrl::IOnSetCaret(bool bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot, const CPVT_WordPlace& place) { PWL_CARET_INFO cInfo; cInfo.bVisible = bVisible; @@ -717,6 +717,6 @@ void CPWL_EditCtrl::SetReadyToInput() if (m_bMouseDown) { ReleaseCapture(); - m_bMouseDown = FALSE; + m_bMouseDown = false; } } -- cgit v1.2.3