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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: fpdfsdk/pdfwindow/PWL_Wnd.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_Wnd.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/pdfwindow/PWL_Wnd.cpp
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
index 729b27ca5d5dc59c0d3b809aad8e59800042e955..78a4363aa557784d2e12f1321f9e1708345e2a19 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
@@ -117,38 +117,38 @@ class CPWL_MsgControl {
m_pMainKeyboardWnd = nullptr;
}
- FX_BOOL IsWndCreated(const CPWL_Wnd* pWnd) const {
+ bool IsWndCreated(const CPWL_Wnd* pWnd) const {
return m_pCreatedWnd == pWnd;
}
- FX_BOOL IsMainCaptureMouse(const CPWL_Wnd* pWnd) const {
+ bool IsMainCaptureMouse(const CPWL_Wnd* pWnd) const {
return pWnd == m_pMainMouseWnd;
}
- FX_BOOL IsWndCaptureMouse(const CPWL_Wnd* pWnd) const {
+ bool IsWndCaptureMouse(const CPWL_Wnd* pWnd) const {
if (pWnd) {
for (int32_t i = 0, sz = m_aMousePath.GetSize(); i < sz; i++) {
if (m_aMousePath.GetAt(i) == pWnd)
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
- FX_BOOL IsMainCaptureKeyboard(const CPWL_Wnd* pWnd) const {
+ bool IsMainCaptureKeyboard(const CPWL_Wnd* pWnd) const {
return pWnd == m_pMainKeyboardWnd;
}
- FX_BOOL IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const {
+ bool IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const {
if (pWnd) {
for (int32_t i = 0, sz = m_aKeyboardPath.GetSize(); i < sz; i++) {
if (m_aKeyboardPath.GetAt(i) == pWnd)
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
void SetFocus(CPWL_Wnd* pWnd) {
@@ -207,13 +207,13 @@ CPWL_Wnd::CPWL_Wnd()
: m_pVScrollBar(nullptr),
m_rcWindow(),
m_rcClip(),
- m_bCreated(FALSE),
- m_bVisible(FALSE),
- m_bNotifying(FALSE),
- m_bEnabled(TRUE) {}
+ m_bCreated(false),
+ m_bVisible(false),
+ m_bNotifying(false),
+ m_bEnabled(true) {}
CPWL_Wnd::~CPWL_Wnd() {
- ASSERT(m_bCreated == FALSE);
+ ASSERT(m_bCreated == false);
}
CFX_ByteString CPWL_Wnd::GetClassName() const {
@@ -248,7 +248,7 @@ void CPWL_Wnd::Create(const PWL_CREATEPARAM& cp) {
OnCreated();
RePosChildWnd();
- m_bCreated = TRUE;
+ m_bCreated = true;
}
}
@@ -284,7 +284,7 @@ void CPWL_Wnd::Destroy() {
if (m_sPrivateParam.pParentWnd)
m_sPrivateParam.pParentWnd->OnNotify(this, PNM_REMOVECHILD);
- m_bCreated = FALSE;
+ m_bCreated = false;
}
DestroyMsgControl();
@@ -294,9 +294,7 @@ void CPWL_Wnd::Destroy() {
m_pVScrollBar = nullptr;
}
-void CPWL_Wnd::Move(const CFX_FloatRect& rcNew,
- FX_BOOL bReset,
- FX_BOOL bRefresh) {
+void CPWL_Wnd::Move(const CFX_FloatRect& rcNew, bool bReset, bool bRefresh) {
if (IsValid()) {
CFX_FloatRect rcOld = GetWindowRect();
@@ -429,7 +427,7 @@ void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
}
#define PWL_IMPLEMENT_KEY_METHOD(key_method_name) \
- FX_BOOL CPWL_Wnd::key_method_name(uint16_t nChar, uint32_t nFlag) { \
+ bool CPWL_Wnd::key_method_name(uint16_t nChar, uint32_t nFlag) { \
if (IsValid() && IsVisible() && IsEnabled()) { \
if (IsWndCaptureKeyboard(this)) { \
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { \
@@ -441,12 +439,12 @@ void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
} \
} \
} \
- return FALSE; \
+ return false; \
}
#define PWL_IMPLEMENT_MOUSE_METHOD(mouse_method_name) \
- FX_BOOL CPWL_Wnd::mouse_method_name(const CFX_FloatPoint& point, \
- uint32_t nFlag) { \
+ bool CPWL_Wnd::mouse_method_name(const CFX_FloatPoint& point, \
+ uint32_t nFlag) { \
if (IsValid() && IsVisible() && IsEnabled()) { \
if (IsWndCaptureMouse(this)) { \
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { \
@@ -471,7 +469,7 @@ void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
SetCursor(); \
} \
} \
- return FALSE; \
+ return false; \
}
PWL_IMPLEMENT_KEY_METHOD(OnKeyDown)
@@ -488,9 +486,9 @@ PWL_IMPLEMENT_MOUSE_METHOD(OnRButtonDown)
PWL_IMPLEMENT_MOUSE_METHOD(OnRButtonUp)
PWL_IMPLEMENT_MOUSE_METHOD(OnMouseMove)
-FX_BOOL CPWL_Wnd::OnMouseWheel(short zDelta,
- const CFX_FloatPoint& point,
- uint32_t nFlag) {
+bool CPWL_Wnd::OnMouseWheel(short zDelta,
+ const CFX_FloatPoint& point,
+ uint32_t nFlag) {
if (IsValid() && IsVisible() && IsEnabled()) {
SetCursor();
if (IsWndCaptureKeyboard(this)) {
@@ -504,7 +502,7 @@ FX_BOOL CPWL_Wnd::OnMouseWheel(short zDelta,
}
}
}
- return FALSE;
+ return false;
}
void CPWL_Wnd::AddChild(CPWL_Wnd* pWnd) {
@@ -538,7 +536,7 @@ void CPWL_Wnd::OnNotify(CPWL_Wnd* pWnd,
}
}
-FX_BOOL CPWL_Wnd::IsValid() const {
+bool CPWL_Wnd::IsValid() const {
return m_bCreated;
}
@@ -571,7 +569,7 @@ CFX_FloatPoint CPWL_Wnd::GetCenterPoint() const {
(rcClient.top + rcClient.bottom) * 0.5f);
}
-FX_BOOL CPWL_Wnd::HasFlag(uint32_t dwFlags) const {
+bool CPWL_Wnd::HasFlag(uint32_t dwFlags) const {
return (m_sPrivateParam.dwFlags & dwFlags) != 0;
}
@@ -704,11 +702,11 @@ void CPWL_Wnd::OnSetFocus() {}
void CPWL_Wnd::OnKillFocus() {}
-FX_BOOL CPWL_Wnd::WndHitTest(const CFX_FloatPoint& point) const {
+bool CPWL_Wnd::WndHitTest(const CFX_FloatPoint& point) const {
return IsValid() && IsVisible() && GetWindowRect().Contains(point.x, point.y);
}
-FX_BOOL CPWL_Wnd::ClientHitTest(const CFX_FloatPoint& point) const {
+bool CPWL_Wnd::ClientHitTest(const CFX_FloatPoint& point) const {
return IsValid() && IsVisible() && GetClientRect().Contains(point.x, point.y);
}
@@ -719,7 +717,7 @@ const CPWL_Wnd* CPWL_Wnd::GetRootWnd() const {
return this;
}
-void CPWL_Wnd::SetVisible(FX_BOOL bVisible) {
+void CPWL_Wnd::SetVisible(bool bVisible) {
if (IsValid()) {
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
@@ -744,7 +742,7 @@ const CFX_FloatRect& CPWL_Wnd::GetClipRect() const {
return m_rcClip;
}
-FX_BOOL CPWL_Wnd::IsReadOnly() const {
+bool CPWL_Wnd::IsReadOnly() const {
return HasFlag(PWS_READONLY);
}
@@ -759,7 +757,7 @@ void CPWL_Wnd::RePosChildWnd() {
rcContent.right - 1.0f, rcContent.top);
if (pVSB)
- pVSB->Move(rcVScroll, TRUE, FALSE);
+ pVSB->Move(rcVScroll, true, false);
}
void CPWL_Wnd::CreateChildWnd(const PWL_CREATEPARAM& cp) {}
@@ -788,29 +786,29 @@ CPWL_MsgControl* CPWL_Wnd::GetMsgControl() const {
return m_sPrivateParam.pMsgControl;
}
-FX_BOOL CPWL_Wnd::IsCaptureMouse() const {
+bool CPWL_Wnd::IsCaptureMouse() const {
return IsWndCaptureMouse(this);
}
-FX_BOOL CPWL_Wnd::IsWndCaptureMouse(const CPWL_Wnd* pWnd) const {
+bool CPWL_Wnd::IsWndCaptureMouse(const CPWL_Wnd* pWnd) const {
if (CPWL_MsgControl* pCtrl = GetMsgControl())
return pCtrl->IsWndCaptureMouse(pWnd);
- return FALSE;
+ return false;
}
-FX_BOOL CPWL_Wnd::IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const {
+bool CPWL_Wnd::IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const {
if (CPWL_MsgControl* pCtrl = GetMsgControl())
return pCtrl->IsWndCaptureKeyboard(pWnd);
- return FALSE;
+ return false;
}
-FX_BOOL CPWL_Wnd::IsFocused() const {
+bool CPWL_Wnd::IsFocused() const {
if (CPWL_MsgControl* pCtrl = GetMsgControl())
return pCtrl->IsMainCaptureKeyboard(this);
- return FALSE;
+ return false;
}
CFX_FloatRect CPWL_Wnd::GetFocusRect() const {
@@ -991,7 +989,7 @@ const CPWL_Wnd* CPWL_Wnd::GetFocused() const {
return nullptr;
}
-void CPWL_Wnd::EnableWindow(FX_BOOL bEnable) {
+void CPWL_Wnd::EnableWindow(bool bEnable) {
if (m_bEnabled != bEnable) {
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
@@ -1008,7 +1006,7 @@ void CPWL_Wnd::EnableWindow(FX_BOOL bEnable) {
}
}
-FX_BOOL CPWL_Wnd::IsEnabled() {
+bool CPWL_Wnd::IsEnabled() {
return m_bEnabled;
}
@@ -1016,26 +1014,26 @@ void CPWL_Wnd::OnEnabled() {}
void CPWL_Wnd::OnDisabled() {}
-FX_BOOL CPWL_Wnd::IsCTRLpressed(uint32_t nFlag) const {
+bool CPWL_Wnd::IsCTRLpressed(uint32_t nFlag) const {
if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsCTRLKeyDown(nFlag);
}
- return FALSE;
+ return false;
}
-FX_BOOL CPWL_Wnd::IsSHIFTpressed(uint32_t nFlag) const {
+bool CPWL_Wnd::IsSHIFTpressed(uint32_t nFlag) const {
if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsSHIFTKeyDown(nFlag);
}
- return FALSE;
+ return false;
}
-FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
+bool CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsALTKeyDown(nFlag);
}
- return FALSE;
+ return false;
}
« no previous file with comments | « fpdfsdk/pdfwindow/PWL_Wnd.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698