diff options
author | Henrik Nord <henrik@erlang.org> | 2022-03-10 08:50:54 +0100 |
---|---|---|
committer | Henrik Nord <henrik@erlang.org> | 2022-03-10 08:50:54 +0100 |
commit | 3d625adb68edf20564aaf546fc0d105f8aaeb80d (patch) | |
tree | f6bec7f7c457f82c09f91178c2dadf7b022440eb /lib/wx | |
parent | 891fcb23e7380a1ff7667b60ec91e7bc0402ac98 (diff) | |
parent | fe02a02f6deea5d82f654bcca7ebd615a2430ca4 (diff) | |
download | erlang-3d625adb68edf20564aaf546fc0d105f8aaeb80d.tar.gz |
Merge branch 'maint' into master
* maint:
Updated OTP version
Prepare release
Update copyright year
Diffstat (limited to 'lib/wx')
-rw-r--r-- | lib/wx/api_gen/gen_util.erl | 2 | ||||
-rw-r--r-- | lib/wx/api_gen/wx_gen_doc.erl | 2 | ||||
-rw-r--r-- | lib/wx/api_gen/wx_gen_nif.erl | 2 | ||||
-rw-r--r-- | lib/wx/doc/src/notes.xml | 21 | ||||
-rw-r--r-- | lib/wx/doc/src/wxImage.xml | 2 | ||||
-rw-r--r-- | lib/wx/test/wxt.erl | 2 | ||||
-rw-r--r-- | lib/wx/vsn.mk | 2 |
7 files changed, 27 insertions, 6 deletions
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl index 0a11f82aba..da36992fb8 100644 --- a/lib/wx/api_gen/gen_util.erl +++ b/lib/wx/api_gen/gen_util.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. All Rights Reserved. +%% Copyright Ericsson AB 2008-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/wx/api_gen/wx_gen_doc.erl b/lib/wx/api_gen/wx_gen_doc.erl index 80d30336f3..eb22dccfad 100644 --- a/lib/wx/api_gen/wx_gen_doc.erl +++ b/lib/wx/api_gen/wx_gen_doc.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2020-2021. All Rights Reserved. +%% Copyright Ericsson AB 2020-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/wx/api_gen/wx_gen_nif.erl b/lib/wx/api_gen/wx_gen_nif.erl index a8066f4d5e..ab4850c6a9 100644 --- a/lib/wx/api_gen/wx_gen_nif.erl +++ b/lib/wx/api_gen/wx_gen_nif.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. All Rights Reserved. +%% Copyright Ericsson AB 2008-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml index 8ad5269a05..c6a6e7104e 100644 --- a/lib/wx/doc/src/notes.xml +++ b/lib/wx/doc/src/notes.xml @@ -32,6 +32,27 @@ <p>This document describes the changes made to the wxErlang application.</p> +<section><title>Wx 2.1.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> Removed the <c>static_data</c> option from + <c>wxImage</c> creation functions, as it was broken and + could lead to crashes. Now image data is always copied to + wxWidgets as was the default behavior. </p> <p> Removed + some non working <c>wxGridEvent</c> event types, which + have there own events in newer <c>wxWidgets</c> versions, + and added a couple of event types that where missing in + <c>wx</c>. </p> + <p> + Own Id: OTP-17947</p> + </item> + </list> + </section> + +</section> + <section><title>Wx 2.1.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/wx/doc/src/wxImage.xml b/lib/wx/doc/src/wxImage.xml index 2933e05e8e..3c2232fe0f 100644 --- a/lib/wx/doc/src/wxImage.xml +++ b/lib/wx/doc/src/wxImage.xml @@ -7,7 +7,7 @@ <erlref> <header> <copyright> - <year>2020</year> + <year>2020</year><year>2022</year> <holder>wxWidgets team.</holder></copyright> <legalnotice>Licensed under the wxWindows Free Documentation Licence, Version 3 </legalnotice> diff --git a/lib/wx/test/wxt.erl b/lib/wx/test/wxt.erl index 21cd9d7a94..ae490e0bd3 100644 --- a/lib/wx/test/wxt.erl +++ b/lib/wx/test/wxt.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2018. All Rights Reserved. +%% Copyright Ericsson AB 2008-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk index 6dfa80406a..027203c50c 100644 --- a/lib/wx/vsn.mk +++ b/lib/wx/vsn.mk @@ -1 +1 @@ -WX_VSN = 2.1.1 +WX_VSN = 2.1.2 |