Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341

[AUTO]: updating luabinding automatically

cocos/scripting/lua-bindings/auto/api/WebView.lua

@@ -0,0 +1,112 @@
+
+--------------------------------
+-- @module WebView
+-- @extend Widget
+-- @parent_module ccexp
+
+--------------------------------
+-- Loads the given URL.<br>
+-- param url Content URL.
+-- @function [parent=#WebView] loadURL 
+-- @param self
+-- @param #string url
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Gets whether this WebView has a back history item.<br>
+-- return WebView has a back history item.
+-- @function [parent=#WebView] canGoBack 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- Sets the main page content and base URL.<br>
+-- param string The content for the main page.<br>
+-- param baseURL The base URL for the content.
+-- @function [parent=#WebView] loadHTMLString 
+-- @param self
+-- @param #string string
+-- @param #string baseURL
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Goes forward in the history.
+-- @function [parent=#WebView] goForward 
+-- @param self
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Goes back in the history.
+-- @function [parent=#WebView] goBack 
+-- @param self
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Set javascript interface scheme.<br>
+-- see WebView::setOnJSCallback()
+-- @function [parent=#WebView] setJavascriptInterfaceScheme 
+-- @param self
+-- @param #string scheme
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Evaluates JavaScript in the context of the currently displayed page.
+-- @function [parent=#WebView] evaluateJS 
+-- @param self
+-- @param #string js
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Get the Javascript callback.
+-- @function [parent=#WebView] getOnJSCallback 
+-- @param self
+-- @return function#function ret (return value: function)
+        
+--------------------------------
+-- Reloads the current URL.
+-- @function [parent=#WebView] reload 
+-- @param self
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Set WebView should support zooming. The default value is false.
+-- @function [parent=#WebView] setScalesPageToFit 
+-- @param self
+-- @param #bool scalesPageToFit
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Gets whether this WebView has a forward history item.<br>
+-- return WebView has a forward history item.
+-- @function [parent=#WebView] canGoForward 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- Loads the given fileName.<br>
+-- param fileName Content fileName.
+-- @function [parent=#WebView] loadFile 
+-- @param self
+-- @param #string fileName
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Stops the current load.
+-- @function [parent=#WebView] stopLoading 
+-- @param self
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Allocates and initializes a WebView.
+-- @function [parent=#WebView] create 
+-- @param self
+-- @return experimental::ui::WebView#experimental::ui::WebView ret (return value: cc.experimental::ui::WebView)
+        
+--------------------------------
+-- Toggle visibility of WebView.
+-- @function [parent=#WebView] setVisible 
+-- @param self
+-- @param #bool visible
+-- @return experimental::ui::WebView#experimental::ui::WebView self (return value: cc.experimental::ui::WebView)
+        
+return nil

cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_webview_auto_api.lua

@@ -0,0 +1,9 @@
+--------------------------------
+-- @module ccexp
+
+--------------------------------------------------------
+-- the ccexp WebView
+-- @field [parent=#ccexp] WebView#WebView WebView preloaded module
+
+
+return nil

cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.cpp

@@ -1,5 +1,5 @@
 #include "lua_cocos2dx_experimental_webview_auto.hpp"
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
 #include "UIWebView.h"
 #include "tolua_fix.h"
 #include "LuaBasicConversions.h"

cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp

@@ -1,5 +1,5 @@
 #include "base/ccConfig.h"
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
 #ifndef __cocos2dx_experimental_webview_h__
 #define __cocos2dx_experimental_webview_h__
 
@@ -29,4 +29,4 @@ int register_all_cocos2dx_experimental_webview(lua_State* tolua_S);
 
 
 #endif // __cocos2dx_experimental_webview_h__
-#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)