Index: xfa/fwl/lightwidget/cfwl_tooltip.cpp |
diff --git a/xfa/fwl/lightwidget/cfwl_tooltip.cpp b/xfa/fwl/lightwidget/cfwl_tooltip.cpp |
index efb61ce018e0a7c50c350a2e046b23631bc7edea..7a9a26cf9ed098b3baae92508a052ad2f129e884 100644 |
--- a/xfa/fwl/lightwidget/cfwl_tooltip.cpp |
+++ b/xfa/fwl/lightwidget/cfwl_tooltip.cpp |
@@ -16,79 +16,73 @@ CFWL_ToolTip* CFWL_ToolTip::Create() { |
return new CFWL_ToolTip; |
} |
-FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) { |
+FWL_Error CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) { |
if (m_pIface) |
- return FWL_ERR_Indefinite; |
+ return FWL_Error::Indefinite; |
if (pProperties) { |
*m_pProperties = *pProperties; |
} |
std::unique_ptr<IFWL_ToolTip> pToolTip(IFWL_ToolTip::Create( |
m_pProperties->MakeWidgetImpProperties(&m_tooltipData), nullptr)); |
- FWL_ERR ret = pToolTip->Initialize(); |
- if (ret != FWL_ERR_Succeeded) { |
+ FWL_Error ret = pToolTip->Initialize(); |
+ if (ret != FWL_Error::Succeeded) { |
return ret; |
} |
m_pIface = pToolTip.release(); |
CFWL_Widget::Initialize(); |
- return FWL_ERR_Succeeded; |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_ToolTip::GetCaption(CFX_WideString& wsCaption) { |
+void CFWL_ToolTip::GetCaption(CFX_WideString& wsCaption) { |
wsCaption = m_tooltipData.m_wsCaption; |
- return FWL_ERR_Succeeded; |
} |
-FWL_ERR CFWL_ToolTip::SetCaption(const CFX_WideStringC& wsCaption) { |
+void CFWL_ToolTip::SetCaption(const CFX_WideStringC& wsCaption) { |
m_tooltipData.m_wsCaption = wsCaption; |
- return FWL_ERR_Succeeded; |
} |
int32_t CFWL_ToolTip::GetInitialDelay() { |
return m_tooltipData.m_nInitDelayTime; |
} |
-int32_t CFWL_ToolTip::SetInitialDelay(int32_t nDelayTime) { |
+void CFWL_ToolTip::SetInitialDelay(int32_t nDelayTime) { |
m_tooltipData.m_nInitDelayTime = nDelayTime; |
- return FWL_ERR_Succeeded; |
} |
int32_t CFWL_ToolTip::GetAutoPopDelay() { |
return m_tooltipData.m_nAutoPopDelayTime; |
} |
-int32_t CFWL_ToolTip::SetAutoPopDelay(int32_t nDelayTime) { |
+void CFWL_ToolTip::SetAutoPopDelay(int32_t nDelayTime) { |
m_tooltipData.m_nAutoPopDelayTime = nDelayTime; |
- return FWL_ERR_Succeeded; |
} |
CFX_DIBitmap* CFWL_ToolTip::GetToolTipIcon() { |
return m_tooltipData.m_pBitmap; |
} |
-FWL_ERR CFWL_ToolTip::SetToolTipIcon(CFX_DIBitmap* pBitmap) { |
+void CFWL_ToolTip::SetToolTipIcon(CFX_DIBitmap* pBitmap) { |
m_tooltipData.m_pBitmap = pBitmap; |
- return FWL_ERR_Succeeded; |
} |
CFX_SizeF CFWL_ToolTip::GetToolTipIconSize() { |
return m_tooltipData.m_fIconSize; |
} |
-FWL_ERR CFWL_ToolTip::SetToolTipIconSize(CFX_SizeF fSize) { |
+void CFWL_ToolTip::SetToolTipIconSize(CFX_SizeF fSize) { |
m_tooltipData.m_fIconSize = fSize; |
- return FWL_ERR_Succeeded; |
} |
-FWL_ERR CFWL_ToolTip::SetAnchor(const CFX_RectF& rtAnchor) { |
- return static_cast<IFWL_ToolTip*>(m_pIface)->SetAnchor(rtAnchor); |
+void CFWL_ToolTip::SetAnchor(const CFX_RectF& rtAnchor) { |
+ static_cast<IFWL_ToolTip*>(m_pIface)->SetAnchor(rtAnchor); |
} |
-FWL_ERR CFWL_ToolTip::Show() { |
- return static_cast<IFWL_ToolTip*>(m_pIface)->Show(); |
+void CFWL_ToolTip::Show() { |
+ static_cast<IFWL_ToolTip*>(m_pIface)->Show(); |
} |
-FWL_ERR CFWL_ToolTip::Hide() { |
- return static_cast<IFWL_ToolTip*>(m_pIface)->Hide(); |
+void CFWL_ToolTip::Hide() { |
+ static_cast<IFWL_ToolTip*>(m_pIface)->Hide(); |
} |
CFWL_ToolTip::CFWL_ToolTip() {} |
@@ -102,10 +96,10 @@ CFWL_ToolTip::CFWL_ToolTipDP::CFWL_ToolTipDP() : m_pBitmap(NULL) { |
m_fAnchor.Set(0.0, 0.0, 0.0, 0.0); |
} |
-FWL_ERR CFWL_ToolTip::CFWL_ToolTipDP::GetCaption(IFWL_Widget* pWidget, |
- CFX_WideString& wsCaption) { |
+FWL_Error CFWL_ToolTip::CFWL_ToolTipDP::GetCaption(IFWL_Widget* pWidget, |
+ CFX_WideString& wsCaption) { |
wsCaption = m_wsCaption; |
- return FWL_ERR_Succeeded; |
+ return FWL_Error::Succeeded; |
} |
int32_t CFWL_ToolTip::CFWL_ToolTipDP::GetInitialDelay(IFWL_Widget* pWidget) { |