From d3d42f12c4d12562c0b185750d3b6c31d4aacce8 Mon Sep 17 00:00:00 2001 From: simdm Date: Thu, 5 Jul 2012 00:49:51 +0800 Subject: [PATCH] fixed #1081 cocosbuilder , error when loading CCControlButton from ccbi --- .../extensions/CCBReader/CCControlButtonLoader.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cocos2dx/extensions/CCBReader/CCControlButtonLoader.cpp b/cocos2dx/extensions/CCBReader/CCControlButtonLoader.cpp index 65d1d4af0f..586aa9ab44 100644 --- a/cocos2dx/extensions/CCBReader/CCControlButtonLoader.cpp +++ b/cocos2dx/extensions/CCBReader/CCControlButtonLoader.cpp @@ -6,21 +6,21 @@ USING_NS_CC_EXT; #define PROPERTY_ZOOMONTOUCHDOWN "zoomOnTouchDown" #define PROPERTY_TITLE_NORMAL "title|1" #define PROPERTY_TITLE_HIGHLIGHTED "title|2" -#define PROPERTY_TITLE_DISABLED "title|3" +#define PROPERTY_TITLE_DISABLED "title|4" #define PROPERTY_TITLECOLOR_NORMAL "titleColor|1" #define PROPERTY_TITLECOLOR_HIGHLIGHTED "titleColor|2" -#define PROPERTY_TITLECOLOR_DISABLED "titleColor|3" +#define PROPERTY_TITLECOLOR_DISABLED "titleColor|4" #define PROPERTY_TITLETTF_NORMAL "titleTTF|1" #define PROPERTY_TITLETTF_HIGHLIGHTED "titleTTF|2" -#define PROPERTY_TITLETTF_DISABLED "titleTTF|3" +#define PROPERTY_TITLETTF_DISABLED "titleTTF|4" #define PROPERTY_TITLETTFSIZE_NORMAL "titleTTFSize|1" #define PROPERTY_TITLETTFSIZE_HIGHLIGHTED "titleTTFSize|2" -#define PROPERTY_TITLETTFSIZE_DISABLED "titleTTFSize|3" +#define PROPERTY_TITLETTFSIZE_DISABLED "titleTTFSize|4" #define PROPERTY_LABELANCHORPOINT "labelAnchorPoint" #define PROPERTY_PREFEREDSIZE "preferedSize" // TODO Should be "preferredSize". This is a typo in cocos2d-iphone, cocos2d-x and CocosBuilder! #define PROPERTY_BACKGROUNDSPRITEFRAME_NORMAL "backgroundSpriteFrame|1" #define PROPERTY_BACKGROUNDSPRITEFRAME_HIGHLIGHTED "backgroundSpriteFrame|2" -#define PROPERTY_BACKGROUNDSPRITEFRAME_DISABLED "backgroundSpriteFrame|3" +#define PROPERTY_BACKGROUNDSPRITEFRAME_DISABLED "backgroundSpriteFrame|4" void CCControlButtonLoader::onHandlePropTypeCheck(CCNode * pNode, CCNode * pParent, CCString * pPropertyName, bool pCheck, CCBReader * pCCBReader) { if(pPropertyName->compare(PROPERTY_ZOOMONTOUCHDOWN) == 0) {