mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove leading underscore from labeltyps as far as possible.

Browse Source 
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
This commit is contained in:
Albrecht Schlosser 2017-09-12 13:05:48 +00:00
parent e629a9275b
commit a6803d71c6
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FL/Enumerations.H
View File

@ -735,19 +735,12 @@ inline Fl_Boxtype fl_frame(Fl_Boxtype b) {
are reserved for internal use and subject to change without notice! are reserved for internal use and subject to change without notice!
The following standard label types are included: 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: enum Fl_Labeltype { // labeltypes:
FL_NORMAL_LABEL = 0, ///< draws the text (0) FL_NORMAL_LABEL = 0, ///< draws the text (0)
FL_NO_LABEL, ///< does nothing FL_NO_LABEL, ///< does nothing
_FL_SHADOW_LABEL, ///< draws a drop shadow under the text _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_EMBOSSED_LABEL, ///< draws edges as though the text is raised
_FL_MULTI_LABEL, ///< draws a composite label \see Fl_Multi_Label _FL_MULTI_LABEL, ///< draws a composite label \see Fl_Multi_Label
_FL_ICON_LABEL, ///< draws the icon associated with the text _FL_ICON_LABEL, ///< draws the icon associated with the text

4
FL/Fl_Multi_Label.H
View File

@ -80,12 +80,12 @@ struct FL_EXPORT Fl_Multi_Label {
const char* labelb; const char* labelb;
/** Holds the "type" of labela. /** Holds the "type" of labela.
Typically this is set to FL_NORMAL_LABEL for a text label, 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. */ if "chaining" multiple Fl_Multi_Label elements together. */
uchar typea; uchar typea;
/** Holds the "type" of labelb. /** Holds the "type" of labelb.
Typically this is set to FL_NORMAL_LABEL for a text label, 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. */ if "chaining" multiple Fl_Multi_Label elements together. */
uchar typeb; uchar typeb;

3
src/Fl_Bitmap.cxx
View File

@ -150,8 +150,7 @@ void Fl_Bitmap::label(Fl_Widget* widget) {
} }
void Fl_Bitmap::label(Fl_Menu_Item* m) { 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) { Fl_Image *Fl_Bitmap::copy(int W, int H) {

6
src/Fl_Image.cxx
View File

@ -142,8 +142,7 @@ void Fl_Image::label(Fl_Widget* widget) {
instead. instead.
*/ */
void Fl_Image::label(Fl_Menu_Item* m) { 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) { 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) { int Fl_RGB_Image::draw_scaled(int X, int Y, int W, int H) {

3
src/Fl_Pixmap.cxx
View File

@ -95,8 +95,7 @@ void Fl_Pixmap::label(Fl_Widget* widget) {
} }
void Fl_Pixmap::label(Fl_Menu_Item* m) { 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() { void Fl_Pixmap::copy_data() {