Reorder parameters in PWL and related events code.
Make the order of the parameters consistent with the rest of the events
call stack.
Change-Id: Iea46f14599c4ae4072c3f826269a2abb14146065
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/68891
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp
index 4350605..e5d0d63 100644
--- a/fpdfsdk/cpdfsdk_pageview.cpp
+++ b/fpdfsdk/cpdfsdk_pageview.cpp
@@ -264,7 +264,7 @@
return false;
}
-bool CPDFSDK_PageView::OnFocus(const CFX_PointF& point, uint32_t nFlag) {
+bool CPDFSDK_PageView::OnFocus(uint32_t nFlag, const CFX_PointF& point) {
ObservedPtr<CPDFSDK_Annot> pAnnot(GetFXWidgetAtPoint(point));
if (!pAnnot) {
m_pFormFillEnv->KillFocusAnnot(nFlag);
@@ -275,7 +275,7 @@
return true;
}
-bool CPDFSDK_PageView::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
+bool CPDFSDK_PageView::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
ObservedPtr<CPDFSDK_Annot> pAnnot(GetFXWidgetAtPoint(point));
if (!pAnnot) {
m_pFormFillEnv->KillFocusAnnot(nFlag);
@@ -294,7 +294,7 @@
return true;
}
-bool CPDFSDK_PageView::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
+bool CPDFSDK_PageView::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr =
m_pFormFillEnv->GetAnnotHandlerMgr();
ObservedPtr<CPDFSDK_Annot> pFXAnnot(GetFXWidgetAtPoint(point));
@@ -308,8 +308,8 @@
pAnnotHandlerMgr->Annot_OnLButtonUp(this, &pFXAnnot, nFlag, point);
}
-bool CPDFSDK_PageView::OnLButtonDblClk(const CFX_PointF& point,
- uint32_t nFlag) {
+bool CPDFSDK_PageView::OnLButtonDblClk(uint32_t nFlag,
+ const CFX_PointF& point) {
ObservedPtr<CPDFSDK_Annot> pAnnot(GetFXWidgetAtPoint(point));
if (!pAnnot) {
m_pFormFillEnv->KillFocusAnnot(nFlag);
@@ -328,7 +328,7 @@
return true;
}
-bool CPDFSDK_PageView::OnRButtonDown(const CFX_PointF& point, uint32_t nFlag) {
+bool CPDFSDK_PageView::OnRButtonDown(uint32_t nFlag, const CFX_PointF& point) {
ObservedPtr<CPDFSDK_Annot> pAnnot(GetFXWidgetAtPoint(point));
if (!pAnnot)
return false;
@@ -345,7 +345,7 @@
return true;
}
-bool CPDFSDK_PageView::OnRButtonUp(const CFX_PointF& point, uint32_t nFlag) {
+bool CPDFSDK_PageView::OnRButtonUp(uint32_t nFlag, const CFX_PointF& point) {
ObservedPtr<CPDFSDK_Annot> pAnnot(GetFXWidgetAtPoint(point));
if (!pAnnot)
return false;
@@ -362,7 +362,7 @@
return true;
}
-bool CPDFSDK_PageView::OnMouseMove(const CFX_PointF& point, int nFlag) {
+bool CPDFSDK_PageView::OnMouseMove(int nFlag, const CFX_PointF& point) {
CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr =
m_pFormFillEnv->GetAnnotHandlerMgr();
@@ -419,9 +419,9 @@
m_pCaptureWidget.Reset();
}
-bool CPDFSDK_PageView::OnMouseWheel(const CFX_Vector& delta,
+bool CPDFSDK_PageView::OnMouseWheel(int nFlag,
const CFX_PointF& point,
- int nFlag) {
+ const CFX_Vector& delta) {
ObservedPtr<CPDFSDK_Annot> pAnnot(GetFXWidgetAtPoint(point));
if (!pAnnot)
return false;
diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h
index c59b671..1c947b9 100644
--- a/fpdfsdk/cpdfsdk_pageview.h
+++ b/fpdfsdk/cpdfsdk_pageview.h
@@ -63,19 +63,19 @@
bool Undo();
bool Redo();
- bool OnFocus(const CFX_PointF& point, uint32_t nFlag);
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag);
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag);
- bool OnLButtonDblClk(const CFX_PointF& point, uint32_t nFlag);
- bool OnRButtonDown(const CFX_PointF& point, uint32_t nFlag);
- bool OnRButtonUp(const CFX_PointF& point, uint32_t nFlag);
+ bool OnFocus(uint32_t nFlag, const CFX_PointF& point);
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point);
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point);
+ bool OnLButtonDblClk(uint32_t nFlag, const CFX_PointF& point);
+ bool OnRButtonDown(uint32_t nFlag, const CFX_PointF& point);
+ bool OnRButtonUp(uint32_t nFlag, const CFX_PointF& point);
bool OnChar(int nChar, uint32_t nFlag);
bool OnKeyDown(int nKeyCode, int nFlag);
bool OnKeyUp(int nKeyCode, int nFlag);
- bool OnMouseMove(const CFX_PointF& point, int nFlag);
- bool OnMouseWheel(const CFX_Vector& delta,
+ bool OnMouseMove(int nFlag, const CFX_PointF& point);
+ bool OnMouseWheel(int nFlag,
const CFX_PointF& point,
- int nFlag);
+ const CFX_Vector& delta);
bool SetIndexSelected(int index, bool selected);
bool IsIndexSelected(int index);
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index d44b32a..d26dcbf 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -97,7 +97,7 @@
InvalidateRect(rect);
if (!rect.Contains(static_cast<int>(point.x), static_cast<int>(point.y)))
return false;
- return pWnd->OnLButtonDown(FFLtoPWL(point), nFlags);
+ return pWnd->OnLButtonDown(nFlags, FFLtoPWL(point));
}
bool CFFL_FormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView,
@@ -109,7 +109,7 @@
return false;
InvalidateRect(GetViewBBox(pPageView));
- pWnd->OnLButtonUp(FFLtoPWL(point), nFlags);
+ pWnd->OnLButtonUp(nFlags, FFLtoPWL(point));
return true;
}
@@ -120,7 +120,7 @@
if (!pWnd)
return false;
- pWnd->OnLButtonDblClk(FFLtoPWL(point), nFlags);
+ pWnd->OnLButtonDblClk(nFlags, FFLtoPWL(point));
return true;
}
@@ -131,7 +131,7 @@
if (!pWnd)
return false;
- pWnd->OnMouseMove(FFLtoPWL(point), nFlags);
+ pWnd->OnMouseMove(nFlags, FFLtoPWL(point));
return true;
}
@@ -143,21 +143,21 @@
return false;
CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true);
- return pWnd && pWnd->OnMouseWheel(delta, FFLtoPWL(point), nFlags);
+ return pWnd && pWnd->OnMouseWheel(nFlags, FFLtoPWL(point), delta);
}
bool CFFL_FormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView,
uint32_t nFlags,
const CFX_PointF& point) {
CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true);
- return pWnd && pWnd->OnRButtonDown(FFLtoPWL(point), nFlags);
+ return pWnd && pWnd->OnRButtonDown(nFlags, FFLtoPWL(point));
}
bool CFFL_FormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView,
uint32_t nFlags,
const CFX_PointF& point) {
CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
- return pWnd && pWnd->OnRButtonUp(FFLtoPWL(point), nFlags);
+ return pWnd && pWnd->OnRButtonUp(nFlags, FFLtoPWL(point));
}
bool CFFL_FormFiller::OnKeyDown(uint32_t nKeyCode, uint32_t nFlags) {
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp
index 35d8a24..699daa1 100644
--- a/fpdfsdk/fpdf_formfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
@@ -376,7 +376,7 @@
CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
if (!pPageView)
return false;
- return pPageView->OnMouseMove(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnMouseMove(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
@@ -389,8 +389,8 @@
CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
if (!pPageView || !page_coord)
return false;
- return pPageView->OnMouseWheel(CFX_Vector(delta_x, delta_y),
- CFXPointFFromFSPointF(*page_coord), modifier);
+ return pPageView->OnMouseWheel(modifier, CFXPointFFromFSPointF(*page_coord),
+ CFX_Vector(delta_x, delta_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FORM_OnFocus(FPDF_FORMHANDLE hHandle,
@@ -401,7 +401,7 @@
CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
if (!pPageView)
return false;
- return pPageView->OnFocus(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnFocus(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FORM_OnLButtonDown(FPDF_FORMHANDLE hHandle,
@@ -416,7 +416,7 @@
fprintf(stderr, "mousedown,left,%d,%d\n", static_cast<int>(round(page_x)),
static_cast<int>(round(page_y)));
#endif // PDF_ENABLE_CLICK_LOGGING
- return pPageView->OnLButtonDown(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnLButtonDown(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FORM_OnLButtonUp(FPDF_FORMHANDLE hHandle,
@@ -431,7 +431,7 @@
fprintf(stderr, "mouseup,left,%d,%d\n", static_cast<int>(round(page_x)),
static_cast<int>(round(page_y)));
#endif // PDF_ENABLE_CLICK_LOGGING
- return pPageView->OnLButtonUp(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnLButtonUp(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
@@ -447,7 +447,7 @@
fprintf(stderr, "mousedown,doubleleft,%d,%d\n",
static_cast<int>(round(page_x)), static_cast<int>(round(page_y)));
#endif // PDF_ENABLE_CLICK_LOGGING
- return pPageView->OnLButtonDblClk(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnLButtonDblClk(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FORM_OnRButtonDown(FPDF_FORMHANDLE hHandle,
@@ -462,7 +462,7 @@
fprintf(stderr, "mousedown,right,%d,%d\n", static_cast<int>(round(page_x)),
static_cast<int>(round(page_y)));
#endif // PDF_ENABLE_CLICK_LOGGING
- return pPageView->OnRButtonDown(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnRButtonDown(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FORM_OnRButtonUp(FPDF_FORMHANDLE hHandle,
@@ -477,7 +477,7 @@
fprintf(stderr, "mouseup,right,%d,%d\n", static_cast<int>(round(page_x)),
static_cast<int>(round(page_y)));
#endif // PDF_ENABLE_CLICK_LOGGING
- return pPageView->OnRButtonUp(CFX_PointF(page_x, page_y), modifier);
+ return pPageView->OnRButtonUp(modifier, CFX_PointF(page_x, page_y));
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FORM_OnKeyDown(FPDF_FORMHANDLE hHandle,
diff --git a/fpdfsdk/pwl/cpwl_button.cpp b/fpdfsdk/pwl/cpwl_button.cpp
index b81afae..39ea618 100644
--- a/fpdfsdk/pwl/cpwl_button.cpp
+++ b/fpdfsdk/pwl/cpwl_button.cpp
@@ -17,15 +17,15 @@
CPWL_Button::~CPWL_Button() = default;
-bool CPWL_Button::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_Button::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
m_bMouseDown = true;
SetCapture();
return true;
}
-bool CPWL_Button::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_Button::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
ReleaseCapture();
m_bMouseDown = false;
return true;
diff --git a/fpdfsdk/pwl/cpwl_button.h b/fpdfsdk/pwl/cpwl_button.h
index e7760dd..89187a1 100644
--- a/fpdfsdk/pwl/cpwl_button.h
+++ b/fpdfsdk/pwl/cpwl_button.h
@@ -19,8 +19,8 @@
~CPWL_Button() override;
// CPWL_Wnd
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
protected:
bool m_bMouseDown = false;
diff --git a/fpdfsdk/pwl/cpwl_combo_box.cpp b/fpdfsdk/pwl/cpwl_combo_box.cpp
index 8192da2..b6511ef 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box.cpp
@@ -35,8 +35,8 @@
CPWL_CBListBox::~CPWL_CBListBox() = default;
-bool CPWL_CBListBox::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_CBListBox::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
if (!m_bMouseDown)
return true;
@@ -144,8 +144,8 @@
}
}
-bool CPWL_CBButton::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_CBButton::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
SetCapture();
if (CPWL_Wnd* pParent = GetParentWindow())
@@ -154,8 +154,8 @@
return true;
}
-bool CPWL_CBButton::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_CBButton::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
ReleaseCapture();
return true;
diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
index 8b9bf12..66565e2 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -22,7 +22,7 @@
~CPWL_CBListBox() override;
// CPWL_ListBox
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
bool IsMovementKey(uint16_t nChar) const;
bool OnMovementKeyDown(uint16_t nChar, uint32_t nFlag);
@@ -40,8 +40,8 @@
// CPWL_Wnd
void DrawThisAppearance(CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device) override;
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
};
class CPWL_ComboBox final : public CPWL_Wnd {
diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index d8a6b41..8bd1de8 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -244,8 +244,8 @@
m_pFormFiller.Get());
}
-bool CPWL_Edit::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_Edit::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) {
if (m_bMouseDown && !InvalidateRect(nullptr))
@@ -260,8 +260,8 @@
return true;
}
-bool CPWL_Edit::OnLButtonDblClk(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDblClk(point, nFlag);
+bool CPWL_Edit::OnLButtonDblClk(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDblClk(nFlag, point);
if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) {
m_pEdit->SelectAll();
@@ -270,11 +270,11 @@
return true;
}
-bool CPWL_Edit::OnRButtonUp(const CFX_PointF& point, uint32_t nFlag) {
+bool CPWL_Edit::OnRButtonUp(uint32_t nFlag, const CFX_PointF& point) {
if (m_bMouseDown)
return false;
- CPWL_Wnd::OnRButtonUp(point, nFlag);
+ CPWL_Wnd::OnRButtonUp(nFlag, point);
if (!HasFlag(PES_TEXTOVERFLOW) && !ClientHitTest(point))
return true;
@@ -538,9 +538,9 @@
return CPWL_EditCtrl::OnChar(nChar, nFlag);
}
-bool CPWL_Edit::OnMouseWheel(const CFX_Vector& delta,
+bool CPWL_Edit::OnMouseWheel(uint32_t nFlag,
const CFX_PointF& point,
- uint32_t nFlag) {
+ const CFX_Vector& delta) {
if (!HasFlag(PES_MULTILINE))
return false;
diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
index 1dbdfe4..8315527 100644
--- a/fpdfsdk/pwl/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -59,12 +59,12 @@
CFX_FloatRect GetClientRect() const override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device) override;
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonDblClk(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnRButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnMouseWheel(const CFX_Vector& delta,
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonDblClk(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnRButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnMouseWheel(uint32_t nFlag,
const CFX_PointF& point,
- uint32_t nFlag) override;
+ const CFX_Vector& delta) override;
bool OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
bool OnChar(uint16_t nChar, uint32_t nFlag) override;
CFX_FloatRect GetFocusRect() const override;
diff --git a/fpdfsdk/pwl/cpwl_edit_ctrl.cpp b/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
index 54fe91a3..b5db1df 100644
--- a/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
@@ -246,8 +246,8 @@
return true;
}
-bool CPWL_EditCtrl::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_EditCtrl::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
if (ClientHitTest(point)) {
if (m_bMouseDown && !InvalidateRect(nullptr))
@@ -262,8 +262,8 @@
return true;
}
-bool CPWL_EditCtrl::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_EditCtrl::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
if (m_bMouseDown) {
// can receive keybord message
@@ -277,8 +277,8 @@
return true;
}
-bool CPWL_EditCtrl::OnMouseMove(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnMouseMove(point, nFlag);
+bool CPWL_EditCtrl::OnMouseMove(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnMouseMove(nFlag, point);
if (m_bMouseDown)
m_pEdit->OnMouseMove(point, false, false);
diff --git a/fpdfsdk/pwl/cpwl_edit_ctrl.h b/fpdfsdk/pwl/cpwl_edit_ctrl.h
index 9cd92bf..dde8cbc 100644
--- a/fpdfsdk/pwl/cpwl_edit_ctrl.h
+++ b/fpdfsdk/pwl/cpwl_edit_ctrl.h
@@ -50,9 +50,9 @@
void OnCreated() override;
bool OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
bool OnChar(uint16_t nChar, uint32_t nFlag) override;
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnMouseMove(uint32_t nFlag, const CFX_PointF& point) override;
void SetScrollInfo(const PWL_SCROLL_INFO& info) override;
void SetScrollPosition(float pos) override;
void ScrollWindowVertically(float pos) override;
diff --git a/fpdfsdk/pwl/cpwl_list_box.cpp b/fpdfsdk/pwl/cpwl_list_box.cpp
index 73bc46f..4ad9fe9 100644
--- a/fpdfsdk/pwl/cpwl_list_box.cpp
+++ b/fpdfsdk/pwl/cpwl_list_box.cpp
@@ -186,8 +186,8 @@
return true;
}
-bool CPWL_ListBox::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_ListBox::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
if (ClientHitTest(point)) {
m_bMouseDown = true;
@@ -200,8 +200,8 @@
return true;
}
-bool CPWL_ListBox::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_ListBox::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
if (m_bMouseDown) {
ReleaseCapture();
@@ -215,8 +215,8 @@
m_bHoverSel = bHoverSel;
}
-bool CPWL_ListBox::OnMouseMove(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnMouseMove(point, nFlag);
+bool CPWL_ListBox::OnMouseMove(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnMouseMove(nFlag, point);
if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point))
m_pList->Select(m_pList->GetItemIndex(point));
@@ -366,9 +366,9 @@
return GetWindowRect().GetDeflated(width, width);
}
-bool CPWL_ListBox::OnMouseWheel(const CFX_Vector& delta,
+bool CPWL_ListBox::OnMouseWheel(uint32_t nFlag,
const CFX_PointF& point,
- uint32_t nFlag) {
+ const CFX_Vector& delta) {
if (delta.y < 0)
m_pList->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
else
diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
index ab94eee..48b53e5 100644
--- a/fpdfsdk/pwl/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -50,12 +50,12 @@
const CFX_Matrix& mtUser2Device) override;
bool OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
bool OnChar(uint16_t nChar, uint32_t nFlag) override;
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnMouseWheel(const CFX_Vector& delta,
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnMouseMove(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnMouseWheel(uint32_t nFlag,
const CFX_PointF& point,
- uint32_t nFlag) override;
+ const CFX_Vector& delta) override;
WideString GetText() override;
void SetScrollInfo(const PWL_SCROLL_INFO& info) override;
void SetScrollPosition(float pos) override;
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
index bf4d1da..35b0a55 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
@@ -266,8 +266,8 @@
}
}
-bool CPWL_SBButton::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_SBButton::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
if (CPWL_Wnd* pParent = GetParentWindow())
pParent->NotifyLButtonDown(this, point);
@@ -278,8 +278,8 @@
return true;
}
-bool CPWL_SBButton::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_SBButton::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
if (CPWL_Wnd* pParent = GetParentWindow())
pParent->NotifyLButtonUp(this, point);
@@ -290,8 +290,8 @@
return true;
}
-bool CPWL_SBButton::OnMouseMove(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnMouseMove(point, nFlag);
+bool CPWL_SBButton::OnMouseMove(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnMouseMove(nFlag, point);
if (CPWL_Wnd* pParent = GetParentWindow())
pParent->NotifyMouseMove(this, point);
@@ -410,8 +410,8 @@
}
}
-bool CPWL_ScrollBar::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonDown(point, nFlag);
+bool CPWL_ScrollBar::OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonDown(nFlag, point);
if (HasFlag(PWS_AUTOTRANSPARENT)) {
if (GetTransparency() != 255) {
@@ -464,8 +464,8 @@
return true;
}
-bool CPWL_ScrollBar::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
- CPWL_Wnd::OnLButtonUp(point, nFlag);
+bool CPWL_ScrollBar::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
+ CPWL_Wnd::OnLButtonUp(nFlag, point);
if (HasFlag(PWS_AUTOTRANSPARENT)) {
if (GetTransparency() != PWL_SCROLLBAR_TRANSPARENCY) {
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h
index f6bb2b9..f04c12b 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.h
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.h
@@ -54,9 +54,9 @@
// CPWL_Wnd
void DrawThisAppearance(CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device) override;
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnMouseMove(uint32_t nFlag, const CFX_PointF& point) override;
private:
PWL_SCROLLBAR_TYPE m_eScrollBarType;
@@ -127,8 +127,8 @@
bool RePosChildWnd() override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device) override;
- bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) override;
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
void SetScrollInfo(const PWL_SCROLL_INFO& info) override;
void SetScrollPosition(float pos) override;
void NotifyLButtonDown(CPWL_Wnd* child, const CFX_PointF& pos) override;
diff --git a/fpdfsdk/pwl/cpwl_special_button.cpp b/fpdfsdk/pwl/cpwl_special_button.cpp
index 3fbf919..e653ae1 100644
--- a/fpdfsdk/pwl/cpwl_special_button.cpp
+++ b/fpdfsdk/pwl/cpwl_special_button.cpp
@@ -30,7 +30,7 @@
CPWL_CheckBox::~CPWL_CheckBox() = default;
-bool CPWL_CheckBox::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
+bool CPWL_CheckBox::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
if (IsReadOnly())
return false;
@@ -50,7 +50,7 @@
CPWL_RadioButton::~CPWL_RadioButton() = default;
-bool CPWL_RadioButton::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
+bool CPWL_RadioButton::OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) {
if (IsReadOnly())
return false;
diff --git a/fpdfsdk/pwl/cpwl_special_button.h b/fpdfsdk/pwl/cpwl_special_button.h
index 3d9fa25..ac3db7e 100644
--- a/fpdfsdk/pwl/cpwl_special_button.h
+++ b/fpdfsdk/pwl/cpwl_special_button.h
@@ -30,7 +30,7 @@
~CPWL_CheckBox() override;
// CPWL_Button:
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
bool OnChar(uint16_t nChar, uint32_t nFlag) override;
bool IsChecked() const { return m_bChecked; }
@@ -48,7 +48,7 @@
~CPWL_RadioButton() override;
// CPWL_Button
- bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
+ bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point) override;
bool OnChar(uint16_t nChar, uint32_t nFlag) override;
bool IsChecked() const { return m_bChecked; }
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 7683188..7010d13 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -288,14 +288,14 @@
#undef PWL_IMPLEMENT_KEY_METHOD
#define PWL_IMPLEMENT_MOUSE_METHOD(mouse_method_name) \
- bool CPWL_Wnd::mouse_method_name(const CFX_PointF& point, uint32_t nFlag) { \
+ bool CPWL_Wnd::mouse_method_name(uint32_t nFlag, const CFX_PointF& point) { \
if (!IsValid() || !IsVisible() || !IsEnabled()) \
return false; \
if (IsWndCaptureMouse(this)) { \
for (const auto& pChild : m_Children) { \
if (IsWndCaptureMouse(pChild.get())) { \
- return pChild->mouse_method_name(pChild->ParentToChild(point), \
- nFlag); \
+ return pChild->mouse_method_name(nFlag, \
+ pChild->ParentToChild(point)); \
} \
} \
SetCursor(); \
@@ -303,7 +303,7 @@
} \
for (const auto& pChild : m_Children) { \
if (pChild->WndHitTest(pChild->ParentToChild(point))) { \
- return pChild->mouse_method_name(pChild->ParentToChild(point), nFlag); \
+ return pChild->mouse_method_name(nFlag, pChild->ParentToChild(point)); \
} \
} \
if (WndHitTest(point)) \
@@ -318,11 +318,11 @@
#undef PWL_IMPLEMENT_MOUSE_METHOD
// Unlike their FWL counterparts, PWL windows don't handle right clicks.
-bool CPWL_Wnd::OnRButtonDown(const CFX_PointF& point, uint32_t nFlag) {
+bool CPWL_Wnd::OnRButtonDown(uint32_t nFlag, const CFX_PointF& point) {
return false;
}
-bool CPWL_Wnd::OnRButtonUp(const CFX_PointF& point, uint32_t nFlag) {
+bool CPWL_Wnd::OnRButtonUp(uint32_t nFlag, const CFX_PointF& point) {
return false;
}
@@ -352,9 +352,9 @@
return false;
}
-bool CPWL_Wnd::OnMouseWheel(const CFX_Vector& delta,
+bool CPWL_Wnd::OnMouseWheel(uint32_t nFlag,
const CFX_PointF& point,
- uint32_t nFlag) {
+ const CFX_Vector& delta) {
if (!IsValid() || !IsVisible() || !IsEnabled())
return false;
@@ -364,7 +364,7 @@
for (const auto& pChild : m_Children) {
if (IsWndCaptureKeyboard(pChild.get()))
- return pChild->OnMouseWheel(delta, pChild->ParentToChild(point), nFlag);
+ return pChild->OnMouseWheel(nFlag, pChild->ParentToChild(point), delta);
}
return false;
}
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index 208949c..3523f87 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -145,15 +145,15 @@
virtual bool OnKeyDown(uint16_t nChar, uint32_t nFlag);
virtual bool OnChar(uint16_t nChar, uint32_t nFlag);
- virtual bool OnLButtonDblClk(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnRButtonDown(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnRButtonUp(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnMouseWheel(const CFX_Vector& delta,
+ virtual bool OnLButtonDblClk(uint32_t nFlag, const CFX_PointF& point);
+ virtual bool OnLButtonDown(uint32_t nFlag, const CFX_PointF& point);
+ virtual bool OnLButtonUp(uint32_t nFlag, const CFX_PointF& point);
+ virtual bool OnRButtonDown(uint32_t nFlag, const CFX_PointF& point);
+ virtual bool OnRButtonUp(uint32_t nFlag, const CFX_PointF& point);
+ virtual bool OnMouseMove(uint32_t nFlag, const CFX_PointF& point);
+ virtual bool OnMouseWheel(uint32_t nFlag,
const CFX_PointF& point,
- uint32_t nFlag);
+ const CFX_Vector& delta);
virtual void SetScrollInfo(const PWL_SCROLL_INFO& info);
virtual void SetScrollPosition(float pos);
virtual void ScrollWindowVertically(float pos);
