diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-06 03:17:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-06 03:17:43 +0000 |
| commit | 28c0d4ffa1ccd9828f00be1c96405484b5e5d681 (patch) | |
| tree | 1d3b2b901ccbfdf6e50168f7ff51dd7954b50c3c /FL | |
| parent | 7ebaf77cdcbcadb4706c87f1662730a4687caf20 (diff) | |
Symbols are now supported by main label drawing code - @@ to insert a
single @. Currently only 1 symbol per label, at the beginning or end of the
label string, with the remaining text (and image) getting formatted as
usual. The size of the symbol == lines * labelsize, unless there is
no text in which case the size == height of label area.
Fl_Menu_Item::draw() didn't clear the image field in the Fl_Label
structure.
Removed Fl::enable_symbols(), which is now the default.
Dropped FL_IMAGE_LABEL, FL_PIXMAP_LABEL, and FL_BITMAP_LABEL types,
which are no longer needed.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1561 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 11 | ||||
| -rw-r--r-- | FL/Fl.H | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 05ce6caf8..83db4a5e3 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.18.2.14.2.4 2001/08/05 23:58:54 easysw Exp $" +// "$Id: Enumerations.H,v 1.18.2.14.2.5 2001/08/06 03:17:43 easysw Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -195,20 +195,15 @@ inline Fl_Boxtype frame(Fl_Boxtype b) {return (Fl_Boxtype)(b|2);} enum Fl_Labeltype { // labeltypes: FL_NORMAL_LABEL = 0, FL_NO_LABEL, - _FL_SYMBOL_LABEL, _FL_SHADOW_LABEL, _FL_ENGRAVED_LABEL, _FL_EMBOSSED_LABEL, - _FL_BITMAP_LABEL, - _FL_PIXMAP_LABEL, - _FL_IMAGE_LABEL, _FL_MULTI_LABEL, _FL_ICON_LABEL, FL_FREE_LABELTYPE }; -extern Fl_Labeltype FL_EXPORT define_FL_SYMBOL_LABEL(); -#define FL_SYMBOL_LABEL define_FL_SYMBOL_LABEL() +#define FL_SYMBOL_LABEL FL_NORMAL_LABEL extern Fl_Labeltype FL_EXPORT define_FL_SHADOW_LABEL(); #define FL_SHADOW_LABEL define_FL_SHADOW_LABEL() extern Fl_Labeltype FL_EXPORT define_FL_ENGRAVED_LABEL(); @@ -369,5 +364,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.18.2.14.2.4 2001/08/05 23:58:54 easysw Exp $". +// End of "$Id: Enumerations.H,v 1.18.2.14.2.5 2001/08/06 03:17:43 easysw Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: Fl.H,v 1.8.2.11.2.1 2001/08/02 20:09:25 easysw Exp $" +// "$Id: Fl.H,v 1.8.2.11.2.2 2001/08/06 03:17:43 easysw Exp $" // // Main header file for the Fast Light Tool Kit (FLTK). // @@ -187,7 +187,6 @@ public: // labeltypes: static FL_EXPORT void set_labeltype(Fl_Labeltype,Fl_Label_Draw_F*,Fl_Label_Measure_F*); static FL_EXPORT void set_labeltype(Fl_Labeltype, Fl_Labeltype from); - static FL_EXPORT void enable_symbols(); // boxtypes: static FL_EXPORT void set_boxtype(Fl_Boxtype, Fl_Box_Draw_F*,uchar,uchar,uchar,uchar); @@ -218,5 +217,5 @@ public: #endif // -// End of "$Id: Fl.H,v 1.8.2.11.2.1 2001/08/02 20:09:25 easysw Exp $". +// End of "$Id: Fl.H,v 1.8.2.11.2.2 2001/08/06 03:17:43 easysw Exp $". // |