Fixed #14417: wxRichTextCtrl crashes on LoadFile

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 9f90f654882b01e0e1df546c5817fe328b7b5f08..e0e80081a1d1acaed8b999e5a327bb88c54d54db 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -2663,6 +2663,8 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
 
 bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 {
 
 bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 {

+    SetFocusObject(& GetBuffer(), true);
+

     bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);
     if (success)
         m_filename = filename;
     bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);
     if (success)
         m_filename = filename;

diff --git a/src/richtext/richtextstylepage.cpp b/src/richtext/richtextstylepage.cpp
index 2d403075e45040e0b64a33d010ba7e06ebbc445c..372ef360409f390cd45f1966b95acddc88a0e5bd 100644 (file)
--- a/src/richtext/richtextstylepage.cpp
+++ b/src/richtext/richtextstylepage.cpp
@@ -158,7 +158,7 @@ bool wxRichTextStylePage::TransferDataFromWindow()
 bool wxRichTextStylePage::TransferDataToWindow()
 {
     wxPanel::TransferDataToWindow();
 bool wxRichTextStylePage::TransferDataToWindow()
 {
     wxPanel::TransferDataToWindow();

-    
+

     wxRichTextStyleDefinition* def = wxRichTextFormattingDialog::GetDialogStyleDefinition(this);
     if (def)
     {
     wxRichTextStyleDefinition* def = wxRichTextFormattingDialog::GetDialogStyleDefinition(this);
     if (def)
     {