From 3e415b32369a3656be2404963969e1a266eb8ea5 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 24 Sep 2009 14:36:15 +0000 Subject: [PATCH] Applied #10891: ChangeValue instead of SetValue in wxTextCtrlBase::DoLoadFile git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 16 ++++++++++------ src/common/textcmn.cpp | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index d9c12ce964..dc75dfa8cb 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -91,13 +91,16 @@ Major new features in 2.8 release 2.8.11: ------- -*** INCOMPATIBLE CHANGE: *** +*** INCOMPATIBLE CHANGES: *** -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. +1. 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: @@ -125,6 +128,7 @@ 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. wxMSW: diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index 6f53679d6b..5204775a74 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) ) { - SetValue(text); + ChangeValue(text); DiscardEdits();