diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-02-23 14:01:17 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-02-23 14:01:17 +0000 |
| commit | 39b84309f0448b720cc93950b64d59dccc7328cd (patch) | |
| tree | 85ccc298e8fe07c9a781f0981d330f325d958a97 /src/Fl_Choice.cxx | |
| parent | 912a02144af4870da5b88895d28c4bcc6da9b111 (diff) | |
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
Diffstat (limited to 'src/Fl_Choice.cxx')
| -rw-r--r-- | src/Fl_Choice.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index 04e359298..da8f0950c 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -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 $". // |