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/wxBitmap.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/wxBitmap.erl')
-rw-r--r-- | lib/wx/src/gen/wxBitmap.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/src/gen/wxBitmap.erl b/lib/wx/src/gen/wxBitmap.erl index 0b5a216a35..53c57e4393 100644 --- a/lib/wx/src/gen/wxBitmap.erl +++ b/lib/wx/src/gen/wxBitmap.erl @@ -43,7 +43,7 @@ new() -> %% @spec (X::string()|term()) -> wxBitmap() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% new(Filename::string()) -> new(Filename, []) </c></p> %% <p><c> @@ -59,7 +59,7 @@ new(Image) %% @spec (X::integer()|string()|term(),X::integer()|term()) -> wxBitmap() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% new(Width::integer(), Height::integer()) -> new(Width,Height, []) </c></p> %% <p><c> @@ -95,7 +95,7 @@ new(#wx_ref{type=ImageT,ref=ImageRef}, Options) %% @spec (X::binary()|integer(),X::integer(),X::integer()|term()) -> wxBitmap() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>. -%% <br /> Alternatives: +%% <br /> Alternatives: %% <p><c> %% new(Bits::binary(), Width::integer(), Height::integer()) -> new(Bits,Width,Height, []) </c></p> %% <p><c> @@ -293,7 +293,7 @@ setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width) %% @spec (This::wxBitmap()) -> ok %% @doc Destroys this object, do not use object again -destroy(Obj=#wx_ref{type=Type}) -> +destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBitmap), wxe_util:destroy(?DESTROY_OBJECT,Obj), ok. |