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

Merge pull request #11431 from CocosRobot/update_lua_bindings_1429000943 

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2015-04-14 17:03:10 +08:00
parent fe207fe8e0 0e4a209241
commit caf308f061
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/lua-bindings/auto/api/Button.lua
View File

@ -36,7 +36,7 @@
-- @return Label#Label ret (return value: cc.Label)
--------------------------------
-- brief Return a zoom scale <br>
-- brief Return a zoom scale<br>
-- return the zoom scale in float<br>
-- since v3.3
-- @function [parent=#Button] getZoomScale

4
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
View File

@ -5871,7 +5871,7 @@ int lua_cocos2dx_ui_Button_getTitleText(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getTitleText'", nullptr);
return 0;
}
const std::string& ret = cobj->getTitleText();
const std::string ret = cobj->getTitleText();
tolua_pushcppstring(tolua_S,ret);
return 1;
}
@ -6994,7 +6994,7 @@ int lua_cocos2dx_ui_Button_getTitleFontName(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getTitleFontName'", nullptr);
return 0;
}
const std::string& ret = cobj->getTitleFontName();
const std::string ret = cobj->getTitleFontName();
tolua_pushcppstring(tolua_S,ret);
return 1;
}