Fixed #14417: wxRichTextCtrl crashes on LoadFile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-06-18 18:45:30 +00:00
parent 268fba466f
commit 5a376169b1
2 changed files with 3 additions and 1 deletions

View File

@@ -2663,6 +2663,8 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
{
SetFocusObject(& GetBuffer(), true);
bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);
if (success)
m_filename = filename;

View File

@@ -158,7 +158,7 @@ bool wxRichTextStylePage::TransferDataFromWindow()
bool wxRichTextStylePage::TransferDataToWindow()
{
wxPanel::TransferDataToWindow();
wxRichTextStyleDefinition* def = wxRichTextFormattingDialog::GetDialogStyleDefinition(this);
if (def)
{