diff --git a/cocos/network/HttpRequest.h b/cocos/network/HttpRequest.h
index 1e13f9d1e6..c4255189da 100644
--- a/cocos/network/HttpRequest.h
+++ b/cocos/network/HttpRequest.h
@@ -142,9 +142,9 @@ public:
* Set the url address of HttpRequest object.
* The url value could be like these: "http://httpbin.org/ip" or "https://httpbin.org/get"
*
- * @param url the string pointer.
+ * @param url the string object.
*/
- inline void setUrl(const char* url)
+ inline void setUrl(const std::string& url)
{
_url = url;
};
@@ -194,9 +194,9 @@ public:
* Set a string tag to identify your request.
* This tag can be found in HttpResponse->getHttpRequest->getTag().
*
- * @param tag the string pointer
+ * @param tag the string object.
*/
- inline void setTag(const char* tag)
+ inline void setTag(const std::string& tag)
{
_tag = tag;
};
diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js
index 1162ff7015..78c6c8fecd 100644
--- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js
+++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js
@@ -5540,6 +5540,16 @@ richelement
{
},
+/**
+ * @method setWrapMode
+ * @param {ccui.RichText::WrapMode} arg0
+ */
+setWrapMode : function (
+wrapmode
+)
+{
+},
+
/**
* @method setVerticalSpace
* @param {float} arg0
@@ -5550,6 +5560,16 @@ float
{
},
+/**
+ * @method getWrapMode
+ * @return {ccui.RichText::WrapMode}
+ */
+getWrapMode : function (
+)
+{
+ return 0;
+},
+
/**
* @method formatText
*/
diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
index bff62333b9..aeb3da167f 100644
--- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
+++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
@@ -13521,6 +13521,26 @@ bool js_cocos2dx_ui_RichText_pushBackElement(JSContext *cx, uint32_t argc, jsval
JS_ReportError(cx, "js_cocos2dx_ui_RichText_pushBackElement : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
+bool js_cocos2dx_ui_RichText_setWrapMode(JSContext *cx, uint32_t argc, jsval *vp)
+{
+ JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+ bool ok = true;
+ JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
+ js_proxy_t *proxy = jsb_get_js_proxy(obj);
+ cocos2d::ui::RichText* cobj = (cocos2d::ui::RichText *)(proxy ? proxy->ptr : NULL);
+ JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_RichText_setWrapMode : Invalid Native Object");
+ if (argc == 1) {
+ cocos2d::ui::RichText::WrapMode arg0;
+ ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0);
+ JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichText_setWrapMode : Error processing arguments");
+ cobj->setWrapMode(arg0);
+ args.rval().setUndefined();
+ return true;
+ }
+
+ JS_ReportError(cx, "js_cocos2dx_ui_RichText_setWrapMode : wrong number of arguments: %d, was expecting %d", argc, 1);
+ return false;
+}
bool js_cocos2dx_ui_RichText_setVerticalSpace(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -13541,6 +13561,24 @@ bool js_cocos2dx_ui_RichText_setVerticalSpace(JSContext *cx, uint32_t argc, jsva
JS_ReportError(cx, "js_cocos2dx_ui_RichText_setVerticalSpace : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
+bool js_cocos2dx_ui_RichText_getWrapMode(JSContext *cx, uint32_t argc, jsval *vp)
+{
+ JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+ JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
+ js_proxy_t *proxy = jsb_get_js_proxy(obj);
+ cocos2d::ui::RichText* cobj = (cocos2d::ui::RichText *)(proxy ? proxy->ptr : NULL);
+ JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_RichText_getWrapMode : Invalid Native Object");
+ if (argc == 0) {
+ int ret = (int)cobj->getWrapMode();
+ jsval jsret = JSVAL_NULL;
+ jsret = int32_to_jsval(cx, ret);
+ args.rval().set(jsret);
+ return true;
+ }
+
+ JS_ReportError(cx, "js_cocos2dx_ui_RichText_getWrapMode : wrong number of arguments: %d, was expecting %d", argc, 0);
+ return false;
+}
bool js_cocos2dx_ui_RichText_formatText(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -13711,7 +13749,9 @@ void js_register_cocos2dx_ui_RichText(JSContext *cx, JS::HandleObject global) {
static JSFunctionSpec funcs[] = {
JS_FN("insertElement", js_cocos2dx_ui_RichText_insertElement, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("pushBackElement", js_cocos2dx_ui_RichText_pushBackElement, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+ JS_FN("setWrapMode", js_cocos2dx_ui_RichText_setWrapMode, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setVerticalSpace", js_cocos2dx_ui_RichText_setVerticalSpace, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+ JS_FN("getWrapMode", js_cocos2dx_ui_RichText_getWrapMode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("formatText", js_cocos2dx_ui_RichText_formatText, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("initWithXML", js_cocos2dx_ui_RichText_initWithXML, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("removeElement", js_cocos2dx_ui_RichText_removeElement, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
index 36f5fbf11c..114f59afb4 100644
--- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
+++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
@@ -726,7 +726,9 @@ void js_register_cocos2dx_ui_RichText(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx_ui(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_ui_RichText_insertElement(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_ui_RichText_pushBackElement(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_ui_RichText_setWrapMode(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_ui_RichText_setVerticalSpace(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_ui_RichText_getWrapMode(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_ui_RichText_formatText(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_ui_RichText_initWithXML(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_ui_RichText_removeElement(JSContext *cx, uint32_t argc, jsval *vp);
diff --git a/cocos/scripting/lua-bindings/auto/api/ActionTimelineCache.lua b/cocos/scripting/lua-bindings/auto/api/ActionTimelineCache.lua
index 745131b8b0..e8fbb65a2b 100644
--- a/cocos/scripting/lua-bindings/auto/api/ActionTimelineCache.lua
+++ b/cocos/scripting/lua-bindings/auto/api/ActionTimelineCache.lua
@@ -24,6 +24,14 @@
-- @param #string fileName
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
+--------------------------------
+--
+-- @function [parent=#ActionTimelineCache] createActionFromContent
+-- @param self
+-- @param #string fileName
+-- @param #string content
+-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
+
--------------------------------
--
-- @function [parent=#ActionTimelineCache] purge
@@ -36,13 +44,6 @@
-- @param self
-- @return ActionTimelineCache#ActionTimelineCache self (return value: ccs.ActionTimelineCache)
---------------------------------
---
--- @function [parent=#ActionTimelineCache] loadAnimationActionWithFile
--- @param self
--- @param #string fileName
--- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
-
--------------------------------
--
-- @function [parent=#ActionTimelineCache] loadAnimationActionWithContent
@@ -51,6 +52,13 @@
-- @param #string content
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
+--------------------------------
+--
+-- @function [parent=#ActionTimelineCache] loadAnimationActionWithFile
+-- @param self
+-- @param #string fileName
+-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
+
--------------------------------
-- Remove action with filename, and also remove other resource relate with this file
-- @function [parent=#ActionTimelineCache] removeAction
diff --git a/cocos/scripting/lua-bindings/auto/api/RichText.lua b/cocos/scripting/lua-bindings/auto/api/RichText.lua
index ba127cbb6c..5a8919206a 100644
--- a/cocos/scripting/lua-bindings/auto/api/RichText.lua
+++ b/cocos/scripting/lua-bindings/auto/api/RichText.lua
@@ -22,6 +22,13 @@
-- @param #ccui.RichElement element
-- @return RichText#RichText self (return value: ccui.RichText)
+--------------------------------
+-- @brief sets the wrapping mode: WRAP_PER_CHAR or WRAP_PER_WORD
+-- @function [parent=#RichText] setWrapMode
+-- @param self
+-- @param #int wrapMode
+-- @return RichText#RichText self (return value: ccui.RichText)
+
--------------------------------
-- brief Set vertical space between each RichElement.
-- param space Point in float.
@@ -30,6 +37,12 @@
-- @param #float space
-- @return RichText#RichText self (return value: ccui.RichText)
+--------------------------------
+-- @brief returns the current wrapping mode
+-- @function [parent=#RichText] getWrapMode
+-- @param self
+-- @return int#int ret (return value: int)
+
--------------------------------
-- brief Rearrange all RichElement in the RichText.
-- It's usually called internally.
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
index b8d56d2dd1..ad5961c85c 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
@@ -15445,6 +15445,59 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFlatBuffersFi
return 0;
}
+int lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent(lua_State* tolua_S)
+{
+ int argc = 0;
+ cocostudio::timeline::ActionTimelineCache* cobj = nullptr;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertype(tolua_S,1,"ccs.ActionTimelineCache",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ cobj = (cocostudio::timeline::ActionTimelineCache*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+ if (!cobj)
+ {
+ tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent'", nullptr);
+ return 0;
+ }
+#endif
+
+ argc = lua_gettop(tolua_S)-1;
+ if (argc == 2)
+ {
+ std::string arg0;
+ std::string arg1;
+
+ ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionFromContent");
+
+ ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:createActionFromContent");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent'", nullptr);
+ return 0;
+ }
+ cocostudio::timeline::ActionTimeline* ret = cobj->createActionFromContent(arg0, arg1);
+ object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:createActionFromContent",argc, 2);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent'.",&tolua_err);
+#endif
+
+ return 0;
+}
int lua_cocos2dx_studio_ActionTimelineCache_purge(lua_State* tolua_S)
{
int argc = 0;
@@ -15539,56 +15592,6 @@ int lua_cocos2dx_studio_ActionTimelineCache_init(lua_State* tolua_S)
return 0;
}
-int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile(lua_State* tolua_S)
-{
- int argc = 0;
- cocostudio::timeline::ActionTimelineCache* cobj = nullptr;
- bool ok = true;
-
-#if COCOS2D_DEBUG >= 1
- tolua_Error tolua_err;
-#endif
-
-
-#if COCOS2D_DEBUG >= 1
- if (!tolua_isusertype(tolua_S,1,"ccs.ActionTimelineCache",0,&tolua_err)) goto tolua_lerror;
-#endif
-
- cobj = (cocostudio::timeline::ActionTimelineCache*)tolua_tousertype(tolua_S,1,0);
-
-#if COCOS2D_DEBUG >= 1
- if (!cobj)
- {
- tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'", nullptr);
- return 0;
- }
-#endif
-
- argc = lua_gettop(tolua_S)-1;
- if (argc == 1)
- {
- std::string arg0;
-
- ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFile");
- if(!ok)
- {
- tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'", nullptr);
- return 0;
- }
- cocostudio::timeline::ActionTimeline* ret = cobj->loadAnimationActionWithFile(arg0);
- object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret);
- return 1;
- }
- luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:loadAnimationActionWithFile",argc, 1);
- return 0;
-
-#if COCOS2D_DEBUG >= 1
- tolua_lerror:
- tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'.",&tolua_err);
-#endif
-
- return 0;
-}
int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent(lua_State* tolua_S)
{
int argc = 0;
@@ -15642,6 +15645,56 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent(lua_S
return 0;
}
+int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile(lua_State* tolua_S)
+{
+ int argc = 0;
+ cocostudio::timeline::ActionTimelineCache* cobj = nullptr;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertype(tolua_S,1,"ccs.ActionTimelineCache",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ cobj = (cocostudio::timeline::ActionTimelineCache*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+ if (!cobj)
+ {
+ tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'", nullptr);
+ return 0;
+ }
+#endif
+
+ argc = lua_gettop(tolua_S)-1;
+ if (argc == 1)
+ {
+ std::string arg0;
+
+ ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFile");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'", nullptr);
+ return 0;
+ }
+ cocostudio::timeline::ActionTimeline* ret = cobj->loadAnimationActionWithFile(arg0);
+ object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:loadAnimationActionWithFile",argc, 1);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'.",&tolua_err);
+#endif
+
+ return 0;
+}
int lua_cocos2dx_studio_ActionTimelineCache_removeAction(lua_State* tolua_S)
{
int argc = 0;
@@ -15827,10 +15880,11 @@ int lua_register_cocos2dx_studio_ActionTimelineCache(lua_State* tolua_S)
tolua_function(tolua_S,"createActionFromJson",lua_cocos2dx_studio_ActionTimelineCache_createActionFromJson);
tolua_function(tolua_S,"createActionWithFlatBuffersFile",lua_cocos2dx_studio_ActionTimelineCache_createActionWithFlatBuffersFile);
tolua_function(tolua_S,"loadAnimationActionWithFlatBuffersFile",lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFlatBuffersFile);
+ tolua_function(tolua_S,"createActionFromContent",lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent);
tolua_function(tolua_S,"purge",lua_cocos2dx_studio_ActionTimelineCache_purge);
tolua_function(tolua_S,"init",lua_cocos2dx_studio_ActionTimelineCache_init);
- tolua_function(tolua_S,"loadAnimationActionWithFile",lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile);
tolua_function(tolua_S,"loadAnimationActionWithContent",lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent);
+ tolua_function(tolua_S,"loadAnimationActionWithFile",lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile);
tolua_function(tolua_S,"removeAction",lua_cocos2dx_studio_ActionTimelineCache_removeAction);
tolua_function(tolua_S,"createActionWithFlatBuffersForSimulator",lua_cocos2dx_studio_ActionTimelineCache_createActionWithFlatBuffersForSimulator);
tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_studio_ActionTimelineCache_destroyInstance);
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp
index b7fe302b9a..f21c604148 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp
@@ -565,6 +565,7 @@ int register_all_cocos2dx_studio(lua_State* tolua_S);
+
#endif // __cocos2dx_studio_h__
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
index 96cd523b35..7487bbba60 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
@@ -25245,6 +25245,56 @@ int lua_cocos2dx_ui_RichText_pushBackElement(lua_State* tolua_S)
return 0;
}
+int lua_cocos2dx_ui_RichText_setWrapMode(lua_State* tolua_S)
+{
+ int argc = 0;
+ cocos2d::ui::RichText* cobj = nullptr;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertype(tolua_S,1,"ccui.RichText",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ cobj = (cocos2d::ui::RichText*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+ if (!cobj)
+ {
+ tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_RichText_setWrapMode'", nullptr);
+ return 0;
+ }
+#endif
+
+ argc = lua_gettop(tolua_S)-1;
+ if (argc == 1)
+ {
+ cocos2d::ui::RichText::WrapMode arg0;
+
+ ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichText:setWrapMode");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_setWrapMode'", nullptr);
+ return 0;
+ }
+ cobj->setWrapMode(arg0);
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:setWrapMode",argc, 1);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichText_setWrapMode'.",&tolua_err);
+#endif
+
+ return 0;
+}
int lua_cocos2dx_ui_RichText_setVerticalSpace(lua_State* tolua_S)
{
int argc = 0;
@@ -25295,6 +25345,53 @@ int lua_cocos2dx_ui_RichText_setVerticalSpace(lua_State* tolua_S)
return 0;
}
+int lua_cocos2dx_ui_RichText_getWrapMode(lua_State* tolua_S)
+{
+ int argc = 0;
+ cocos2d::ui::RichText* cobj = nullptr;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertype(tolua_S,1,"ccui.RichText",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ cobj = (cocos2d::ui::RichText*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+ if (!cobj)
+ {
+ tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_RichText_getWrapMode'", nullptr);
+ return 0;
+ }
+#endif
+
+ argc = lua_gettop(tolua_S)-1;
+ if (argc == 0)
+ {
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_getWrapMode'", nullptr);
+ return 0;
+ }
+ int ret = (int)cobj->getWrapMode();
+ tolua_pushnumber(tolua_S,(lua_Number)ret);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:getWrapMode",argc, 0);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichText_getWrapMode'.",&tolua_err);
+#endif
+
+ return 0;
+}
int lua_cocos2dx_ui_RichText_formatText(lua_State* tolua_S)
{
int argc = 0;
@@ -25569,7 +25666,9 @@ int lua_register_cocos2dx_ui_RichText(lua_State* tolua_S)
tolua_function(tolua_S,"new",lua_cocos2dx_ui_RichText_constructor);
tolua_function(tolua_S,"insertElement",lua_cocos2dx_ui_RichText_insertElement);
tolua_function(tolua_S,"pushBackElement",lua_cocos2dx_ui_RichText_pushBackElement);
+ tolua_function(tolua_S,"setWrapMode",lua_cocos2dx_ui_RichText_setWrapMode);
tolua_function(tolua_S,"setVerticalSpace",lua_cocos2dx_ui_RichText_setVerticalSpace);
+ tolua_function(tolua_S,"getWrapMode",lua_cocos2dx_ui_RichText_getWrapMode);
tolua_function(tolua_S,"formatText",lua_cocos2dx_ui_RichText_formatText);
tolua_function(tolua_S,"initWithXML",lua_cocos2dx_ui_RichText_initWithXML);
tolua_function(tolua_S,"removeElement",lua_cocos2dx_ui_RichText_removeElement);
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
index e940d98f52..cc360e0071 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
@@ -669,6 +669,8 @@ int register_all_cocos2dx_ui(lua_State* tolua_S);
+
+
diff --git a/cocos/ui/proj.win32/libui.vcxproj b/cocos/ui/proj.win32/libui.vcxproj
index 7401576f2e..05acb83b13 100644
--- a/cocos/ui/proj.win32/libui.vcxproj
+++ b/cocos/ui/proj.win32/libui.vcxproj
@@ -40,9 +40,7 @@
-
-
@@ -75,14 +73,9 @@
-
-
-
- {21b2c324-891f-48ea-ad1a-5ae13de12e28}
-
{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}
@@ -171,4 +164,4 @@
-
\ No newline at end of file
+
diff --git a/cocos/ui/proj.win32/libui.vcxproj.filters b/cocos/ui/proj.win32/libui.vcxproj.filters
index 81014a0d00..5c21adb636 100644
--- a/cocos/ui/proj.win32/libui.vcxproj.filters
+++ b/cocos/ui/proj.win32/libui.vcxproj.filters
@@ -105,18 +105,12 @@
UIWidgets\UIEditBox
-
- UIWidgets\UIEditBox
-
UIWidgets
UIWidgets
-
- UIWidgets
-
@@ -209,14 +203,8 @@
UIWidgets\UIEditBox
-
- UIWidgets\UIEditBox
-
UIWidgets
-
- UIWidgets
-
-
\ No newline at end of file
+