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

Merge pull request #5750 from CocosRobot/update_lua_bindings_1394681799 

[AUTO]: updating luabinding automatically
This commit is contained in:
James Chen 2014-03-13 11:39:10 +08:00
parent 91e8032f25 e3c6497c2b
commit 3f3325494a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/scripting/lua-bindings/auto/api/Widget.lua
View File

@ -47,6 +47,11 @@
-- @param self -- @param self
-- @return array_table#array_table ret (return value: array_table) -- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Widget] getLayoutSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
-------------------------------- --------------------------------
-- @function [parent=#Widget] setPositionType -- @function [parent=#Widget] setPositionType
-- @param self -- @param self
@ -63,8 +68,13 @@
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
-------------------------------- --------------------------------
-- overload function: updateSizeAndPosition(size_table)
--
-- overload function: updateSizeAndPosition()
--
-- @function [parent=#Widget] updateSizeAndPosition -- @function [parent=#Widget] updateSizeAndPosition
-- @param self -- @param self
-- @param #size_table size
-------------------------------- --------------------------------
-- @function [parent=#Widget] getBottomInParent -- @function [parent=#Widget] getBottomInParent

2
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp.REMOVED.git-id
View File

@ -1 +1 @@
c9cf8f3050b95aec88a2452e60fe492252ad30c3 d0b810bd90f5639ba15e03fc5e083b762225a16d

1
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
View File

@ -346,6 +346,7 @@ int register_all_cocos2dx_ui(lua_State* tolua_S);
#endif // __cocos2dx_ui_h__ #endif // __cocos2dx_ui_h__