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/wxIcon.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/wxIcon.erl')
-rw-r--r-- | lib/wx/src/gen/wxIcon.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/src/gen/wxIcon.erl b/lib/wx/src/gen/wxIcon.erl index 4f605a8f04..5b224c00b6 100644 --- a/lib/wx/src/gen/wxIcon.erl +++ b/lib/wx/src/gen/wxIcon.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_wxicon.html">wxIcon</a>. -%% <p>This class is derived (and can use functions) from: +%% <p>This class is derived (and can use functions) from: %% <br />{@link wxBitmap} %% </p> %% @type wxIcon(). An object reference, The representation is internal @@ -47,7 +47,7 @@ new() -> %% @spec (X::string()|term()) -> wxIcon() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% new(Filename::string()) -> new(Filename, []) </c></p> %% <p><c> @@ -88,11 +88,11 @@ copyFromBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) -> %% @spec (This::wxIcon()) -> ok %% @doc Destroys this object, do not use object again -destroy(Obj=#wx_ref{type=Type}) -> +destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxIcon), wxe_util:destroy(?DESTROY_OBJECT,Obj), ok. - %% From wxBitmap + %% From wxBitmap %% @hidden setWidth(This,Width) -> wxBitmap:setWidth(This,Width). %% @hidden |