From 4163d5b5addeaa2cf68d2e0fc829ee80dac35a63 Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Tue, 16 Mar 1999 08:51:02 +0000 Subject: Added clipping suggested by Dmitry Potapov git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@434 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Choice.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/Fl_Choice.cxx') diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index 6a39df387..c286e8711 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Choice.cxx,v 1.10.2.1 1999/03/13 20:45:20 bill Exp $" +// "$Id: Fl_Choice.cxx,v 1.10.2.2 1999/03/16 08:51:02 bill Exp $" // // Choice widget for the Fast Light Tool Kit (FLTK). // @@ -41,10 +41,12 @@ void Fl_Choice::draw() { if (mvalue()) { Fl_Menu_Item m = *mvalue(); if (active_r()) m.activate(); else m.deactivate(); - fl_draw_shortcut = 2; // hack value to make '&' disappear int BW = Fl::box_dx(box()); - m.draw( x()+BW, y(), w()-2*BW-3*H, h(), this); + fl_clip(x(), y(), w()-3*H, h()); + fl_draw_shortcut = 2; // hack value to make '&' disappear + m.draw(x()+BW, y(), w()-2*BW-3*H, h(), this); fl_draw_shortcut = 0; + fl_pop_clip(); } draw_label(); } @@ -88,5 +90,5 @@ int Fl_Choice::handle(int e) { } // -// End of "$Id: Fl_Choice.cxx,v 1.10.2.1 1999/03/13 20:45:20 bill Exp $". +// End of "$Id: Fl_Choice.cxx,v 1.10.2.2 1999/03/16 08:51:02 bill Exp $". // -- cgit v1.2.3