Fix from Bill - Fl_Choice didn't handle NULL menu items.

git-svn-id: file:///fltk/svn/fltk/trunk@329 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 1999-02-23 14:01:17 +00:00
parent 912a02144a
commit 39b84309f0

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Choice.cxx,v 1.8 1999/02/16 13:48:04 mike Exp $"
// "$Id: Fl_Choice.cxx,v 1.9 1999/02/23 14:01:17 mike Exp $"
//
// Choice widget for the Fast Light Tool Kit (FLTK).
//
@ -42,7 +42,7 @@ void Fl_Choice::draw() {
fl_color(active_r() ? textcolor() : inactive(textcolor()));
fl_draw_shortcut = 2; // hack value to make '&' disappear
int BW = Fl::box_dx(box());
mvalue()->draw( x()+BW+3, y(), w()-2*BW-2-3*H, h(), this);
if (mvalue()) mvalue()->draw( x()+BW+3, y(), w()-2*BW-2-3*H, h(), this);
fl_draw_shortcut = 0;
draw_label();
}
@ -86,5 +86,5 @@ int Fl_Choice::handle(int e) {
}
//
// End of "$Id: Fl_Choice.cxx,v 1.8 1999/02/16 13:48:04 mike Exp $".
// End of "$Id: Fl_Choice.cxx,v 1.9 1999/02/23 14:01:17 mike Exp $".
//