summaryrefslogtreecommitdiff
path: root/lib/wx
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2019-12-10 09:43:55 +0100
committerHenrik Nord <henrik@erlang.org>2019-12-10 09:43:55 +0100
commit70ce6bbb7ae11ffd6e0c99d583826941f7a62673 (patch)
tree06bc04dd7ece1f5715ba5a82e0aee983eb98b701 /lib/wx
parent1a1e08030800bc01aceb14e2d8c730fbbd7317bc (diff)
parent926f03ce5ba4f2156a36940d267a1a1e683484ff (diff)
downloaderlang-70ce6bbb7ae11ffd6e0c99d583826941f7a62673.tar.gz
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION
Diffstat (limited to 'lib/wx')
-rw-r--r--lib/wx/doc/src/notes.xml19
-rw-r--r--lib/wx/vsn.mk2
2 files changed, 20 insertions, 1 deletions
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 4de771d209..7dcfbb1588 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,25 @@
<p>This document describes the changes made to the wxErlang
application.</p>
+<section><title>Wx 1.9</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Added <c>wxWindow:isShownOnScreen/1</c>,
+ <c>wxMouseEvent:getWheelAxis</c> and mac specific menubar
+ functions. Fixed defines that have changed in newer
+ wxWidgets versions, that caused some literals to become
+ run-time dependent on wxWidgets version.</p>
+ <p>
+ Own Id: OTP-16285</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Wx 1.8.9</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index ec07f7b691..b498d21f3f 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.9
+WX_VSN = 1.9