From 3a0fe7916436b5ce5f4ba252f4078dd649b67c6b Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 3 Dec 2001 18:29:49 +0000 Subject: Bug fixes and doco updates care of Sebastian. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1799 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_labeltype.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/fl_labeltype.cxx') diff --git a/src/fl_labeltype.cxx b/src/fl_labeltype.cxx index 657bf40b3..6d848663c 100644 --- a/src/fl_labeltype.cxx +++ b/src/fl_labeltype.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_labeltype.cxx,v 1.6.2.3.2.4 2001/10/29 03:44:33 easysw Exp $" +// "$Id: fl_labeltype.cxx,v 1.6.2.3.2.5 2001/12/03 18:29:49 easysw Exp $" // // Label drawing routines for the Fast Light Tool Kit (FLTK). // @@ -41,16 +41,7 @@ fl_normal_label(const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align) { fl_font(o->font, o->size); fl_color((Fl_Color)o->color); - if (o->image) { - if (align & FL_ALIGN_TEXT_OVER_IMAGE) { - fl_draw(o->value, X, Y, W, H, align, o->image); - } else { - fl_draw(o->value, X, Y, W, H, align, o->image); - } - } - else { - fl_draw(o->value, X, Y, W, H, align, o->image); - } + fl_draw(o->value, X, Y, W, H, align, o->image); } void @@ -136,5 +127,5 @@ void Fl_Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const { #include // -// End of "$Id: fl_labeltype.cxx,v 1.6.2.3.2.4 2001/10/29 03:44:33 easysw Exp $". +// End of "$Id: fl_labeltype.cxx,v 1.6.2.3.2.5 2001/12/03 18:29:49 easysw Exp $". // -- cgit v1.2.3