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/wxIconBundle.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/wxIconBundle.erl')
| -rw-r--r-- | lib/wx/src/gen/wxIconBundle.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxIconBundle.erl b/lib/wx/src/gen/wxIconBundle.erl index 3350838203..ee133cbcb9 100644 --- a/lib/wx/src/gen/wxIconBundle.erl +++ b/lib/wx/src/gen/wxIconBundle.erl @@ -83,7 +83,7 @@ getIcon(This) %% @spec (This::wxIconBundle(),X::term()) -> wxIcon:wxIcon() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlegeticon">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% getIcon(This::wxIconBundle(), [Option]) -> wxIcon:wxIcon() </c> %%<br /> Option = {size, integer()} @@ -107,7 +107,7 @@ getIcon(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) %% @spec (This::wxIconBundle()) -> ok %% @doc Destroys this object, do not use object again -destroy(Obj=#wx_ref{type=Type}) -> +destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxIconBundle), wxe_util:destroy(?wxIconBundle_destruct,Obj), ok. |