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_IconList.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_IconList.cpp')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_IconList.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp index 72317908bb..1d58a90111 100644 --- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp @@ -192,7 +192,7 @@ void CPWL_IconList_Content::CreateChildWnd(const PWL_CREATEPARAM & cp) } } -FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point & point) +FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag) { SetFocus(); @@ -206,7 +206,7 @@ FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point & point) return TRUE; } -FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point & point) +FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag) { m_bMouseDown = FALSE; ReleaseCapture(); @@ -214,7 +214,7 @@ FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point & point) return TRUE; } -FX_BOOL CPWL_IconList_Content::OnMouseMove(const CPDF_Point & point) +FX_BOOL CPWL_IconList_Content::OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag) { if (m_bMouseDown) { @@ -226,7 +226,7 @@ FX_BOOL CPWL_IconList_Content::OnMouseMove(const CPDF_Point & point) return TRUE; } -FX_BOOL CPWL_IconList_Content::OnKeyDown(FX_WORD nChar) +FX_BOOL CPWL_IconList_Content::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { switch (nChar) { @@ -552,7 +552,7 @@ void CPWL_IconList::SetIconFillColor(const CPWL_Color& color) m_pListContent->SetIconFillColor(color); } -FX_BOOL CPWL_IconList::OnMouseWheel(short zDelta, const CPDF_Point & point) +FX_BOOL CPWL_IconList::OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag) { CPDF_Point ptScroll = m_pListContent->GetScrollPos(); CPDF_Rect rcScroll = m_pListContent->GetScrollArea(); |