Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-09-22 14:53:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UTF8: Fl_Text_Display and related:

Browse Source 
+ Modified selection buffer access methods to return const Fl_Text_Selection pointers. Added a non const get method for the main selection buffer.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6822 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini
2009-07-04 00:24:26 +00:00
parent 06b58d92bd
commit 691ab84503
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Text_Buffer.H
+4 -2
View File
@@ -242,11 +242,13 @@ class FL_EXPORT Fl_Text_Buffer {
/** Returns the current nul substitution character. */
char null_substitution_character() const { return mNullSubsChar; }
/** Returns the primary selection. */
const Fl_Text_Selection* primary_selection() const { return &mPrimary; }
/** Returns the primary selection. */
Fl_Text_Selection* primary_selection() { return &mPrimary; }
/** Returns the secondary selection. */
Fl_Text_Selection* secondary_selection() { return &mSecondary; }
const Fl_Text_Selection* secondary_selection() const { return &mSecondary; }
/** Returns the current highlight selection. */
Fl_Text_Selection* highlight_selection() { return &mHighlight; }
const Fl_Text_Selection* highlight_selection() const { return &mHighlight; }
protected:
void call_modify_callbacks(int pos, int nDeleted, int nInserted,
FL/Fl_Text_Display.H
+2 -2
View File
@@ -253,8 +253,8 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group {
int *nextLineStart);
int measure_proportional_character(char c, int colNum, int pos);
int wrap_uses_character(int lineEndPos);
int range_touches_selection(Fl_Text_Selection *sel, int rangeStart,
int rangeEnd);
int range_touches_selection(const Fl_Text_Selection *sel, int rangeStart,
int rangeEnd) const;
#ifndef FL_DOXYGEN
int damage_range1_start, damage_range1_end;
int damage_range2_start, damage_range2_end;
src/Fl_Text_Display.cxx
+2 -2
View File
@@ -3011,8 +3011,8 @@ int Fl_Text_Display::wrap_uses_character(int lineEndPos) {
Return true if the selection "sel" is rectangular, and touches a
buffer position withing "rangeStart" to "rangeEnd"
*/
int Fl_Text_Display::range_touches_selection(Fl_Text_Selection *sel,
int rangeStart, int rangeEnd) {
int Fl_Text_Display::range_touches_selection(const Fl_Text_Selection *sel,
int rangeStart, int rangeEnd) const {
return sel->selected() && sel->rectangular() && sel->end() >= rangeStart &&
sel->start() <= rangeEnd;
}