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 /src | |
| 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 'src')
| -rw-r--r-- | src/Fl_Bitmap.cxx | 3 | ||||
| -rw-r--r-- | src/Fl_Image.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Pixmap.cxx | 3 |
3 files changed, 4 insertions, 8 deletions
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() { |