From e50184c087ee6f90568ad1166a55f5d25be4d09e Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 22 Nov 2016 09:34:44 -0800 Subject: Rename common methods between ifwl and cfwl. This CL renames some methods in IFWL which have the same name as the CFWL methods but the CFWL methods are not proxy methods. Review-Url: https://codereview.chromium.org/2520413002 --- xfa/fwl/core/ifwl_listbox.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/ifwl_listbox.h') diff --git a/xfa/fwl/core/ifwl_listbox.h b/xfa/fwl/core/ifwl_listbox.h index ec6587460b..b6c0b8266b 100644 --- a/xfa/fwl/core/ifwl_listbox.h +++ b/xfa/fwl/core/ifwl_listbox.h @@ -98,13 +98,13 @@ class IFWL_ListBox : public IFWL_Widget { CFWL_ListItem* GetSelItem(int32_t nIndexSel); int32_t GetSelIndex(int32_t nIndex); void SetSelItem(CFWL_ListItem* hItem, bool bSelect = true); - void GetItemText(CFWL_ListItem* hItem, CFX_WideString& wsText); + void GetDataProviderItemText(CFWL_ListItem* hItem, CFX_WideString& wsText); FX_FLOAT GetItemHeight() const { return m_fItemHeight; } FX_FLOAT CalcItemHeight(); protected: - CFWL_ListItem* GetItem(CFWL_ListItem* hItem, uint32_t dwKeyCode); + CFWL_ListItem* GetListItem(CFWL_ListItem* hItem, uint32_t dwKeyCode); void SetSelection(CFWL_ListItem* hStart, CFWL_ListItem* hEnd, bool bSelected); CFWL_ListItem* GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy); bool ScrollToVisible(CFWL_ListItem* hItem); @@ -120,7 +120,7 @@ class IFWL_ListBox : public IFWL_Widget { void SelectAll(); CFWL_ListItem* GetFocusedItem(); void SetFocusItem(CFWL_ListItem* hItem); - bool GetItemCheckRect(CFWL_ListItem* hItem, CFX_RectF& rtCheck); + bool GetItemCheckRectInternal(CFWL_ListItem* hItem, CFX_RectF& rtCheck); bool SetItemChecked(CFWL_ListItem* hItem, bool bChecked); bool GetItemChecked(CFWL_ListItem* hItem); void DrawBkground(CFX_Graphics* pGraphics, -- cgit v1.2.3