protect gs_allThreads with a mutex (modified patch 1518719)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index ff192a817f889d51deeb23234f99711f6acb5459..ec18b3373a92fe233d10e2b7752a1b0fb22c75f1 100644 (file)
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -577,8 +577,6 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     editMenu->Append(wxID_COPY, _("&Copy\tCtrl+C"));
     editMenu->Append(wxID_PASTE, _("&Paste\tCtrl+V"));
 
     editMenu->Append(wxID_COPY, _("&Copy\tCtrl+C"));
     editMenu->Append(wxID_PASTE, _("&Paste\tCtrl+V"));
 

-    editMenu->Append(wxID_CLEAR, _("&Delete\tDel"));
-

     editMenu->AppendSeparator();
     editMenu->Append(wxID_SELECTALL, _("Select A&ll\tCtrl+A"));
 #if 0
     editMenu->AppendSeparator();
     editMenu->Append(wxID_SELECTALL, _("Select A&ll\tCtrl+A"));
 #if 0


@@ -726,7 +724,9 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     r.BeginBold();
 
     r.BeginFontSize(14);
     r.BeginBold();
 
     r.BeginFontSize(14);

-    r.WriteText(wxT("Welcome to wxRichTextCtrl, a wxWidgets control for editing and presenting styled text and images"));
+    r.WriteText(wxT("Welcome to wxRichTextCtrl, a wxWidgets control"));
+    r.LineBreak();
+    r.WriteText(wxT("for editing and presenting styled text and images"));

     r.EndFontSize();
     r.Newline();
 
     r.EndFontSize();
     r.Newline();