Merge branch 'master' into cmake

Pull in the latest fixes, notably for wx(X)Locale to allow the tests to pass.
2017-12-10 17:52:06 +01:00
parent 8cb84cd0f7 198adec748
commit 05a40aa510
27 changed files with 314 additions and 222 deletions
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -443,6 +443,8 @@ wxMSW:
 - Fix UTF-32 conversion for non-BMP characters (ARATA Mizuki).
 - Use correct parent for the native modal dialogs (Andreas Falkenhahn).
 - Fix layout of wxSlider with wxSL_VALUE_LABEL only (gafatoa).
+- Fix flicker when resizing columns of report-mode wxListCtrl.
+- Implement wxTreeCtrl::SetDoubleBuffered() (Steve Browne).

 wxOSX/Cocoa: