Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 

Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
This commit is contained in:
zifter 2014-05-17 10:40:36 +03:00
parent eb457a1c91 249dffa346
commit d875f27c67
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCLabelBMFont.cpp
View File

@ -181,7 +181,7 @@ const BlendFunc &LabelBMFont::getBlendFunc() const
return _label->getBlendFunc();
}
Node* LabelBMFont::getChildByTag(int tag)
Node* LabelBMFont::getChildByTag(int tag) const
{
return _label->getLetter(tag);
}

2
cocos/2d/CCLabelBMFont.h
View File

@ -115,7 +115,7 @@ public:
virtual const BlendFunc &getBlendFunc() const override;
virtual Sprite * getLetter(int ID);
virtual Node * getChildByTag(int tag) override;
virtual Node * getChildByTag(int tag) const override;
virtual void setColor(const Color3B& color) override;

2
cocos/2d/CCNode.cpp
View File

@ -718,7 +718,7 @@ void Node::childrenAlloc(void)
_children.reserve(4);
}
Node* Node::getChildByTag(int tag)
Node* Node::getChildByTag(int tag) const
{
CCASSERT( tag != Node::INVALID_TAG, "Invalid tag");

2
cocos/2d/CCNode.h
View File

@ -643,7 +643,7 @@ public:
*
* @return a Node object whose tag equals to the input parameter
*/
virtual Node * getChildByTag(int tag);
virtual Node * getChildByTag(int tag) const;
/**
* Returns the array of the node's children
*

2
cocos/ui/UIListView.h
View File

@ -196,7 +196,7 @@ protected:
virtual Vector<Node*>& getChildren() override{return ScrollView::getChildren();};
virtual const Vector<Node*>& getChildren() const override{return ScrollView::getChildren();};
virtual ssize_t getChildrenCount() const override {return ScrollView::getChildrenCount();};
virtual Node * getChildByTag(int tag) override {return ScrollView::getChildByTag(tag);};
virtual Node * getChildByTag(int tag) const override {return ScrollView::getChildByTag(tag);};
virtual Widget* getChildByName(const std::string& name) override {return ScrollView::getChildByName(name);};
void updateInnerContainerSize();
void remedyLayoutParameter(Widget* item);

2
cocos/ui/UIPageView.h
View File

@ -183,7 +183,7 @@ protected:
virtual Vector<Node*>& getChildren() override{return Widget::getChildren();};
virtual const Vector<Node*>& getChildren() const override{return Widget::getChildren();};
virtual ssize_t getChildrenCount() const override {return Widget::getChildrenCount();};
virtual Node * getChildByTag(int tag) override {return Widget::getChildByTag(tag);};
virtual Node * getChildByTag(int tag) const override {return Widget::getChildByTag(tag);};
virtual Widget* getChildByName(const std::string& name) override {return Widget::getChildByName(name);};
Layout* createPage();

2
cocos/ui/UIScrollView.cpp
View File

@ -301,7 +301,7 @@ ssize_t ScrollView::getChildrenCount() const
return _innerContainer->getChildrenCount();
}
Node* ScrollView::getChildByTag(int tag)
Node* ScrollView::getChildByTag(int tag) const
{
return _innerContainer->getChildByTag(tag);
}

2
cocos/ui/UIScrollView.h
View File

@ -296,7 +296,7 @@ public:
virtual ssize_t getChildrenCount() const override;
virtual Node * getChildByTag(int tag) override;
virtual Node * getChildByTag(int tag) const override;
virtual Widget* getChildByName(const std::string& name) override;