diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-29 14:30:23 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-29 14:30:23 +0000 |
| commit | d7e327acb6f6941d028f5ef01523853a6940dcb7 (patch) | |
| tree | e3a87813d52528e4fac6e7310754f13ed83e60e1 | |
| parent | 87dd7f0d23eba5c09e71ec6efeb34c6844f5e95f (diff) | |
Fl_Input didn't handle box type of FL_NO_BOX properly.
(patch from Curtis)
git-svn-id: file:///fltk/svn/fltk/trunk@178 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_Input.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index 88f4d7152..4f3a7aa98 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.cxx,v 1.5 1998/12/02 15:39:31 mike Exp $" +// "$Id: Fl_Input.cxx,v 1.6 1998/12/29 14:30:23 mike Exp $" // // Input widget for the Fast Light Tool Kit (FLTK). // @@ -38,7 +38,7 @@ void Fl_Input::draw() { if (type() == FL_HIDDEN_INPUT) return; - Fl_Boxtype b = box() ? box() : FL_DOWN_BOX; + Fl_Boxtype b = box(); if (damage() & FL_DAMAGE_ALL) draw_box(b, color()); Fl_Input_::drawtext(x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b), w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b)); @@ -312,15 +312,17 @@ int Fl_Input::handle(int event) { if (Fl::event_button() == 2) return 0; break; } - Fl_Boxtype b = box() ? box() : FL_DOWN_BOX; + Fl_Boxtype b = box(); return Fl_Input_::handletext(event, x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b), w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b)); } Fl_Input::Fl_Input(int x, int y, int w, int h, const char *l) -: Fl_Input_(x, y, w, h, l) {} +: Fl_Input_(x, y, w, h, l) { + box(FL_DOWN_BOX); +} // -// End of "$Id: Fl_Input.cxx,v 1.5 1998/12/02 15:39:31 mike Exp $". +// End of "$Id: Fl_Input.cxx,v 1.6 1998/12/29 14:30:23 mike Exp $". // |