Merge pull request #10891 from CocosRobot/update_lua_bindings_1426489737

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2015-03-16 16:31:51 +08:00
commit 633d3604a3
2 changed files with 56 additions and 45 deletions

View File

@ -118,15 +118,16 @@
-- @return EditBox#EditBox self (return value: ccui.EditBox) -- @return EditBox#EditBox self (return value: ccui.EditBox)
-------------------------------- --------------------------------
-- Set the font color of the placeholder text when the edit box is empty.<br> -- @overload self, color4b_table
-- Not supported on IOS. -- @overload self, color3b_table
-- @function [parent=#EditBox] setPlaceholderFontColor -- @function [parent=#EditBox] setPlaceholderFontColor
-- @param self -- @param self
-- @param #color3b_table color -- @param #color3b_table color
-- @return EditBox#EditBox self (return value: ccui.EditBox) -- @return EditBox#EditBox self (return value: ccui.EditBox)
-------------------------------- --------------------------------
-- Set the font color of the widget's text. -- @overload self, color4b_table
-- @overload self, color3b_table
-- @function [parent=#EditBox] setFontColor -- @function [parent=#EditBox] setFontColor
-- @param self -- @param self
-- @param #color3b_table color -- @param #color3b_table color

View File

@ -22805,18 +22805,14 @@ int lua_cocos2dx_ui_EditBox_setPlaceholderFontColor(lua_State* tolua_S)
int argc = 0; int argc = 0;
cocos2d::ui::EditBox* cobj = nullptr; cocos2d::ui::EditBox* cobj = nullptr;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_Error tolua_err; tolua_Error tolua_err;
#endif #endif
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.EditBox",0,&tolua_err)) goto tolua_lerror; if (!tolua_isusertype(tolua_S,1,"ccui.EditBox",0,&tolua_err)) goto tolua_lerror;
#endif #endif
cobj = (cocos2d::ui::EditBox*)tolua_tousertype(tolua_S,1,0); cobj = (cocos2d::ui::EditBox*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
@ -22824,22 +22820,31 @@ int lua_cocos2dx_ui_EditBox_setPlaceholderFontColor(lua_State* tolua_S)
return 0; return 0;
} }
#endif #endif
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) do{
{ if (argc == 1) {
cocos2d::Color3B arg0; cocos2d::Color4B arg0;
ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.EditBox:setPlaceholderFontColor");
ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.EditBox:setPlaceholderFontColor"); if (!ok) { break; }
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_setPlaceholderFontColor'", nullptr);
return 0;
}
cobj->setPlaceholderFontColor(arg0); cobj->setPlaceholderFontColor(arg0);
lua_settop(tolua_S, 1); lua_settop(tolua_S, 1);
return 1; return 1;
} }
}while(0);
ok = true;
do{
if (argc == 1) {
cocos2d::Color3B arg0;
ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.EditBox:setPlaceholderFontColor");
if (!ok) { break; }
cobj->setPlaceholderFontColor(arg0);
lua_settop(tolua_S, 1);
return 1;
}
}while(0);
ok = true;
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.EditBox:setPlaceholderFontColor",argc, 1); luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.EditBox:setPlaceholderFontColor",argc, 1);
return 0; return 0;
@ -22855,18 +22860,14 @@ int lua_cocos2dx_ui_EditBox_setFontColor(lua_State* tolua_S)
int argc = 0; int argc = 0;
cocos2d::ui::EditBox* cobj = nullptr; cocos2d::ui::EditBox* cobj = nullptr;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_Error tolua_err; tolua_Error tolua_err;
#endif #endif
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.EditBox",0,&tolua_err)) goto tolua_lerror; if (!tolua_isusertype(tolua_S,1,"ccui.EditBox",0,&tolua_err)) goto tolua_lerror;
#endif #endif
cobj = (cocos2d::ui::EditBox*)tolua_tousertype(tolua_S,1,0); cobj = (cocos2d::ui::EditBox*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
@ -22874,22 +22875,31 @@ int lua_cocos2dx_ui_EditBox_setFontColor(lua_State* tolua_S)
return 0; return 0;
} }
#endif #endif
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) do{
{ if (argc == 1) {
cocos2d::Color3B arg0; cocos2d::Color4B arg0;
ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.EditBox:setFontColor");
ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.EditBox:setFontColor"); if (!ok) { break; }
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_setFontColor'", nullptr);
return 0;
}
cobj->setFontColor(arg0); cobj->setFontColor(arg0);
lua_settop(tolua_S, 1); lua_settop(tolua_S, 1);
return 1; return 1;
} }
}while(0);
ok = true;
do{
if (argc == 1) {
cocos2d::Color3B arg0;
ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.EditBox:setFontColor");
if (!ok) { break; }
cobj->setFontColor(arg0);
lua_settop(tolua_S, 1);
return 1;
}
}while(0);
ok = true;
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.EditBox:setFontColor",argc, 1); luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.EditBox:setFontColor",argc, 1);
return 0; return 0;