diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-30 12:39:54 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-30 12:39:54 -0800 |
| commit | 40e9ff30b7f22b37c071dc9751f489d4cc22b0ee (patch) | |
| tree | 33f50b65518fcb32bc197adc94bb0073244113e1 /fpdfsdk/src/pdfwindow | |
| parent | d029d934e1a23aadc07cc99753a55b308f20ef2b (diff) | |
| download | pdfium-40e9ff30b7f22b37c071dc9751f489d4cc22b0ee.tar.xz | |
Tidy PDF_ENABLE_XFA #ifdefs in fpdfsdk.
-- label matching #endifs
-- prefer #ifdef over #ifndef
-- consolidate some blocks.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1484843002 .
Diffstat (limited to 'fpdfsdk/src/pdfwindow')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp index 9c9c623e28..395f764872 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp @@ -476,8 +476,7 @@ void CPWL_ComboBox::SetPopup(FX_BOOL bPopup) { m_pFillerNotify->OnPopupPreOpen(GetAttachedData(), bExit, 0); if (bExit) return; - -#endif +#endif // PDF_ENABLE_XFA int32_t nWhere = 0; FX_FLOAT fPopupRet = 0.0f; FX_FLOAT fPopupMin = 0.0f; @@ -506,12 +505,11 @@ void CPWL_ComboBox::SetPopup(FX_BOOL bPopup) { m_nPopupWhere = nWhere; Move(rcWindow, TRUE, TRUE); #ifdef PDF_ENABLE_XFA - bExit = FALSE; m_pFillerNotify->OnPopupPostOpen(GetAttachedData(), bExit, 0); if (bExit) return; -#endif +#endif // PDF_ENABLE_XFA } } } else { @@ -533,7 +531,6 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { if (m_pList->GetCurSel() > 0) { FX_BOOL bExit = FALSE; #ifdef PDF_ENABLE_XFA - if (m_pFillerNotify) { m_pFillerNotify->OnPopupPreOpen(GetAttachedData(), bExit, nFlag); if (bExit) @@ -543,7 +540,7 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { if (bExit) return FALSE; } -#endif +#endif // PDF_ENABLE_XFA if (m_pList->OnKeyDownWithExit(nChar, bExit, nFlag)) { if (bExit) return FALSE; @@ -555,7 +552,6 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { if (m_pList->GetCurSel() < m_pList->GetCount() - 1) { FX_BOOL bExit = FALSE; #ifdef PDF_ENABLE_XFA - if (m_pFillerNotify) { m_pFillerNotify->OnPopupPreOpen(GetAttachedData(), bExit, nFlag); if (bExit) @@ -565,7 +561,7 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { if (bExit) return FALSE; } -#endif +#endif // PDF_ENABLE_XFA if (m_pList->OnKeyDownWithExit(nChar, bExit, nFlag)) { if (bExit) return FALSE; @@ -603,7 +599,7 @@ FX_BOOL CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag) { if (bExit) return FALSE; } -#endif +#endif // PDF_ENABLE_XFA return m_pList->OnCharWithExit(nChar, bExit, nFlag) ? bExit : FALSE; } |