Merge pull request #6680 from CocosRobot/update_lua_bindings_1399882383

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2014-05-12 16:29:07 +08:00
commit 5c0fb8e80b
19 changed files with 605 additions and 206 deletions

View File

@ -42,7 +42,7 @@
-- @function [parent=#Button] loadTextureDisabled
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Button] setTitleText
@ -58,7 +58,7 @@
-- @function [parent=#Button] loadTexturePressed
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Button] setTitleFontName
@ -81,7 +81,7 @@
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Button] isScale9Enabled
@ -92,7 +92,7 @@
-- @function [parent=#Button] loadTextureNormal
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Button] setCapInsetsPressedRenderer
@ -120,7 +120,7 @@
-- @param #bool bool
--------------------------------
-- overload function: create(string, string, string, ccui.TextureResType)
-- overload function: create(string, string, string, ccui.Widget::TextureResType)
--
-- overload function: create()
--
@ -129,7 +129,7 @@
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
-- @return Button#Button ret (retunr value: ccui.Button)
--------------------------------

View File

@ -12,19 +12,24 @@
-- @function [parent=#CheckBox] loadTextureBackGroundSelected
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#CheckBox] loadTextureBackGroundDisabled
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#CheckBox] addEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#CheckBox] loadTextureFrontCross
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#CheckBox] loadTextures
@ -34,13 +39,13 @@
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#CheckBox] loadTextureBackGround
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#CheckBox] setSelectedState
@ -51,10 +56,10 @@
-- @function [parent=#CheckBox] loadTextureFrontCrossDisabled
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- overload function: create(string, string, string, string, string, ccui.TextureResType)
-- overload function: create(string, string, string, string, string, ccui.Widget::TextureResType)
--
-- overload function: create()
--
@ -65,7 +70,7 @@
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
-- @return CheckBox#CheckBox ret (retunr value: ccui.CheckBox)
--------------------------------

View File

@ -20,7 +20,7 @@
-- @function [parent=#Helper] seekWidgetByName
-- @param self
-- @param #ccui.Widget widget
-- @param #char char
-- @param #string str
-- @return Widget#Widget ret (return value: ccui.Widget)
return nil

View File

@ -7,7 +7,7 @@
-- @function [parent=#ImageView] loadTexture
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#ImageView] setScale9Enabled
@ -35,14 +35,14 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
-- overload function: create(string, ccui.TextureResType)
-- overload function: create(string, ccui.Widget::TextureResType)
--
-- overload function: create()
--
-- @function [parent=#ImageView] create
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
-- @return ImageView#ImageView ret (retunr value: ccui.ImageView)
--------------------------------

View File

@ -11,12 +11,12 @@
--------------------------------
-- @function [parent=#Layout] setClippingType
-- @param self
-- @param #ccui.LayoutClippingType layoutclippingtype
-- @param #ccui.Layout::ClippingType clippingtype
--------------------------------
-- @function [parent=#Layout] setBackGroundColorType
-- @param self
-- @param #ccui.LayoutBackGroundColorType layoutbackgroundcolortype
-- @param #ccui.Layout::BackGroundColorType backgroundcolortype
--------------------------------
-- @function [parent=#Layout] setLoopFocus
@ -36,7 +36,7 @@
--------------------------------
-- @function [parent=#Layout] getClippingType
-- @param self
-- @return LayoutClippingType#LayoutClippingType ret (return value: ccui.LayoutClippingType)
-- @return Layout::ClippingType#Layout::ClippingType ret (return value: ccui.Layout::ClippingType)
--------------------------------
-- @function [parent=#Layout] isLoopFocus
@ -66,7 +66,7 @@
-- @function [parent=#Layout] setBackGroundImage
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- overload function: setBackGroundColor(color3b_table, color3b_table)
@ -110,7 +110,7 @@
--------------------------------
-- @function [parent=#Layout] getBackGroundColorType
-- @param self
-- @return LayoutBackGroundColorType#LayoutBackGroundColorType ret (return value: ccui.LayoutBackGroundColorType)
-- @return Layout::BackGroundColorType#Layout::BackGroundColorType ret (return value: ccui.Layout::BackGroundColorType)
--------------------------------
-- @function [parent=#Layout] getBackGroundEndColor
@ -145,7 +145,7 @@
--------------------------------
-- @function [parent=#Layout] getLayoutType
-- @param self
-- @return LayoutType#LayoutType ret (return value: ccui.LayoutType)
-- @return Layout::LayoutType#Layout::LayoutType ret (return value: ccui.Layout::LayoutType)
--------------------------------
-- @function [parent=#Layout] setPassFocusToChild
@ -165,7 +165,7 @@
--------------------------------
-- @function [parent=#Layout] setLayoutType
-- @param self
-- @param #ccui.LayoutType layouttype
-- @param #ccui.Layout::LayoutType layouttype
--------------------------------
-- @function [parent=#Layout] create
@ -211,7 +211,7 @@
--------------------------------
-- @function [parent=#Layout] findNextFocusedWidget
-- @param self
-- @param #ccui.FocusDirection focusdirection
-- @param #ccui.Widget::FocusDirection focusdirection
-- @param #ccui.Widget widget
-- @return Widget#Widget ret (return value: ccui.Widget)

View File

@ -11,7 +11,7 @@
--------------------------------
-- @function [parent=#LayoutParameter] getLayoutType
-- @param self
-- @return LayoutParameterType#LayoutParameterType ret (return value: ccui.LayoutParameterType)
-- @return LayoutParameter::Type#LayoutParameter::Type ret (return value: ccui.LayoutParameter::Type)
--------------------------------
-- @function [parent=#LayoutParameter] createCloneInstance

View File

@ -6,12 +6,12 @@
--------------------------------
-- @function [parent=#LinearLayoutParameter] setGravity
-- @param self
-- @param #ccui.LinearGravity lineargravity
-- @param #ccui.LinearLayoutParameter::LinearGravity lineargravity
--------------------------------
-- @function [parent=#LinearLayoutParameter] getGravity
-- @param self
-- @return LinearGravity#LinearGravity ret (return value: ccui.LinearGravity)
-- @return LinearLayoutParameter::LinearGravity#LinearLayoutParameter::LinearGravity ret (return value: ccui.LinearLayoutParameter::LinearGravity)
--------------------------------
-- @function [parent=#LinearLayoutParameter] create

View File

@ -16,7 +16,7 @@
--------------------------------
-- @function [parent=#ListView] setGravity
-- @param self
-- @param #ccui.ListViewGravity listviewgravity
-- @param #ccui.ListView::Gravity gravity
--------------------------------
-- @function [parent=#ListView] pushBackCustomItem
@ -61,6 +61,11 @@
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#ListView] addEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#ListView] getItem
-- @param self
@ -99,7 +104,7 @@
--------------------------------
-- @function [parent=#ListView] setDirection
-- @param self
-- @param #ccui.SCROLLVIEW_DIR scrollview_dir
-- @param #ccui.ScrollView::Direction direction
--------------------------------
-- @function [parent=#ListView] getDescription

View File

@ -4,20 +4,20 @@
-- @extend Widget
--------------------------------
-- @function [parent=#LoadingBar] setPercent
-- @function [parent=#LoadingBar] setBarDirection
-- @param self
-- @param #int int
-- @param #ccui.LoadingBar::Direction direction
--------------------------------
-- @function [parent=#LoadingBar] loadTexture
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#LoadingBar] setDirection
-- @function [parent=#LoadingBar] setPercent
-- @param self
-- @param #ccui.LoadingBarType loadingbartype
-- @param #int int
--------------------------------
-- @function [parent=#LoadingBar] setScale9Enabled
@ -30,14 +30,9 @@
-- @param #rect_table rect
--------------------------------
-- @function [parent=#LoadingBar] getDirection
-- @function [parent=#LoadingBar] getBarDirection
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- @function [parent=#LoadingBar] getCapInsets
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
-- @return LoadingBar::Direction#LoadingBar::Direction ret (return value: ccui.LoadingBar::Direction)
--------------------------------
-- @function [parent=#LoadingBar] isScale9Enabled
@ -49,6 +44,11 @@
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- @function [parent=#LoadingBar] getCapInsets
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
-- overload function: create(string, int)
--

View File

@ -26,6 +26,11 @@
-- @param self
-- @param #ccui.Layout layout
--------------------------------
-- @function [parent=#PageView] addEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#PageView] insertPage
-- @param self
@ -69,7 +74,7 @@
--------------------------------
-- @function [parent=#PageView] getLayoutType
-- @param self
-- @return LayoutType#LayoutType ret (return value: ccui.LayoutType)
-- @return Layout::LayoutType#Layout::LayoutType ret (return value: ccui.Layout::LayoutType)
--------------------------------
-- @function [parent=#PageView] getDescription
@ -84,7 +89,7 @@
--------------------------------
-- @function [parent=#PageView] setLayoutType
-- @param self
-- @param #ccui.LayoutType layouttype
-- @param #ccui.Layout::LayoutType layouttype
--------------------------------
-- @function [parent=#PageView] PageView

View File

@ -6,32 +6,32 @@
--------------------------------
-- @function [parent=#RelativeLayoutParameter] setAlign
-- @param self
-- @param #ccui.RelativeAlign relativealign
-- @param #ccui.RelativeLayoutParameter::RelativeAlign relativealign
--------------------------------
-- @function [parent=#RelativeLayoutParameter] setRelativeToWidgetName
-- @param self
-- @param #char char
-- @param #string str
--------------------------------
-- @function [parent=#RelativeLayoutParameter] getRelativeName
-- @param self
-- @return char#char ret (return value: char)
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#RelativeLayoutParameter] getRelativeToWidgetName
-- @param self
-- @return char#char ret (return value: char)
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#RelativeLayoutParameter] setRelativeName
-- @param self
-- @param #char char
-- @param #string str
--------------------------------
-- @function [parent=#RelativeLayoutParameter] getAlign
-- @param self
-- @return RelativeAlign#RelativeAlign ret (return value: ccui.RelativeAlign)
-- @return RelativeLayoutParameter::RelativeAlign#RelativeLayoutParameter::RelativeAlign ret (return value: ccui.RelativeLayoutParameter::RelativeAlign)
--------------------------------
-- @function [parent=#RelativeLayoutParameter] create

View File

@ -9,7 +9,7 @@
-- @param #int int
-- @param #color3b_table color3b
-- @param #unsigned char char
-- @param #char char
-- @param #string str
-- @return bool#bool ret (return value: bool)
--------------------------------
@ -18,7 +18,7 @@
-- @param #int int
-- @param #color3b_table color3b
-- @param #unsigned char char
-- @param #char char
-- @param #string str
-- @return RichElementImage#RichElementImage ret (return value: ccui.RichElementImage)
--------------------------------

View File

@ -9,8 +9,8 @@
-- @param #int int
-- @param #color3b_table color3b
-- @param #unsigned char char
-- @param #char char
-- @param #char char
-- @param #string str
-- @param #string str
-- @param #float float
-- @return bool#bool ret (return value: bool)
@ -20,8 +20,8 @@
-- @param #int int
-- @param #color3b_table color3b
-- @param #unsigned char char
-- @param #char char
-- @param #char char
-- @param #string str
-- @param #string str
-- @param #float float
-- @return RichElementText#RichElementText ret (return value: ccui.RichElementText)

View File

@ -31,7 +31,7 @@
--------------------------------
-- @function [parent=#ScrollView] getDirection
-- @param self
-- @return SCROLLVIEW_DIR#SCROLLVIEW_DIR ret (return value: ccui.SCROLLVIEW_DIR)
-- @return ScrollView::Direction#ScrollView::Direction ret (return value: ccui.ScrollView::Direction)
--------------------------------
-- @function [parent=#ScrollView] scrollToBottomLeft
@ -51,7 +51,7 @@
--------------------------------
-- @function [parent=#ScrollView] setDirection
-- @param self
-- @param #ccui.SCROLLVIEW_DIR scrollview_dir
-- @param #ccui.ScrollView::Direction direction
--------------------------------
-- @function [parent=#ScrollView] scrollToTopLeft
@ -87,6 +87,11 @@
-- @param self
-- @param #float float
--------------------------------
-- @function [parent=#ScrollView] addEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#ScrollView] setInertiaScrollEnabled
-- @param self
@ -190,7 +195,7 @@
--------------------------------
-- @function [parent=#ScrollView] getChildByName
-- @param self
-- @param #char char
-- @param #string str
-- @return Widget#Widget ret (return value: ccui.Widget)
--------------------------------
@ -206,7 +211,7 @@
--------------------------------
-- @function [parent=#ScrollView] getLayoutType
-- @param self
-- @return LayoutType#LayoutType ret (return value: ccui.LayoutType)
-- @return Layout::LayoutType#Layout::LayoutType ret (return value: ccui.Layout::LayoutType)
--------------------------------
-- @function [parent=#ScrollView] removeAllChildrenWithCleanup
@ -246,7 +251,7 @@
--------------------------------
-- @function [parent=#ScrollView] setLayoutType
-- @param self
-- @param #ccui.LayoutType layouttype
-- @param #ccui.Layout::LayoutType layouttype
--------------------------------
-- @function [parent=#ScrollView] ScrollView

View File

@ -12,25 +12,25 @@
-- @function [parent=#Slider] loadSlidBallTextureDisabled
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Slider] loadSlidBallTextureNormal
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Slider] loadBarTexture
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Slider] loadProgressBarTexture
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Slider] loadSlidBallTextures
@ -38,7 +38,7 @@
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Slider] setCapInsetProgressBarRebderer
@ -65,11 +65,16 @@
-- @param self
-- @param #rect_table rect
--------------------------------
-- @function [parent=#Slider] addEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#Slider] loadSlidBallTexturePressed
-- @param self
-- @param #string str
-- @param #ccui.TextureResType texturerestype
-- @param #ccui.Widget::TextureResType texturerestype
--------------------------------
-- @function [parent=#Slider] isScale9Enabled

View File

@ -58,6 +58,11 @@
-- @param self
-- @param #cc.TextVAlignment textvalignment
--------------------------------
-- @function [parent=#TextField] addEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#TextField] didNotSelectSelf
-- @param self

View File

@ -51,12 +51,12 @@
--------------------------------
-- @function [parent=#Widget] setPositionType
-- @param self
-- @param #ccui.PositionType positiontype
-- @param #ccui.Widget::PositionType positiontype
--------------------------------
-- @function [parent=#Widget] getName
-- @param self
-- @return char#char ret (return value: char)
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#Widget] isIgnoreContentAdaptWithSize
@ -76,23 +76,23 @@
--------------------------------
-- @function [parent=#Widget] getLayoutParameter
-- @param self
-- @param #ccui.LayoutParameterType layoutparametertype
-- @param #ccui.LayoutParameter::Type type
-- @return LayoutParameter#LayoutParameter ret (return value: ccui.LayoutParameter)
--------------------------------
-- @function [parent=#Widget] getPositionType
-- @param self
-- @return PositionType#PositionType ret (return value: ccui.PositionType)
-- @return Widget::PositionType#Widget::PositionType ret (return value: ccui.Widget::PositionType)
--------------------------------
-- @function [parent=#Widget] getWidgetType
-- @param self
-- @return WidgetType#WidgetType ret (return value: ccui.WidgetType)
-- @return Widget::Type#Widget::Type ret (return value: ccui.Widget::Type)
--------------------------------
-- @function [parent=#Widget] getChildByName
-- @param self
-- @param #char char
-- @param #string str
-- @return Widget#Widget ret (return value: ccui.Widget)
--------------------------------
@ -113,7 +113,7 @@
--------------------------------
-- @function [parent=#Widget] findNextFocusedWidget
-- @param self
-- @param #ccui.FocusDirection focusdirection
-- @param #ccui.Widget::FocusDirection focusdirection
-- @param #ccui.Widget widget
-- @return Widget#Widget ret (return value: ccui.Widget)
@ -169,12 +169,12 @@
--------------------------------
-- @function [parent=#Widget] setBrightStyle
-- @param self
-- @param #ccui.BrightStyle brightstyle
-- @param #ccui.Widget::BrightStyle brightstyle
--------------------------------
-- @function [parent=#Widget] setName
-- @param self
-- @param #char char
-- @param #string str
--------------------------------
-- @function [parent=#Widget] setLayoutParameter
@ -249,13 +249,18 @@
--------------------------------
-- @function [parent=#Widget] getSizeType
-- @param self
-- @return SizeType#SizeType ret (return value: ccui.SizeType)
-- @return Widget::SizeType#Widget::SizeType ret (return value: ccui.Widget::SizeType)
--------------------------------
-- @function [parent=#Widget] ignoreContentAdaptWithSize
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#Widget] addTouchEventListener
-- @param self
-- @param #function func
--------------------------------
-- @function [parent=#Widget] getPositionPercent
-- @param self
@ -280,7 +285,7 @@
--------------------------------
-- @function [parent=#Widget] setSizeType
-- @param self
-- @param #ccui.SizeType sizetype
-- @param #ccui.Widget::SizeType sizetype
--------------------------------
-- @function [parent=#Widget] checkChildInfo

File diff suppressed because it is too large Load Diff

View File

@ -370,6 +370,13 @@ int register_all_cocos2dx_ui(lua_State* tolua_S);