Index: xfa/fwl/core/fwl_widgetimp.cpp |
diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp |
index e72a7f385a0b7fe4ef6223dbe8490e223574b507..697f0b4e7e79da256da32b5c686d61f9b899558c 100644 |
--- a/xfa/fwl/core/fwl_widgetimp.cpp |
+++ b/xfa/fwl/core/fwl_widgetimp.cpp |
@@ -308,7 +308,7 @@ void CFWL_WidgetImp::SetStates(uint32_t dwStates, FX_BOOL bSet) { |
CFWL_NoteDriver* noteDriver = |
static_cast<CFWL_NoteDriver*>(GetOwnerApp()->GetNoteDriver()); |
- IFWL_WidgetMgr* widgetMgr = FWL_GetWidgetMgr(); |
+ IFWL_WidgetMgr* widgetMgr = IFWL_WidgetMgr::GetInstance(); |
noteDriver->NotifyTargetHide(m_pInterface); |
IFWL_Widget* child = |
widgetMgr->GetWidget(m_pInterface, FWL_WGTRELATION_FirstChild); |
@@ -517,7 +517,7 @@ CFWL_WidgetImp::CFWL_WidgetImp(const CFWL_WidgetImpProperties& properties, |
m_pInterface(NULL), |
m_iLock(0) { |
*m_pProperties = properties; |
- m_pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr()); |
+ m_pWidgetMgr = static_cast<CFWL_WidgetMgr*>(IFWL_WidgetMgr::GetInstance()); |
ASSERT(m_pWidgetMgr != NULL); |
} |
CFWL_WidgetImp::~CFWL_WidgetImp() { |
@@ -929,7 +929,7 @@ CFX_SizeF CFWL_WidgetImp::GetOffsetFromParent(IFWL_Widget* pParent) { |
if (pParent == GetInterface()) |
return CFX_SizeF(); |
- IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); |
+ IFWL_WidgetMgr* pWidgetMgr = IFWL_WidgetMgr::GetInstance(); |
if (!pWidgetMgr) |
return CFX_SizeF(); |