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

Merge pull request #713 from dumganhar/iss951_rm_NSMutableSet 

fixed #951: removed definition of NSMutableSet.
This commit is contained in:
dumganhar 2012-02-06 23:37:29 -08:00
parent 29c18c67ca ca94a11190
commit 437f27ff47
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/include/CCSet.h
View File

@ -80,7 +80,6 @@ private:
std::set<CCObject *> *m_pSet;
};
typedef CCSet NSMutableSet;
}//namespace cocos2d
#endif // __NS_SET_H__

4
cocos2dx/include/CCTouchHandler.h
View File

@ -95,7 +95,7 @@ public:
void setSwallowsTouches(bool bSwallowsTouches);
/** MutableSet that contains the claimed touches */
NSMutableSet* getClaimedTouches(void);
CCSet* getClaimedTouches(void);
/** initializes a TargetedTouchHandler with a delegate, a priority and whether or not it swallows touches or not */
bool initWithDelegate(CCTouchDelegate *pDelegate, int nPriority, bool bSwallow);
@ -106,7 +106,7 @@ public:
protected:
bool m_bSwallowsTouches;
NSMutableSet *m_pClaimedTouches;
CCSet *m_pClaimedTouches;
};
}//namespace cocos2d

4
cocos2dx/touch_dispatcher/CCTouchHandler.cpp
View File

@ -191,7 +191,7 @@ void CCTargetedTouchHandler::setSwallowsTouches(bool bSwallowsTouches)
m_bSwallowsTouches = bSwallowsTouches;
}
NSMutableSet* CCTargetedTouchHandler::getClaimedTouches(void)
CCSet* CCTargetedTouchHandler::getClaimedTouches(void)
{
return m_pClaimedTouches;
}
@ -218,7 +218,7 @@ bool CCTargetedTouchHandler::initWithDelegate(CCTouchDelegate *pDelegate, int nP
{
if (CCTouchHandler::initWithDelegate(pDelegate, nPriority))
{
m_pClaimedTouches = new NSMutableSet();
m_pClaimedTouches = new CCSet();
m_bSwallowsTouches = bSwallow;
return true;