Merge pull request cocos2d#13966 from zilongshanren/fix-xcode7-overri…

…de-issue CCScrollView should override removeChild
fumingxing2015 · Sep 21, 2015 · 49f6a86 · 49f6a86
2 parents eec67ea + 1c40f7b
commit 49f6a86
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp
@@ -508,6 +508,29 @@ void ScrollView::addChild(Node * child, int zOrder, int tag)
     }
 }
 
+void ScrollView::removeChild(Node* node, bool cleanup)
+{
+    if(_container != node)
+    {
+        _container->removeChild(node, cleanup);
+    }
+    else
+    {
+        Layer::removeChild(node, cleanup);
+    }
+}
+
+void ScrollView::removeAllChildrenWithCleanup(bool cleanup)
+{
+    _container->removeAllChildrenWithCleanup(cleanup);
+    Layer::removeAllChildrenWithCleanup(cleanup);
+}
+
+void ScrollView::removeAllChildren()
+{
+    removeAllChildrenWithCleanup(true);
+}
+
 void ScrollView::addChild(Node * child, int zOrder, const std::string &name)
 {
     if (_container != child)

diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h
@@ -253,6 +253,9 @@ class CC_EX_DLL  ScrollView : public Layer, public ActionTweenDelegate
     virtual void addChild(Node * child, int zOrder, int tag) override;
     virtual void addChild(Node * child, int zOrder, const std::string &name) override;
 
+    virtual void removeAllChildren() override;
+    virtual void removeAllChildrenWithCleanup(bool cleanup) override;
+    virtual void removeChild(Node* child, bool cleaup = true) override;
     /**
      * CCActionTweenDelegate
      */

diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
@@ -27,6 +27,13 @@ bool TableViewTest::init()
     this->addChild(tableView);
     tableView->reloadData();
 
+    auto testNode = Node::create();
+    testNode->setName("testNode");
+    tableView->addChild(testNode);
+    tableView->removeChild(testNode, true);
+    CCAssert(nullptr == tableView->getChildByName("testNode"), "The added child has been removed!");
+
+
 	tableView = TableView::create(this, Size(60, 250));
 	tableView->setDirection(ScrollView::Direction::VERTICAL);
 	tableView->setPosition(Vec2(winSize.width-150,winSize.height/2-120));