diff options
| author | Hans Wennborg <hans@chromium.org> | 2018-10-22 18:28:52 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-22 18:28:52 +0000 |
| commit | c320e9c7ad01ab48625e51fb3b6476d98b6167de (patch) | |
| tree | 4ef9b9083a5969b60c445340a47500c46c5ce623 /fpdfsdk/formfiller/cffl_combobox.cpp | |
| parent | 8298d25cf3ac41d71a8533700d929cadac1c360d (diff) | |
| download | pdfium-c320e9c7ad01ab48625e51fb3b6476d98b6167de.tar.xz | |
Add k prefixes to CPDF_AAction::AActionType enumerators
The GetFocus enumerator was shadowing the GetFocus function in winuser.h.
Change the enumerators to all have a k prefix to avoid the warning, and since I
believe pdfium wants to move towards that style anyway.
Bug: chromium:895475
Change-Id: I740afa4f29d895e7e3cbb488fd311a7487d67a82
Reviewed-on: https://pdfium-review.googlesource.com/c/44470
Commit-Queue: Hans Wennborg <hans@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/formfiller/cffl_combobox.cpp')
| -rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 8de88a66f3..830e64713a 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -124,7 +124,7 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: if (CPWL_ComboBox* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) { if (CPWL_Edit* pEdit = pComboBox->GetEdit()) { @@ -144,7 +144,7 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView, } } break; - case CPDF_AAction::Validate: + case CPDF_AAction::kValidate: if (CPWL_ComboBox* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) { if (CPWL_Edit* pEdit = pComboBox->GetEdit()) { @@ -152,8 +152,8 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView, } } break; - case CPDF_AAction::LoseFocus: - case CPDF_AAction::GetFocus: + case CPDF_AAction::kLoseFocus: + case CPDF_AAction::kGetFocus: fa.sValue = m_pWidget->GetValue(); break; default: @@ -165,7 +165,7 @@ void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, const CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: if (CPWL_ComboBox* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) { if (CPWL_Edit* pEdit = pComboBox->GetEdit()) { @@ -183,7 +183,7 @@ bool CFFL_ComboBox::IsActionDataChanged(CPDF_AAction::AActionType type, const CPDFSDK_FieldAction& faOld, const CPDFSDK_FieldAction& faNew) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) || faOld.nSelStart != faNew.nSelStart || faOld.sChange != faNew.sChange; |