diff options
| author | Nico Weber <thakis@chromium.org> | 2014-07-30 14:17:19 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2014-07-30 14:17:19 -0700 |
| commit | f1d18bbda1099d9423e09ba4714b3712c1b512d3 (patch) | |
| tree | fbf7b4e497c72925263d7a7685b7b9c1c114fdec /fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp | |
| parent | fe08482976fb43cc93e4f8a3ea799d98dfe96ada (diff) | |
| download | pdfium-f1d18bbda1099d9423e09ba4714b3712c1b512d3.tar.xz | |
Attempt to fix some -Woverloaded-virtual warnings.
There are many warnings that look like:
error: 'CPWL_RadioButton::OnChar' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
virtual FX_BOOL OnChar(FX_WORD nChar);
^
note: hidden overloaded virtual function 'CPWL_Wnd::OnChar' declared here: different number of parameters (2 vs 1)
virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag);
^
It looks like someone added the nFlag parameter to the methods in CPWL_Wnd
at some point and missed to update all overloads This patch attempts to fix this:
It adds the parameter to all methods that look like they're trying to overload the base
class method, and renames the method in one case where it fairly clearly looks like
that it's not supposed to be an overload.
BUG=pdfium:29
R=bo_xu@foxitsoftware.com
Review URL: https://codereview.chromium.org/416383004
Diffstat (limited to 'fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp index 020765aba5..01810ffd7a 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp +++ b/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; } |