From 498ef1d6dc06ba75995ddb0f030c8a09725f57ff Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Apr 2014 22:38:44 +0000 Subject: [PATCH] Don't call AdjustSpaceLimit() explicitly in wxMSW wxTextCtrl any more. There is no need to do it as this is done by DoWriteText() and AdjustSpaceLimit() doesn't work correctly if called from outside of it now. Because of this, also make it private to prevent other accidental calls to it. Closes #15980. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/textctrl.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index b7f25530c6..dfdf2c6e3f 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1385,15 +1385,8 @@ void wxTextCtrl::DoSetSelection(long from, long to, int flags) bool wxTextCtrl::DoLoadFile(const wxString& file, int fileType) { - if ( wxTextCtrlBase::DoLoadFile(file, fileType) ) - { - // update the size limit if needed - AdjustSpaceLimit(); - - return true; - } - - return false; + // This method is kept for ABI compatibility only. + return wxTextCtrlBase::DoLoadFile(file, fileType); } // ----------------------------------------------------------------------------