mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A few more comments. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7450 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2010-04-05 22:26:29 +00:00
parent 61cf49ddfc
commit 2bf6fa6074
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FL/Fl_Text_Buffer.H
View File

@ -411,7 +411,6 @@ public:
/**
Returns a non 0 value if text has been selected, 0 otherwise
\todo unicode check
*/
int selected() const { return mPrimary.selected(); }
@ -468,7 +467,6 @@ public:
/**
Returns a non 0 value if text has been selected in the secondary
text selection, 0 otherwise
\todo unicode check
*/
int secondary_selected() { return mSecondary.selected(); }
@ -527,7 +525,6 @@ public:
/**
Returns the highlighted text. When you are done with the
text, free it using the free() function.
\todo unicode check
*/
int highlight() { return mHighlight.selected(); }
@ -786,25 +783,21 @@ public:
/**
Returns the primary selection.
\todo unicode check
*/
const Fl_Text_Selection* primary_selection() const { return &mPrimary; }
/**
Returns the primary selection.
\todo unicode check
*/
Fl_Text_Selection* primary_selection() { return &mPrimary; }
/**
Returns the secondary selection.
\todo unicode check
*/
const Fl_Text_Selection* secondary_selection() const { return &mSecondary; }
/**
Returns the current highlight selection.
\todo unicode check
*/
const Fl_Text_Selection* highlight_selection() const { return &mHighlight; }
@ -944,6 +937,10 @@ protected:
*/
const char *address(int pos) const
{ return (pos < mGapStart) ? mBuf+pos : mBuf+pos+mGapEnd-mGapStart; }
/**
Convert a byte offset in buffer into a memory address.
*/
char *address(int pos)
{ return (pos < mGapStart) ? mBuf+pos : mBuf+pos+mGapEnd-mGapStart; }

4
src/Fl_Text_Display.cxx
View File

@ -1506,7 +1506,7 @@ void Fl_Text_Display::draw_vline(int visLineNum, int leftClip, int rightClip,
buf->tab_distance());
charStyle = position_style( lineStartPos, lineLen, charIndex,
outIndex + dispIndexOffset );
for ( i = 0; i < charLen; i++ ) {
for ( i = 0; i < charLen; i++ ) { // FIXME: this rips apart the utf-8 sequneces
if ( i != 0 && charIndex < lineLen && lineStr[ charIndex ] == '\t' )
charStyle = position_style( lineStartPos, lineLen,
charIndex, outIndex + dispIndexOffset );
@ -1548,7 +1548,7 @@ void Fl_Text_Display::draw_vline(int visLineNum, int leftClip, int rightClip,
buf->tab_distance());
charStyle = position_style( lineStartPos, lineLen, charIndex,
outIndex + dispIndexOffset );
for ( i = 0; i < charLen; i++ ) {
for ( i = 0; i < charLen; i++ ) { // FIXME: this rips apart the utf-8 sequneces
if ( i != 0 && charIndex < lineLen && lineStr[ charIndex ] == '\t' )
charStyle = position_style( lineStartPos, lineLen,
charIndex, outIndex + dispIndexOffset );