diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-09-12 13:05:48 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-09-12 13:05:48 +0000 |
| commit | a6803d71c620f6dc81bad95f329d66a2461df714 (patch) | |
| tree | 52d6d42f49f3bd4106f8cb4cf51f11bb2d0755d7 /FL | |
| parent | e629a9275bcabcfc9d6e705f2db4ba4e3aa184ec (diff) | |
Remove leading underscore from labeltyps as far as possible.
Removed obsolete '\todo' item from docs (done with recent commits).
Removed redundant code from label assignment (e.g. use FL_IMAGE_LABEL
instead of label type assignment + use of _FL_IMAGE_LABEL).
See recent commits.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12448 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 13 | ||||
| -rw-r--r-- | FL/Fl_Multi_Label.H | 4 |
2 files changed, 5 insertions, 12 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; |