Revision: 4806 http://geany.svn.sourceforge.net/geany/?rev=4806&view=rev Author: ntrel Date: 2010-04-07 16:58:33 +0000 (Wed, 07 Apr 2010)

Log Message: ----------- Backport fix from Scintilla CVS to fix using SCI_GETSELECTIONSTART and SCI_GETSELECTIONEND with rectangular selections. This fixes replacing in a rectangular selection.

Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Editor.cxx

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-04-06 17:11:36 UTC (rev 4805) +++ trunk/ChangeLog 2010-04-07 16:58:33 UTC (rev 4806) @@ -1,3 +1,11 @@ +2010-04-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/Editor.cxx: + Backport fix from Scintilla CVS to fix using SCI_GETSELECTIONSTART + and SCI_GETSELECTIONEND with rectangular selections. This fixes + replacing in a rectangular selection. + + 2010-04-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

* src/filetypes.c:

Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2010-04-06 17:11:36 UTC (rev 4805) +++ trunk/scintilla/Editor.cxx 2010-04-07 16:58:33 UTC (rev 4806) @@ -6861,14 +6861,14 @@ break;

case SCI_GETSELECTIONSTART: - return Platform::Minimum(sel.MainAnchor(), sel.MainCaret()); + return sel.LimitsForRectangularElseMain().start.Position();

case SCI_SETSELECTIONEND: SetSelection(wParam, Platform::Minimum(sel.MainAnchor(), wParam)); break;

case SCI_GETSELECTIONEND: - return Platform::Maximum(sel.MainAnchor(), sel.MainCaret()); + return sel.LimitsForRectangularElseMain().end.Position();

case SCI_SETPRINTMAGNIFICATION: printMagnification = wParam;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.