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

m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default.

This commit is contained in:
tianTian 2013-03-29 16:19:34 +08:00
parent 9144946176
commit 053efa0537
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/GUI/CCControlExtension/CCControl.cpp
View File

@ -37,7 +37,6 @@ NS_CC_EXT_BEGIN
CCControl::CCControl() CCControl::CCControl()
: m_bIsOpacityModifyRGB(false) : m_bIsOpacityModifyRGB(false)
, m_nDefaultTouchPriority(0)
, m_eState(CCControlStateNormal) , m_eState(CCControlStateNormal)
, m_hasVisibleParents(false) , m_hasVisibleParents(false)
, m_bEnabled(false) , m_bEnabled(false)
@ -76,8 +75,7 @@ bool CCControl::init()
setHighlighted(false); setHighlighted(false);
// Set the touch dispatcher priority by default to 1 // Set the touch dispatcher priority by default to 1
setDefaultTouchPriority(1); this->setTouchPriority(1);
this->setTouchPriority(m_nDefaultTouchPriority);
// Initialise the tables // Initialise the tables
m_pDispatchTable = new CCDictionary(); m_pDispatchTable = new CCDictionary();

2
extensions/GUI/CCControlExtension/CCControl.h
View File

@ -91,8 +91,6 @@ class CCControl : public CCLayerRGBA
//CCRGBAProtocol //CCRGBAProtocol
bool m_bIsOpacityModifyRGB; bool m_bIsOpacityModifyRGB;
/** Changes the priority of the button. The lower the number, the higher the priority. */
CC_SYNTHESIZE(int, m_nDefaultTouchPriority, DefaultTouchPriority);
/** The current control state constant. */ /** The current control state constant. */
CC_SYNTHESIZE_READONLY(CCControlState, m_eState, State); CC_SYNTHESIZE_READONLY(CCControlState, m_eState, State);