From 2b44441b1b01a809b6f14d44d64db9a52808cba9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 6 Jul 2017 13:56:35 -0400 Subject: Rename OnNotifySelChanged to OnNotifySelectionChanged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I346bfb986754e7530bbfa5be0057422d968e0631 Reviewed-on: https://pdfium-review.googlesource.com/7338 Reviewed-by: Tom Sepez Reviewed-by: Nicolás Peña Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fpdfsdk/pdfwindow/cpwl_combo_box.cpp | 6 +++--- fpdfsdk/pdfwindow/cpwl_list_box.cpp | 10 +++++----- fpdfsdk/pdfwindow/cpwl_list_box.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp b/fpdfsdk/pdfwindow/cpwl_combo_box.cpp index 792524b950..140aff84c0 100644 --- a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp +++ b/fpdfsdk/pdfwindow/cpwl_combo_box.cpp @@ -40,7 +40,7 @@ bool CPWL_CBListBox::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) { if (CPWL_Wnd* pParent = GetParentWindow()) pParent->NotifyLButtonUp(this, point); - return !OnNotifySelChanged(false, nFlag); + return !OnNotifySelectionChanged(false, nFlag); } bool CPWL_CBListBox::IsMovementKey(uint16_t nChar) const { @@ -80,7 +80,7 @@ bool CPWL_CBListBox::OnMovementKeyDown(uint16_t nChar, uint32_t nFlag) { m_pList->OnVK_RIGHT(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag)); break; } - return OnNotifySelChanged(true, nFlag); + return OnNotifySelectionChanged(true, nFlag); } bool CPWL_CBListBox::IsChar(uint16_t nChar, uint32_t nFlag) const { @@ -91,7 +91,7 @@ bool CPWL_CBListBox::OnCharNotify(uint16_t nChar, uint32_t nFlag) { if (CPWL_ComboBox* pComboBox = (CPWL_ComboBox*)GetParentWindow()) pComboBox->SetSelectText(); - return OnNotifySelChanged(true, nFlag); + return OnNotifySelectionChanged(true, nFlag); } void CPWL_CBButton::GetThisAppearanceStream(std::ostringstream* psAppStream) { diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.cpp b/fpdfsdk/pdfwindow/cpwl_list_box.cpp index e3a2e77b94..61f9aafa8f 100644 --- a/fpdfsdk/pdfwindow/cpwl_list_box.cpp +++ b/fpdfsdk/pdfwindow/cpwl_list_box.cpp @@ -223,7 +223,7 @@ bool CPWL_ListBox::OnKeyDown(uint16_t nChar, uint32_t nFlag) { case FWL_VKEY_Delete: break; } - OnNotifySelChanged(true, nFlag); + OnNotifySelectionChanged(true, nFlag); return true; } @@ -233,7 +233,7 @@ bool CPWL_ListBox::OnChar(uint16_t nChar, uint32_t nFlag) { if (!m_pList->OnChar(nChar, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag))) return false; - OnNotifySelChanged(true, nFlag); + OnNotifySelectionChanged(true, nFlag); return true; } @@ -258,7 +258,7 @@ bool CPWL_ListBox::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) { ReleaseCapture(); m_bMouseDown = false; } - OnNotifySelChanged(false, nFlag); + OnNotifySelectionChanged(false, nFlag); return true; } @@ -301,7 +301,7 @@ void CPWL_ListBox::RePosChildWnd() { m_pList->SetPlateRect(GetListRect()); } -bool CPWL_ListBox::OnNotifySelChanged(bool bKeyDown, uint32_t nFlag) { +bool CPWL_ListBox::OnNotifySelectionChanged(bool bKeyDown, uint32_t nFlag) { if (!m_pFillerNotify) return false; @@ -417,6 +417,6 @@ bool CPWL_ListBox::OnMouseWheel(short zDelta, else m_pList->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag)); - OnNotifySelChanged(false, nFlag); + OnNotifySelectionChanged(false, nFlag); return true; } diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.h b/fpdfsdk/pdfwindow/cpwl_list_box.h index d4581c066e..f5835a1d9c 100644 --- a/fpdfsdk/pdfwindow/cpwl_list_box.h +++ b/fpdfsdk/pdfwindow/cpwl_list_box.h @@ -70,7 +70,7 @@ class CPWL_ListBox : public CPWL_Wnd { virtual CFX_WideString GetText() const; - bool OnNotifySelChanged(bool bKeyDown, uint32_t nFlag); + bool OnNotifySelectionChanged(bool bKeyDown, uint32_t nFlag); void AddString(const CFX_WideString& str); void SetTopVisibleIndex(int32_t nItemIndex); -- cgit v1.2.3