diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-08 18:32:16 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-08 18:32:16 +0000 |
| commit | 84950c0af7f9cce03c0afd9895d139f379fa30c9 (patch) | |
| tree | 76832adb21bd134a80f8922445ed5f59763bc447 /src | |
| parent | 6fa4abfe545e04186bca73f4d1e12fb7eb091ead (diff) | |
Fl_Output didn't grab input focus, and so was unable to handle CTRL-C
to copy selected text, and wouldn't know when to redraw itself when
it lost focus...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2057 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Input_.cxx | 10 | ||||
| -rw-r--r-- | src/Fl_Output.cxx | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx index c9a811e81..ed40d1d48 100644 --- a/src/Fl_Input_.cxx +++ b/src/Fl_Input_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.7 2002/03/07 19:22:56 spitzak Exp $" +// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.8 2002/04/08 18:32:16 easysw Exp $" // // Common input widget routines for the Fast Light Tool Kit (FLTK). // @@ -696,6 +696,11 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) { case FL_PUSH: handle_mouse(X, Y, W, H, Fl::event_state(FL_SHIFT)); + + if (Fl::focus() != this) { + Fl::focus(this); + handle(FL_FOCUS); + } return 1; case FL_DRAG: @@ -707,6 +712,7 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) { copy(0); return 1; +// MRS: FL_SELECTIONCLEAR is no longer used... // case FL_SELECTIONCLEAR: // minimal_update(mark_, position_); // mark_ = position_; @@ -858,5 +864,5 @@ Fl_Input_::~Fl_Input_() { } // -// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.7 2002/03/07 19:22:56 spitzak Exp $". +// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.8 2002/04/08 18:32:16 easysw Exp $". // diff --git a/src/Fl_Output.cxx b/src/Fl_Output.cxx index 504329f86..c5379157f 100644 --- a/src/Fl_Output.cxx +++ b/src/Fl_Output.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Output.cxx,v 1.6.2.3.2.1 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_Output.cxx,v 1.6.2.3.2.2 2002/04/08 18:32:16 easysw Exp $" // // Output widget for the Fast Light Tool Kit (FLTK). // @@ -38,7 +38,10 @@ void Fl_Output::draw() { } int Fl_Output::handle(int event) { - if (event == FL_FOCUS) return 0; + if (event == FL_KEYBOARD && Fl::event_text()[0] == 0x03) { + // Handle CTRL-C for copy... + return copy(1); + } Fl_Boxtype b = box() ? box() : FL_DOWN_BOX; return Fl_Input_::handletext(event, x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b), @@ -46,5 +49,5 @@ int Fl_Output::handle(int event) { } // -// End of "$Id: Fl_Output.cxx,v 1.6.2.3.2.1 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_Output.cxx,v 1.6.2.3.2.2 2002/04/08 18:32:16 easysw Exp $". // |