Index: fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp |
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp |
index 9c9c623e28cb89fd50e25772e435fb07492a9eb5..395f764872af491bbb8a3c2a7d74ae6a819ea50a 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; |
} |