Remove some dubious CPWL_Wnd static methods
IsCTRLpressed(), IsSHIFTpressed(), and IsALTpressed() are static
methods that just call into similarly named static methods. So
just call the other methods directly.
Change-Id: Ib338a178ecdc00e47c6005b812a2d4dc5ed0629e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83871
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/pwl/cpwl_cblistbox.cpp b/fpdfsdk/pwl/cpwl_cblistbox.cpp
index 19e5d06..05d8b55 100644
--- a/fpdfsdk/pwl/cpwl_cblistbox.cpp
+++ b/fpdfsdk/pwl/cpwl_cblistbox.cpp
@@ -56,30 +56,30 @@
switch (nChar) {
case FWL_VKEY_Up:
- m_pListCtrl->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_UP(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Down:
- m_pListCtrl->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_DOWN(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Home:
- m_pListCtrl->OnVK_HOME(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_HOME(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Left:
- m_pListCtrl->OnVK_LEFT(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_LEFT(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_End:
- m_pListCtrl->OnVK_END(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_END(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Right:
- m_pListCtrl->OnVK_RIGHT(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_RIGHT(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
}
return OnNotifySelectionChanged(true, nFlag);
}
bool CPWL_CBListBox::IsChar(uint16_t nChar, uint32_t nFlag) const {
- return m_pListCtrl->OnChar(nChar, IsSHIFTpressed(nFlag),
- IsCTRLpressed(nFlag));
+ return m_pListCtrl->OnChar(nChar, IsSHIFTKeyDown(nFlag),
+ IsCTRLKeyDown(nFlag));
}
bool CPWL_CBListBox::OnCharNotify(uint16_t nChar, uint32_t nFlag) {
diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index f7861d1..47b3b30 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -379,7 +379,7 @@
// static
bool CPWL_Edit::IsProceedtoOnChar(uint16_t nKeyCode, uint32_t nFlag) {
bool bCtrl = IsPlatformShortcutKey(nFlag);
- bool bAlt = IsALTpressed(nFlag);
+ bool bAlt = IsALTKeyDown(nFlag);
if (bCtrl && !bAlt) {
// hot keys for edit control.
switch (nKeyCode) {
@@ -412,7 +412,7 @@
bool bRC = true;
bool bExit = false;
- if (!IsCTRLpressed(nFlag)) {
+ if (!IsCTRLKeyDown(nFlag)) {
if (m_pFillerNotify) {
WideString swChange;
@@ -590,29 +590,29 @@
Delete();
return true;
case FWL_VKEY_Insert:
- if (IsSHIFTpressed(nFlag))
+ if (IsSHIFTKeyDown(nFlag))
PasteText();
return true;
case FWL_VKEY_Up:
- m_pEditImpl->OnVK_UP(IsSHIFTpressed(nFlag), false);
+ m_pEditImpl->OnVK_UP(IsSHIFTKeyDown(nFlag), false);
return true;
case FWL_VKEY_Down:
- m_pEditImpl->OnVK_DOWN(IsSHIFTpressed(nFlag), false);
+ m_pEditImpl->OnVK_DOWN(IsSHIFTKeyDown(nFlag), false);
return true;
case FWL_VKEY_Left:
- m_pEditImpl->OnVK_LEFT(IsSHIFTpressed(nFlag), false);
+ m_pEditImpl->OnVK_LEFT(IsSHIFTKeyDown(nFlag), false);
return true;
case FWL_VKEY_Right:
- m_pEditImpl->OnVK_RIGHT(IsSHIFTpressed(nFlag), false);
+ m_pEditImpl->OnVK_RIGHT(IsSHIFTKeyDown(nFlag), false);
return true;
case FWL_VKEY_Home:
- m_pEditImpl->OnVK_HOME(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pEditImpl->OnVK_HOME(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
return true;
case FWL_VKEY_End:
- m_pEditImpl->OnVK_END(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pEditImpl->OnVK_END(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
return true;
case FWL_VKEY_Unknown:
- if (!IsSHIFTpressed(nFlag))
+ if (!IsSHIFTKeyDown(nFlag))
ClearSelection();
else
CutText();
@@ -640,8 +640,8 @@
}
bool bCtrl = IsPlatformShortcutKey(nFlag);
- bool bAlt = IsALTpressed(nFlag);
- bool bShift = IsSHIFTpressed(nFlag);
+ bool bAlt = IsALTKeyDown(nFlag);
+ bool bShift = IsSHIFTKeyDown(nFlag);
uint16_t word = nChar;
@@ -704,8 +704,8 @@
m_bMouseDown = true;
SetCapture();
- m_pEditImpl->OnMouseDown(point, IsSHIFTpressed(nFlag),
- IsCTRLpressed(nFlag));
+ m_pEditImpl->OnMouseDown(point, IsSHIFTKeyDown(nFlag),
+ IsCTRLKeyDown(nFlag));
}
return true;
}
diff --git a/fpdfsdk/pwl/cpwl_list_box.cpp b/fpdfsdk/pwl/cpwl_list_box.cpp
index df9f9ea..b63a775 100644
--- a/fpdfsdk/pwl/cpwl_list_box.cpp
+++ b/fpdfsdk/pwl/cpwl_list_box.cpp
@@ -103,22 +103,22 @@
switch (nChar) {
case FWL_VKEY_Up:
- m_pListCtrl->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_UP(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Down:
- m_pListCtrl->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_DOWN(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Home:
- m_pListCtrl->OnVK_HOME(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_HOME(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Left:
- m_pListCtrl->OnVK_LEFT(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_LEFT(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_End:
- m_pListCtrl->OnVK_END(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_END(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Right:
- m_pListCtrl->OnVK_RIGHT(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_RIGHT(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
case FWL_VKEY_Delete:
break;
@@ -130,7 +130,7 @@
bool CPWL_ListBox::OnChar(uint16_t nChar, uint32_t nFlag) {
CPWL_Wnd::OnChar(nChar, nFlag);
- if (!m_pListCtrl->OnChar(nChar, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag)))
+ if (!m_pListCtrl->OnChar(nChar, IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag)))
return false;
OnNotifySelectionChanged(true, nFlag);
@@ -145,8 +145,8 @@
SetFocus();
SetCapture();
- m_pListCtrl->OnMouseDown(point, IsSHIFTpressed(nFlag),
- IsCTRLpressed(nFlag));
+ m_pListCtrl->OnMouseDown(point, IsSHIFTKeyDown(nFlag),
+ IsCTRLKeyDown(nFlag));
}
return true;
@@ -173,8 +173,8 @@
if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point))
m_pListCtrl->Select(m_pListCtrl->GetItemIndex(point));
if (m_bMouseDown)
- m_pListCtrl->OnMouseMove(point, IsSHIFTpressed(nFlag),
- IsCTRLpressed(nFlag));
+ m_pListCtrl->OnMouseMove(point, IsSHIFTKeyDown(nFlag),
+ IsCTRLKeyDown(nFlag));
return true;
}
@@ -365,9 +365,9 @@
const CFX_PointF& point,
const CFX_Vector& delta) {
if (delta.y < 0)
- m_pListCtrl->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_DOWN(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
else
- m_pListCtrl->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
+ m_pListCtrl->OnVK_UP(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
OnNotifySelectionChanged(false, nFlag);
return true;
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index 60afe1d..8667512 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -274,16 +274,6 @@
bool IsWndCaptureMouse(const CPWL_Wnd* pWnd) const;
bool IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const;
- static bool IsCTRLpressed(uint32_t nFlag) {
- return CPWL_Wnd::IsCTRLKeyDown(nFlag);
- }
- static bool IsSHIFTpressed(uint32_t nFlag) {
- return CPWL_Wnd::IsSHIFTKeyDown(nFlag);
- }
- static bool IsALTpressed(uint32_t nFlag) {
- return CPWL_Wnd::IsALTKeyDown(nFlag);
- }
-
private:
void DrawChildAppearance(CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device);
