Merge branch 'string-art-ids'

Make the wxART_* constants const wxStrings to improve compatibility with pre-3.1.4 code and, in particular, allow taking the address of these constants. See https://github.com/wxWidgets/wxWidgets/pull/1996
2020-08-21 02:39:12 +02:00
parent 5192feb38e d5f5376e95
commit 8c9ba23eae
14 changed files with 212 additions and 160 deletions
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1039,6 +1039,7 @@ set(GUI_CMN_HDR
    wx/anidecod.h
    wx/animdecod.h
    wx/appprogress.h
+    wx/artids.h
    wx/artprov.h
    wx/bitmap.h
    wx/bookctrl.h