From 23812a03abf438dbc47107dc02f7f0f3f5201841 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 24 Sep 2009 18:20:21 +0000 Subject: [PATCH] Reverted change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 7 +------ src/common/textcmn.cpp | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 47339e43ae..f95bc1504b 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -93,15 +93,11 @@ Major new features in 2.8 release *** INCOMPATIBLE CHANGES: *** -1. Due to an oversight, a bug fix in wxMSW resulted in an incompatible change in + Due to an oversight, a bug fix in wxMSW resulted in an incompatible change in wxTreeCtrl behaviour: its EVT_TREE_ITEM_ACTIVATED handler now must skip the event being processed to allow the item to be toggled by double clicking on it. I.e. you need to ensure there is an "event.Skip()" in your item activation handler if you do wish to allow the item to be toggled. - -2. wxTextCtrl::LoadFile no longer sends a text event. This corrects problematic - behaviour with spurious document modification. - All: @@ -128,7 +124,6 @@ All (GUI): where invalid sizes caused incorrect second invocation of page setup dialog. - Corrected writing direction for Farsi. -- wxTextCtrl::LoadFile no longer sends a text event. - Added wxBORDER_THEME to XRC. wxMSW: diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index 5204775a74..6f53679d6b 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -205,7 +205,7 @@ bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType) wxString text; if ( file.ReadAll(&text) ) { - ChangeValue(text); + SetValue(text); DiscardEdits();