diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-06 04:15:21 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-06 04:15:21 +0000 |
| commit | 78569947b0770bd538c877b38957365088faf586 (patch) | |
| tree | f1dea871337f1bd0d200526fe120cb06a7c3c830 | |
| parent | 070a4044ebb34dc55a2e76c8f35b8d5ab6d7f4ef (diff) | |
Don't insert text in an Fl_Multiline_Output widget.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2197 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_Input.cxx | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGES IN FLTK 1.1.0rc2 - Portability fixes. + - Fl_Multiline_Output would insert the enter key. - Fl_File_Browser didn't clip items to the column width. - Fl_Window::draw() cleared the window label but didn't restore it, so windows could lose their titles. diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index edd79a2c4..304b5f4a3 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.cxx,v 1.10.2.15.2.9 2002/04/13 22:17:46 easysw Exp $" +// "$Id: Fl_Input.cxx,v 1.10.2.15.2.10 2002/05/06 04:15:21 easysw Exp $" // // Input widget for the Fast Light Tool Kit (FLTK). // @@ -140,7 +140,7 @@ int Fl_Input::handle_key() { position(size(), 0); maybe_do_callback(); return 1; - } else if (input_type() == FL_MULTILINE_INPUT) + } else if (input_type() == FL_MULTILINE_INPUT && !readonly()) return replace(position(), mark(), "\n", 1); else return 0; // reserved for shortcuts @@ -395,5 +395,5 @@ Fl_Input::Fl_Input(int x, int y, int w, int h, const char *l) } // -// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.9 2002/04/13 22:17:46 easysw Exp $". +// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.10 2002/05/06 04:15:21 easysw Exp $". // |