From 218a37894a58cd23eb764aec96ff21331b6e68cc Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 17 Nov 2016 14:42:46 -0800 Subject: Remove IFWL_ToolTipDP There are no longer any classes which implement this interface. Remove interface. Review-Url: https://codereview.chromium.org/2511183002 --- xfa/fwl/core/ifwl_tooltip.cpp | 16 ++-------------- xfa/fwl/core/ifwl_tooltip.h | 12 ------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/xfa/fwl/core/ifwl_tooltip.cpp b/xfa/fwl/core/ifwl_tooltip.cpp index 5ee594cc32..034ac56e05 100644 --- a/xfa/fwl/core/ifwl_tooltip.cpp +++ b/xfa/fwl/core/ifwl_tooltip.cpp @@ -50,10 +50,8 @@ void IFWL_ToolTip::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) { m_pProperties->m_pThemeProvider = GetAvailableTheme(); CFX_WideString wsCaption; - IFWL_ToolTipDP* pData = - static_cast(m_pProperties->m_pDataProvider); - if (pData) - pData->GetCaption(this, wsCaption); + if (m_pProperties->m_pDataProvider) + m_pProperties->m_pDataProvider->GetCaption(this, wsCaption); int32_t iLen = wsCaption.GetLength(); if (iLen > 0) { @@ -154,16 +152,6 @@ void IFWL_ToolTip::UpdateTextOutStyles() { m_dwTTOStyles &= ~FDE_TTOSTYLE_SingleLine; } -void IFWL_ToolTip::SetStates(uint32_t dwStates, bool bSet) { - if ((dwStates & FWL_WGTSTATE_Invisible) && !bSet) { - IFWL_ToolTipDP* pData = - static_cast(m_pProperties->m_pDataProvider); - int32_t nAutoPopDelay = pData->GetAutoPopDelay(this); - m_pTimerInfoHide = m_TimerHide.StartTimer(nAutoPopDelay, false); - } - IFWL_Widget::SetStates(dwStates, bSet); -} - void IFWL_ToolTip::RefreshToolTipPos() { if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_TTP_NoAnchor) == 0) { CFX_RectF rtPopup; diff --git a/xfa/fwl/core/ifwl_tooltip.h b/xfa/fwl/core/ifwl_tooltip.h index d5e70cd866..cb3eab1740 100644 --- a/xfa/fwl/core/ifwl_tooltip.h +++ b/xfa/fwl/core/ifwl_tooltip.h @@ -12,7 +12,6 @@ class CFWL_WidgetProperties; class IFWL_Widget; -class CFWL_ToolTipImpDelegate; #define FWL_STYLEEXT_TTP_Rectangle (0L << 3) #define FWL_STYLEEXT_TTP_RoundCorner (1L << 3) @@ -20,17 +19,6 @@ class CFWL_ToolTipImpDelegate; #define FWL_STYLEEXT_TTP_Multiline (1L << 5) #define FWL_STYLEEXT_TTP_NoAnchor (1L << 6) -class IFWL_ToolTipDP : public IFWL_DataProvider { - public: - // IFWL_DataProvider - void GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption) override = 0; - - virtual int32_t GetInitialDelay(IFWL_Widget* pWidget) = 0; - virtual int32_t GetAutoPopDelay(IFWL_Widget* pWidget) = 0; - virtual CFX_DIBitmap* GetToolTipIcon(IFWL_Widget* pWidget) = 0; - virtual CFX_SizeF GetToolTipIconSize(IFWL_Widget* pWidget) = 0; -}; - class IFWL_ToolTip : public IFWL_Form { public: IFWL_ToolTip(const IFWL_App* app, -- cgit v1.2.3