gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed endless loop in Fl_Text_Display (STR #1655)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5793 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2007-05-01 21:09:39 +00:00
parent 82195b6d68
commit 47e802218d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.8
- Documentation fixes (STR #1454, STR #1455, STR #1456,
STR #1457, STR #1458, STR #1460, STR #1481, STR #1578,
STR #1639, STR #1645, STR #1644)
- Fixed endless loop in Fl_Text_Display (STR #1655)
- Allowing shortcuts in Tabs (STR #1652)
- Fixed Makefile "make clean" (STR #1642, STR #1643, STR #1641)
- The sample RPM spec file now enables large file support

3
src/Fl_Text_Display.cxx
View File

@ -174,6 +174,7 @@ void Fl_Text_Display::buffer( Fl_Text_Buffer *buf ) {
if ( buf == mBuffer) return;
if ( mBuffer != 0 ) {
buffer_modified_cb( 0, 0, mBuffer->length(), 0, 0, this );
mNBufferLines = 0;
mBuffer->remove_modify_callback( buffer_modified_cb, this );
mBuffer->remove_predelete_callback( buffer_predelete_cb, this );
}
@ -1150,7 +1151,7 @@ int Fl_Text_Display::rewind_lines(int startPos, int nLines) {
while (true) {
lineStart = buf->line_start(pos);
wrapped_line_counter(buf, lineStart, pos, INT_MAX,
true, 0, &retPos, &retLines, &retLineStart, &retLineEnd);
true, 0, &retPos, &retLines, &retLineStart, &retLineEnd, false);
if (retLines > nLines)
return skip_lines(lineStart, retLines-nLines,
true);