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

remove deprecated warning

This commit is contained in:
andyque 2014-09-12 17:06:13 +08:00
parent db1505ca1a
commit d4b2e8d154
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/CCSGUIReader.cpp
View File

@ -1097,7 +1097,7 @@ void WidgetPropertiesReader0250::setPropsForTextFieldFromJsonDictionary(Widget*w
{
textField->setPlaceHolder(DICTOOL->getStringValue_json(options, "placeHolder"));
}
textField->setText(DICTOOL->getStringValue_json(options, "text"));
textField->setString(DICTOOL->getStringValue_json(options, "text"));
bool fs = DICTOOL->checkObjectExist_json(options, "fontSize");
if (fs)
{

4
cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp
View File

@ -63,7 +63,7 @@ namespace cocostudio
else if(key == P_PlaceHolder){
textField->setPlaceHolder(value);
}else if(key == P_Text){
textField->setText(value);
textField->setString(value);
}else if(key == P_FontSize){
textField->setFontSize(valueToInt(value));
}else if(key == P_FontName){
@ -96,7 +96,7 @@ namespace cocostudio
{
textField->setPlaceHolder(DICTOOL->getStringValue_json(options, P_PlaceHolder,"input words here"));
}
textField->setText(DICTOOL->getStringValue_json(options, P_Text,"Text Tield"));
textField->setString(DICTOOL->getStringValue_json(options, P_Text,"Text Tield"));
textField->setFontSize(DICTOOL->getIntValue_json(options, P_FontSize,20));

2
cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp
View File

@ -77,7 +77,7 @@ const char* CCBProxy::getNodeTypeName(Node* pNode)
return "cc.LayerColor";
}
if (NULL != dynamic_cast<Scale9Sprite*>(pNode)) {
if (NULL != dynamic_cast<ui::Scale9Sprite*>(pNode)) {
return "cc.LayerGradient";
}