| Index: fpdfsdk/formfiller/cffl_radiobutton.cpp
|
| diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
|
| index 8186c2f13775bac76c41386d84f4787c5111c2da..70d4c0dee6ecd2b9631db820bf649fb559a525c3 100644
|
| --- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
|
| +++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
|
| @@ -28,77 +28,77 @@ CPWL_Wnd* CFFL_RadioButton::NewPDFWindow(const PWL_CREATEPARAM& cp,
|
| return pWnd;
|
| }
|
|
|
| -FX_BOOL CFFL_RadioButton::OnKeyDown(CPDFSDK_Annot* pAnnot,
|
| - uint32_t nKeyCode,
|
| - uint32_t nFlags) {
|
| +bool CFFL_RadioButton::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_RadioButton::OnChar(CPDFSDK_Annot* pAnnot,
|
| - uint32_t nChar,
|
| - uint32_t nFlags) {
|
| +bool CFFL_RadioButton::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 || bReset || bExit)
|
| - return TRUE;
|
| + return true;
|
|
|
| CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
|
| if (CPWL_RadioButton* pWnd =
|
| - (CPWL_RadioButton*)GetPDFWindow(pPageView, TRUE))
|
| - pWnd->SetCheck(TRUE);
|
| + (CPWL_RadioButton*)GetPDFWindow(pPageView, true))
|
| + pWnd->SetCheck(true);
|
| CommitData(pPageView, nFlags);
|
| - return TRUE;
|
| + return true;
|
| }
|
| default:
|
| return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
|
| }
|
| }
|
|
|
| -FX_BOOL CFFL_RadioButton::OnLButtonUp(CPDFSDK_PageView* pPageView,
|
| - CPDFSDK_Annot* pAnnot,
|
| - uint32_t nFlags,
|
| - const CFX_FloatPoint& point) {
|
| +bool CFFL_RadioButton::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_RadioButton* pWnd =
|
| - (CPWL_RadioButton*)GetPDFWindow(pPageView, TRUE))
|
| - pWnd->SetCheck(TRUE);
|
| + (CPWL_RadioButton*)GetPDFWindow(pPageView, true))
|
| + pWnd->SetCheck(true);
|
|
|
| if (!CommitData(pPageView, nFlags))
|
| - return FALSE;
|
| + return false;
|
| }
|
|
|
| - return TRUE;
|
| + return true;
|
| }
|
|
|
| -FX_BOOL CFFL_RadioButton::IsDataChanged(CPDFSDK_PageView* pPageView) {
|
| +bool CFFL_RadioButton::IsDataChanged(CPDFSDK_PageView* pPageView) {
|
| if (CPWL_RadioButton* pWnd =
|
| - (CPWL_RadioButton*)GetPDFWindow(pPageView, FALSE)) {
|
| + (CPWL_RadioButton*)GetPDFWindow(pPageView, false)) {
|
| return pWnd->IsChecked() != m_pWidget->IsChecked();
|
| }
|
|
|
| - return FALSE;
|
| + return false;
|
| }
|
|
|
| void CFFL_RadioButton::SaveData(CPDFSDK_PageView* pPageView) {
|
| if (CPWL_RadioButton* pWnd =
|
| - (CPWL_RadioButton*)GetPDFWindow(pPageView, FALSE)) {
|
| + (CPWL_RadioButton*)GetPDFWindow(pPageView, false)) {
|
| bool bNewChecked = pWnd->IsChecked();
|
|
|
| if (bNewChecked) {
|
|
|