diff options
| -rw-r--r-- | FL/Enumerations.H | 13 | ||||
| -rw-r--r-- | FL/Fl_Multi_Label.H | 4 | ||||
| -rw-r--r-- | src/Fl_Bitmap.cxx | 3 | ||||
| -rw-r--r-- | src/Fl_Image.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Pixmap.cxx | 3 |
5 files changed, 9 insertions, 20 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index a959a8208..c0fe027b2 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -735,19 +735,12 @@ inline Fl_Boxtype fl_frame(Fl_Boxtype b) { are reserved for internal use and subject to change without notice! The following standard label types are included: - - \todo The doxygen comments are incomplete, and some labeltypes - start with an underscore. Also, there are three - external functions undocumented (yet): - - fl_define_FL_SHADOW_LABEL() - - fl_define_FL_ENGRAVED_LABEL() - - fl_define_FL_EMBOSSED_LABEL() */ -enum Fl_Labeltype { // labeltypes: - FL_NORMAL_LABEL = 0, ///< draws the text (0) +enum Fl_Labeltype { // labeltypes: + FL_NORMAL_LABEL = 0, ///< draws the text (0) FL_NO_LABEL, ///< does nothing _FL_SHADOW_LABEL, ///< draws a drop shadow under the text - _FL_ENGRAVED_LABEL, ///< draws edges as though the text is engraved + _FL_ENGRAVED_LABEL, ///< draws edges as though the text is engraved _FL_EMBOSSED_LABEL, ///< draws edges as though the text is raised _FL_MULTI_LABEL, ///< draws a composite label \see Fl_Multi_Label _FL_ICON_LABEL, ///< draws the icon associated with the text diff --git a/FL/Fl_Multi_Label.H b/FL/Fl_Multi_Label.H index 732289772..c4526146f 100644 --- a/FL/Fl_Multi_Label.H +++ b/FL/Fl_Multi_Label.H @@ -80,12 +80,12 @@ struct FL_EXPORT Fl_Multi_Label { const char* labelb; /** Holds the "type" of labela. Typically this is set to FL_NORMAL_LABEL for a text label, - _FL_IMAGE_LABEL for an image (based on Fl_image) or _FL_MULTI_LABEL + FL_IMAGE_LABEL for an image (based on Fl_image) or FL_MULTI_LABEL if "chaining" multiple Fl_Multi_Label elements together. */ uchar typea; /** Holds the "type" of labelb. Typically this is set to FL_NORMAL_LABEL for a text label, - _FL_IMAGE_LABEL for an image (based on Fl_image) or _FL_MULTI_LABEL + FL_IMAGE_LABEL for an image (based on Fl_image) or FL_MULTI_LABEL if "chaining" multiple Fl_Multi_Label elements together. */ uchar typeb; diff --git a/src/Fl_Bitmap.cxx b/src/Fl_Bitmap.cxx index 16e0ae5e8..c35a63538 100644 --- a/src/Fl_Bitmap.cxx +++ b/src/Fl_Bitmap.cxx @@ -150,8 +150,7 @@ void Fl_Bitmap::label(Fl_Widget* widget) { } void Fl_Bitmap::label(Fl_Menu_Item* m) { - Fl::set_labeltype(_FL_IMAGE_LABEL, labeltype, measure); - m->label(_FL_IMAGE_LABEL, (const char*)this); + m->label(FL_IMAGE_LABEL, (const char*)this); } Fl_Image *Fl_Bitmap::copy(int W, int H) { diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index a43a596eb..2a01f8558 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -142,8 +142,7 @@ void Fl_Image::label(Fl_Widget* widget) { instead. */ void Fl_Image::label(Fl_Menu_Item* m) { - Fl::set_labeltype(_FL_IMAGE_LABEL, labeltype, measure); - m->label(_FL_IMAGE_LABEL, (const char*)this); + m->label(FL_IMAGE_LABEL, (const char*)this); } /** @@ -584,8 +583,7 @@ void Fl_RGB_Image::label(Fl_Widget* widget) { } void Fl_RGB_Image::label(Fl_Menu_Item* m) { - Fl::set_labeltype(_FL_IMAGE_LABEL, labeltype, measure); - m->label(_FL_IMAGE_LABEL, (const char*)this); + m->label(FL_IMAGE_LABEL, (const char*)this); } int Fl_RGB_Image::draw_scaled(int X, int Y, int W, int H) { diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index cebbda901..04fc6312d 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -95,8 +95,7 @@ void Fl_Pixmap::label(Fl_Widget* widget) { } void Fl_Pixmap::label(Fl_Menu_Item* m) { - Fl::set_labeltype(_FL_IMAGE_LABEL, labeltype, Fl_Image::measure); - m->label(_FL_IMAGE_LABEL, (const char*)this); + m->label(FL_IMAGE_LABEL, (const char*)this); } void Fl_Pixmap::copy_data() { |