diff options
author | Erlang/OTP <[email protected]> | 2010-02-05 16:32:00 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-02-05 16:32:00 +0000 |
commit | e76fa2fb451a111196128afbc372d3b8b1e3dfad (patch) | |
tree | e45dc19f5be68d6074035363fae30e207a69bed1 /lib/wx/src/gen/wxToolBar.erl | |
parent | 2e6ff4b8c161c358cf496b2ebb5f2dbbaa04aabd (diff) | |
parent | cfd2ba46158ad1ac6798e48150d18c969966a152 (diff) | |
download | otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.tar.gz otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.tar.bz2 otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.zip |
Merge branch 'dgud/wx_list_ctrl' into ccase/r13b04_dev
* dgud/wx_list_ctrl:
Generate without trailing spaces
Fix correct starting copyright year
Do not emit trailing whitespace
Added tests for wxListCtrl:getItem/2.
Added wxListCtrl:getEditCtrl (not available on Mac)
OTP-8408 Added wxListCtrl:getEditCtrl/1 (not available on Mac).
Diffstat (limited to 'lib/wx/src/gen/wxToolBar.erl')
-rw-r--r-- | lib/wx/src/gen/wxToolBar.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl index 0af762e0bd..c68936d493 100644 --- a/lib/wx/src/gen/wxToolBar.erl +++ b/lib/wx/src/gen/wxToolBar.erl @@ -18,7 +18,7 @@ %% This file is generated DO NOT EDIT %% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html">wxToolBar</a>. -%% <p>This class is derived (and can use functions) from: +%% <p>This class is derived (and can use functions) from: %% <br />{@link wxControl} %% <br />{@link wxWindow} %% <br />{@link wxEvtHandler} @@ -114,7 +114,7 @@ addTool(This,Toolid,Bitmap) %% @spec (This::wxToolBar(),Toolid::integer(),X::string()|term(),X::term()) -> wx:wx() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% addTool(This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap()) -> addTool(This,Toolid,Label,Bitmap, []) </c></p> %% <p><c> @@ -144,7 +144,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe %% @spec (This::wxToolBar(),Toolid::integer(),X::string()|term(),X::term(),X::term()) -> wx:wx() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% addTool(This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap()) -> addTool(This,Toolid,Label,Bitmap,BmpDisabled, []) </c></p> %% <p><c> @@ -188,7 +188,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe %% @spec (This::wxToolBar(),Toolid::integer(),X::term()|string(),X::term(),X::bool()|term(),X::integer()|term()) -> wx:wx() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% addTool(This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::bool(), XPos::integer()) -> addTool(This,Toolid,Bitmap,BmpDisabled,Toggle,XPos, []) </c></p> %% <p><c> @@ -436,7 +436,7 @@ insertTool(This,Pos,Toolid,Bitmap) %% @spec (This::wxToolBar(),Pos::integer(),Toolid::integer(),X::string()|term(),X::term()) -> wx:wx() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% insertTool(This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap()) -> insertTool(This,Pos,Toolid,Label,Bitmap, []) </c></p> %% <p><c> @@ -554,12 +554,12 @@ toggleTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Toggle) wxe_util:cast(?wxToolBar_ToggleTool, <<ThisRef:32/?UI,Toolid:32/?UI,(wxe_util:from_bool(Toggle)):32/?UI>>). - %% From wxControl + %% From wxControl %% @hidden setLabel(This,Label) -> wxControl:setLabel(This,Label). %% @hidden getLabel(This) -> wxControl:getLabel(This). - %% From wxWindow + %% From wxWindow %% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden @@ -906,7 +906,7 @@ center(This) -> wxWindow:center(This). captureMouse(This) -> wxWindow:captureMouse(This). %% @hidden cacheBestSize(This,Size) -> wxWindow:cacheBestSize(This,Size). - %% From wxEvtHandler + %% From wxEvtHandler %% @hidden disconnect(This,EventType, Options) -> wxEvtHandler:disconnect(This,EventType, Options). %% @hidden |