Merge 4a102c6ace into 1589466076

src/ui/simple/CSimpleFrame.cpp

@@ -64,27 +64,11 @@ CSimpleFrame::CSimpleFrame(CSimpleFrame* parent) : CScriptRegion() {
 }
 
 CSimpleFrame::~CSimpleFrame() {
+    // TODO
+
     this->m_intAC = 3;
 
     this->m_top->UnregisterFrame(this);
-    this->m_top = nullptr;
-
-    if (this->m_titleRegion) {
-        delete this->m_titleRegion;
-    }
-
-    for (int32_t layer = 0; layer < NUM_SIMPLEFRAME_DRAWLAYERS; layer++) {
-        this->m_drawlayers[layer].UnlinkAll();
-
-        if (this->m_batch[layer]) {
-            delete this->m_batch[layer];
-        }
-    }
-
-    while (auto region = this->m_regions.Head()) {
-        this->m_regions.UnlinkNode(region);
-        delete region;
-    }
 
     // TODO
 }

src/ui/simple/CSimpleTop.cpp

@@ -400,18 +400,6 @@ CSimpleTop::CSimpleTop() : CLayoutFrame() {
 CSimpleTop::~CSimpleTop() {
     // TODO
 
-    while (auto frame = this->m_frames.Head()) {
-        this->m_frames.UnlinkNode(frame);
-        delete frame;
-    }
-
-    for (auto& strata : this->m_strata) {
-        delete strata;
-        strata = nullptr;
-    }
-
-    // TODO
-
     this->DisableEvents();
 
     HandleClose(this->m_screenLayer);