From 28c0d4ffa1ccd9828f00be1c96405484b5e5d681 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 6 Aug 2001 03:17:43 +0000 Subject: 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 --- FL/Enumerations.H | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'FL/Enumerations.H') 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 $". // -- cgit v1.2.3