From: Vadim Zeitlin Date: Fri, 31 May 2013 23:21:16 +0000 (+0000) Subject: Fix wxStyledTextCtrl::SetInsertionPointEnd(). X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1054bcb21f76fc28e4cecec71179758497f9c384 Fix wxStyledTextCtrl::SetInsertionPointEnd(). This relied on SetInsertionPoint(-1) working like in wxTextCtrl but it didn't. Add an explicit check to it for consistency with the other classes and to make SetInsertionPointEnd() work. Closes #15234. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/changes.txt b/docs/changes.txt index 8cdf875535..448a54c66c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -668,6 +668,7 @@ All (GUI): - Add more convenient wxFont(wxFontInfo) ctor. - Pass menu events to the handler in the associated wxMenuBar. - Add wxWindow::BeginRepositioningChildren() and EndRepositioningChildren(). +- Fix wxStyledTextCtrl::SetInsertionPointEnd() (troelsk). wxGTK: diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 1edf28158e..c406e6a687 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -4577,7 +4577,10 @@ public: */ - virtual void SetInsertionPoint(long pos) { SetCurrentPos(pos); } + virtual void SetInsertionPoint(long pos) + { + SetCurrentPos(pos == -1 ? GetLastPosition() : pos); + } virtual long GetInsertionPoint() const { return GetCurrentPos(); } virtual long GetLastPosition() const { return GetTextLength(); } diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 1c980ab3cc..b82bea900c 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -319,7 +319,10 @@ public: */ - virtual void SetInsertionPoint(long pos) { SetCurrentPos(pos); } + virtual void SetInsertionPoint(long pos) + { + SetCurrentPos(pos == -1 ? GetLastPosition() : pos); + } virtual long GetInsertionPoint() const { return GetCurrentPos(); } virtual long GetLastPosition() const { return GetTextLength(); }