Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / pdfium / fpdfsdk / src / pdfwindow / PWL_ComboBox.cpp

diff --git a/src/third_party/pdfium/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/src/third_party/pdfium/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
index 020765a..01810ff 100644 (file)
--- a/src/third_party/pdfium/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
+++ b/src/third_party/pdfium/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
@@ -47,7 +47,7 @@ FX_BOOL       CPWL_CBListBox::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag)
        return TRUE;
 }
 
-FX_BOOL CPWL_CBListBox::OnKeyDown(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD nFlag)
+FX_BOOL CPWL_CBListBox::OnKeyDownWithExit(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD nFlag)
 {
        if (!m_pList) return FALSE;
 
@@ -93,7 +93,7 @@ FX_BOOL CPWL_CBListBox::OnKeyDown(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD nFlag
        return TRUE;
 }
 
-FX_BOOL        CPWL_CBListBox::OnChar(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD nFlag)
+FX_BOOL        CPWL_CBListBox::OnCharWithExit(FX_WORD nChar, FX_BOOL & bExit, FX_DWORD nFlag)
 {
        if (!m_pList) return FALSE;
 
@@ -552,7 +552,7 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
                if (m_pList->GetCurSel() > 0)
                {
                        FX_BOOL bExit = FALSE;
-                       if (m_pList->OnKeyDown(nChar,bExit,nFlag))
+                       if (m_pList->OnKeyDownWithExit(nChar,bExit,nFlag))
                        {
                                if (bExit) return FALSE;
                                SetSelectText();                                
@@ -563,7 +563,7 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag)
                if (m_pList->GetCurSel() < m_pList->GetCount() - 1)
                {
                        FX_BOOL bExit = FALSE;
-                       if (m_pList->OnKeyDown(nChar,bExit,nFlag))
+                       if (m_pList->OnKeyDownWithExit(nChar,bExit,nFlag))
                        {
                                if (bExit) return FALSE;
                                SetSelectText();                                
@@ -592,7 +592,7 @@ FX_BOOL CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag)
        }
        else
        {
-               if (m_pList->OnChar(nChar,bExit,nFlag))
+               if (m_pList->OnCharWithExit(nChar,bExit,nFlag))
                {
                        return bExit;
                }