Index: fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp |
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp |
index bb2ef7510bbb59d91012ce25085f97a27457d019..c11e765f7fc5c49b3e176d186cbfd3c9e0e310a2 100644 |
--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp |
+++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp |
@@ -573,32 +573,25 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) |
} |
if (HasFlag(PCBS_ALLOWCUSTOMTEXT)) |
- return m_pEdit->OnKeyDown(nChar,nFlag); |
- else |
- return FALSE; |
+ return m_pEdit->OnKeyDown(nChar,nFlag); |
+ |
+ return FALSE; |
} |
FX_BOOL CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag) |
{ |
- if (!m_pList) return FALSE; |
- if (!m_pEdit) return FALSE; |
+ if (!m_pList) |
+ return FALSE; |
- m_nSelectItem = -1; |
- FX_BOOL bExit = FALSE; |
+ if (!m_pEdit) |
+ return FALSE; |
+ m_nSelectItem = -1; |
if (HasFlag(PCBS_ALLOWCUSTOMTEXT)) |
- { |
return m_pEdit->OnChar(nChar,nFlag); |
- } |
- else |
- { |
- if (m_pList->OnCharWithExit(nChar,bExit,nFlag)) |
- { |
- return bExit; |
- } |
- else |
- return FALSE; |
- } |
+ |
+ FX_BOOL bExit = FALSE; |
+ return m_pList->OnCharWithExit(nChar,bExit,nFlag) ? bExit : FALSE; |
} |
void CPWL_ComboBox::OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam, intptr_t lParam) |