Index: fpdfsdk/formfiller/cffl_checkbox.cpp |
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp |
index 8b5a97c01d98b945de3066a36d0a366e89d3be0b..ffa3a032cf5d0cfd40552ad1027ea46b6b94147c 100644 |
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp |
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp |
@@ -26,76 +26,76 @@ CPWL_Wnd* CFFL_CheckBox::NewPDFWindow(const PWL_CREATEPARAM& cp, |
return pWnd; |
} |
-FX_BOOL CFFL_CheckBox::OnKeyDown(CPDFSDK_Annot* pAnnot, |
- uint32_t nKeyCode, |
- uint32_t nFlags) { |
+bool CFFL_CheckBox::OnKeyDown(CPDFSDK_Annot* pAnnot, |
+ uint32_t nKeyCode, |
+ uint32_t nFlags) { |
switch (nKeyCode) { |
case FWL_VKEY_Return: |
case FWL_VKEY_Space: |
- return TRUE; |
+ return true; |
default: |
return CFFL_FormFiller::OnKeyDown(pAnnot, nKeyCode, nFlags); |
} |
} |
-FX_BOOL CFFL_CheckBox::OnChar(CPDFSDK_Annot* pAnnot, |
- uint32_t nChar, |
- uint32_t nFlags) { |
+bool CFFL_CheckBox::OnChar(CPDFSDK_Annot* pAnnot, |
+ uint32_t nChar, |
+ uint32_t nFlags) { |
switch (nChar) { |
case FWL_VKEY_Return: |
case FWL_VKEY_Space: { |
CPDFSDK_PageView* pPageView = pAnnot->GetPageView(); |
ASSERT(pPageView); |
- FX_BOOL bReset = FALSE; |
- FX_BOOL bExit = FALSE; |
+ bool bReset = false; |
+ bool bExit = false; |
CPDFSDK_Annot::ObservedPtr pObserved(m_pWidget); |
m_pFormFillEnv->GetInteractiveFormFiller()->OnButtonUp( |
&pObserved, pPageView, bReset, bExit, nFlags); |
if (!pObserved) { |
m_pWidget = nullptr; |
- return TRUE; |
+ return true; |
} |
if (bReset || bExit) |
- return TRUE; |
+ return true; |
CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags); |
- if (CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, TRUE)) |
+ if (CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, true)) |
pWnd->SetCheck(!pWnd->IsChecked()); |
CommitData(pPageView, nFlags); |
- return TRUE; |
+ return true; |
} |
default: |
return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags); |
} |
} |
-FX_BOOL CFFL_CheckBox::OnLButtonUp(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+bool CFFL_CheckBox::OnLButtonUp(CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot* pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
CFFL_Button::OnLButtonUp(pPageView, pAnnot, nFlags, point); |
if (IsValid()) { |
- if (CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, TRUE)) { |
+ if (CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, true)) { |
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; |
pWnd->SetCheck(!pWidget->IsChecked()); |
} |
if (!CommitData(pPageView, nFlags)) |
- return FALSE; |
+ return false; |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CFFL_CheckBox::IsDataChanged(CPDFSDK_PageView* pPageView) { |
- CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, FALSE); |
+bool CFFL_CheckBox::IsDataChanged(CPDFSDK_PageView* pPageView) { |
+ CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, false); |
return pWnd && pWnd->IsChecked() != m_pWidget->IsChecked(); |
} |
void CFFL_CheckBox::SaveData(CPDFSDK_PageView* pPageView) { |
- if (CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, FALSE)) { |
+ if (CPWL_CheckBox* pWnd = (CPWL_CheckBox*)GetPDFWindow(pPageView, false)) { |
bool bNewChecked = pWnd->IsChecked(); |
if (bNewChecked) { |