diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-09 13:35:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-09 13:35:49 +0000 |
| commit | 13ae564f03a3ea7dd86e218fb287363842371cba (patch) | |
| tree | 28f0478578cd2be81328e60b1c8c4608b411e434 /FL | |
| parent | d769df9a59601459c26f3ba9b18b0bdba2f36855 (diff) | |
Add color definitions for "dark red", etc.
Change "text" and "selecion" methods to return char *, not const char *,
since they return a changeable copy of the text.
Add range checking to style lookup in Fl_Text_Display.
Add syntax hilighting to editor example.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2299 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 12 | ||||
| -rw-r--r-- | FL/Fl_Text_Buffer.H | 20 |
2 files changed, 20 insertions, 12 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index cbf81f1f9..92e6f1454 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.18.2.14.2.23 2002/04/26 11:32:37 easysw Exp $" +// "$Id: Enumerations.H,v 1.18.2.14.2.24 2002/06/09 13:35:49 easysw Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -298,6 +298,14 @@ enum Fl_Color { // standard colors FL_BLUE = 216, FL_MAGENTA = 248, FL_CYAN = 223, + FL_DARK_RED = 72, + + FL_DARK_GREEN = 60, + FL_DARK_YELLOW = 76, + FL_DARK_BLUE = 136, + FL_DARK_MAGENTA = 152, + FL_DARK_CYAN = 140, + FL_WHITE = 255 }; @@ -389,5 +397,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.18.2.14.2.23 2002/04/26 11:32:37 easysw Exp $". +// End of "$Id: Enumerations.H,v 1.18.2.14.2.24 2002/06/09 13:35:49 easysw Exp $". // diff --git a/FL/Fl_Text_Buffer.H b/FL/Fl_Text_Buffer.H index eee2f5a4a..0c342c062 100644 --- a/FL/Fl_Text_Buffer.H +++ b/FL/Fl_Text_Buffer.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Buffer.H,v 1.3.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Text_Buffer.H,v 1.3.2.3 2002/06/09 13:35:49 easysw Exp $" // // Header file for Fl_Text_Buffer class. // @@ -72,11 +72,11 @@ class FL_EXPORT Fl_Text_Buffer { ~Fl_Text_Buffer(); int length() { return mLength; } - const char* text(); + char* text(); void text(const char* text); - const char* text_range(int start, int end); + char* text_range(int start, int end); char character(int pos); - const char* text_in_rectangle(int start, int end, int rectStart, int rectEnd); + char* text_in_rectangle(int start, int end, int rectStart, int rectEnd); void insert(int pos, const char* text); void append(const char* text) { insert(length(), text); } void remove(int start, int end); @@ -114,7 +114,7 @@ class FL_EXPORT Fl_Text_Buffer { int selection_position(int* start, int* end, int* isRect, int* rectStart, int* rectEnd); - const char* selection_text(); + char* selection_text(); void remove_selection(); void replace_selection(const char* text); void secondary_select(int start, int end); @@ -126,7 +126,7 @@ class FL_EXPORT Fl_Text_Buffer { int secondary_selection_position(int* start, int* end, int* isRect, int* rectStart, int* rectEnd); - const char* secondary_selection_text(); + char* secondary_selection_text(); void remove_secondary_selection(); void replace_secondary_selection(const char* text); void highlight(int start, int end); @@ -136,13 +136,13 @@ class FL_EXPORT Fl_Text_Buffer { int highlight_position(int* start, int* end, int* isRect, int* rectStart, int* rectEnd); - const char* highlight_text(); + char* highlight_text(); void add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg); void remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg); void call_modify_callbacks() { call_modify_callbacks(0, 0, 0, 0, 0); } - const char* line_text(int pos); + char* line_text(int pos); int line_start(int pos); int line_end(int pos); int word_start(int pos); @@ -198,7 +198,7 @@ class FL_EXPORT Fl_Text_Buffer { void move_gap(int pos); void reallocate_with_gap(int newGapStart, int newGapLen); - const char* selection_text_(Fl_Text_Selection* sel); + char* selection_text_(Fl_Text_Selection* sel); void remove_selection_(Fl_Text_Selection* sel); void replace_selection_(Fl_Text_Selection* sel, const char* text); @@ -238,5 +238,5 @@ class FL_EXPORT Fl_Text_Buffer { #endif // -// End of "$Id: Fl_Text_Buffer.H,v 1.3.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Text_Buffer.H,v 1.3.2.3 2002/06/09 13:35:49 easysw Exp $". // |