| Index: xfa/fwl/core/fwl_formimp.cpp
|
| diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp
|
| index bcaba2c1536f38dcccf3f0a9282c239423b57e5f..e5536a4551c145fddae526c84cb05aa90ad3874f 100644
|
| --- a/xfa/fwl/core/fwl_formimp.cpp
|
| +++ b/xfa/fwl/core/fwl_formimp.cpp
|
| @@ -616,7 +616,8 @@ void CFWL_FormImp::GetEdgeRect(CFX_RectF& rtEdge) {
|
| }
|
| void CFWL_FormImp::SetWorkAreaRect() {
|
| m_rtRestore = m_pProperties->m_rtWidget;
|
| - CFWL_WidgetMgr* pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
|
| + CFWL_WidgetMgr* pWidgetMgr =
|
| + static_cast<CFWL_WidgetMgr*>(IFWL_WidgetMgr::GetInstance());
|
| if (!pWidgetMgr)
|
| return;
|
| m_bSetMaximize = TRUE;
|
| @@ -765,7 +766,8 @@ FX_BOOL CFWL_FormImp::HasIcon() {
|
| return !!pData->GetIcon(m_pInterface, FALSE);
|
| }
|
| void CFWL_FormImp::UpdateIcon() {
|
| - CFWL_WidgetMgr* pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
|
| + CFWL_WidgetMgr* pWidgetMgr =
|
| + static_cast<CFWL_WidgetMgr*>(IFWL_WidgetMgr::GetInstance());
|
| if (!pWidgetMgr)
|
| return;
|
| IFWL_FormDP* pData =
|
| @@ -778,7 +780,8 @@ void CFWL_FormImp::UpdateIcon() {
|
| m_pSmallIcon = pSmallIcon;
|
| }
|
| void CFWL_FormImp::UpdateCaption() {
|
| - CFWL_WidgetMgr* pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
|
| + CFWL_WidgetMgr* pWidgetMgr =
|
| + static_cast<CFWL_WidgetMgr*>(IFWL_WidgetMgr::GetInstance());
|
| if (!pWidgetMgr)
|
| return;
|
| IFWL_FormDP* pData =
|
| @@ -936,7 +939,7 @@ void CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
|
| }
|
| case CFWL_MessageType::Size: {
|
| CFWL_WidgetMgr* pWidgetMgr =
|
| - static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
|
| + static_cast<CFWL_WidgetMgr*>(IFWL_WidgetMgr::GetInstance());
|
| if (!pWidgetMgr)
|
| return;
|
|
|
|
|