| Index: xfa/fwl/core/fwl_formimp.cpp
|
| diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp
|
| index 815aca974c6c499593145c338f0dee1b60ba456a..2fd85a8d0eb7d74fcc11dd9af1edea935df5dea2 100644
|
| --- a/xfa/fwl/core/fwl_formimp.cpp
|
| +++ b/xfa/fwl/core/fwl_formimp.cpp
|
| @@ -471,25 +471,19 @@ void CFWL_FormImp::ShowChildWidget(IFWL_Widget* pParent) {
|
| pChild = pWidgetMgr->GetWidget(pChild, FWL_WGTRELATION_NextSibling);
|
| }
|
| }
|
| +
|
| void CFWL_FormImp::RemoveSysButtons() {
|
| m_rtCaption.Reset();
|
| - if (m_pCloseBox) {
|
| - delete m_pCloseBox;
|
| - m_pCloseBox = NULL;
|
| - }
|
| - if (m_pMinBox) {
|
| - delete m_pMinBox;
|
| - m_pMinBox = NULL;
|
| - }
|
| - if (m_pMaxBox) {
|
| - delete m_pMaxBox;
|
| - m_pMaxBox = NULL;
|
| - }
|
| - if (m_pCaptionBox) {
|
| - delete m_pCaptionBox;
|
| - m_pCaptionBox = NULL;
|
| - }
|
| + delete m_pCloseBox;
|
| + m_pCloseBox = nullptr;
|
| + delete m_pMinBox;
|
| + m_pMinBox = nullptr;
|
| + delete m_pMaxBox;
|
| + m_pMaxBox = nullptr;
|
| + delete m_pCaptionBox;
|
| + m_pCaptionBox = nullptr;
|
| }
|
| +
|
| void CFWL_FormImp::CalcContentRect(CFX_RectF& rtContent) {
|
| #ifdef FWL_UseMacSystemBorder
|
| rtContent = m_rtRelative;
|
|
|