Merge branch 'dev' into major

* dev:
  distribution_SUITE:bulk_send_bigbig/1: Fail with more information
  distribution_SUITE: Use unique slave node names
  beam_lib: Handle rare race in the crypto key server functionality
  busy_port_SUITE: Avoid crash in register/2
  [wx] Re-generate code
  [wx] Remove optional shadowing clauses
  [wx] Remove warning
  [wx] Fix trailing whitespace
  [wx] Test colors in textctrl
  [wx] Fix cleanup memory references

1 files changed, 22 insertions, 0 deletions

diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 00ef1289ab..b75b0cc74e 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -448,3 +448,25 @@ systemSettings(Config) ->
 
     wxWindow:show(Frame),
     wx_test_lib:wx_destroy(Frame,Config).
+
+
+textCtrl(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+textCtrl(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
+
+    TC = ?mt(wxTextCtrl, wxTextCtrl:new(Frame, ?wxID_ANY, [{style, ?wxTE_MULTILINE bor ?wxTE_RICH2}])),
+    wxTextCtrl:appendText(TC, "This line is in default color\n"),
+    Attr = ?mt(wxTextAttr, wxTextAttr:new(?wxRED)),
+    wxTextCtrl:setDefaultStyle(TC, Attr),
+    wxTextCtrl:appendText(TC, "This line is in ?wxRED color\n"),
+    wxTextAttr:setTextColour(Attr, ?wxBLACK),
+    wxTextCtrl:setDefaultStyle(TC, Attr),
+    wxTextCtrl:appendText(TC, "This line is in ?wxBLACK color\n"),
+    Default = wxSystemSettings:getColour(?wxSYS_COLOUR_WINDOWTEXT),
+    wxTextAttr:setTextColour(Attr, Default),
+    wxTextCtrl:setDefaultStyle(TC, Attr),
+    wxTextCtrl:appendText(TC, "This line is in default color\n"),
+    wxTextAttr:destroy(Attr),
+    wxWindow:show(Frame),
+    wx_test_lib:wx_destroy(Frame,Config).