diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-29 17:34:47 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-29 17:34:47 +0000 |
| commit | 7e128e13da5fa97929d77e520bf9ca1e73b78345 (patch) | |
| tree | 7df56189ee16cea21719b5f2a603dc854171e644 | |
| parent | b20688cfbf15ee1356d6c0452d65e9f8559480d7 (diff) | |
Fix cursor problems and add Shift-Delete, Ctrl-Insert, and Shift-Insert
to the default key mapping.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2700 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | src/Fl_Text_Display.cxx | 5 | ||||
| -rw-r--r-- | src/Fl_Text_Editor.cxx | 7 |
3 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,10 @@ CHANGES IN FLTK 1.1.2 + - Fl_Text_Editor now supports Shift+Delete, Ctrl+Insert, + and Shift+Insert for cut, copy, and paste, + respectively. + - Fl_Text_Display didn't restore the mouse pointer when + hidden. - Fl::arg() now ignores the MacOS X -psn_N_NNNNN option. - Added another change to the WIN32 redraw handling for the MingW compilers. diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index d238c304c..d1537d5bf 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.cxx,v 1.12.2.34 2002/10/24 17:26:03 easysw Exp $" +// "$Id: Fl_Text_Display.cxx,v 1.12.2.35 2002/10/29 17:34:44 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -2956,6 +2956,7 @@ int Fl_Text_Display::handle(int event) { } case FL_LEAVE: + case FL_HIDE: if (active_r()) { fl_cursor(FL_CURSOR_DEFAULT); @@ -3027,5 +3028,5 @@ int Fl_Text_Display::handle(int event) { // -// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.34 2002/10/24 17:26:03 easysw Exp $". +// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.35 2002/10/29 17:34:44 easysw Exp $". // diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx index f7fd55b8a..29725ca42 100644 --- a/src/Fl_Text_Editor.cxx +++ b/src/Fl_Text_Editor.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Editor.cxx,v 1.9.2.8 2002/10/23 12:23:40 easysw Exp $" +// "$Id: Fl_Text_Editor.cxx,v 1.9.2.9 2002/10/29 17:34:47 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -96,8 +96,11 @@ static struct { //{ 'z', FL_CTRL, Fl_Text_Editor::undo }, //{ '/', FL_CTRL, Fl_Text_Editor::undo }, { 'x', FL_CTRL, Fl_Text_Editor::kf_cut }, + { FL_Delete, FL_SHIFT, Fl_Text_Editor::kf_cut }, { 'c', FL_CTRL, Fl_Text_Editor::kf_copy }, + { FL_Insert, FL_CTRL, Fl_Text_Editor::kf_copy }, { 'v', FL_CTRL, Fl_Text_Editor::kf_paste }, + { FL_Insert, FL_SHIFT, Fl_Text_Editor::kf_paste }, { 'a', FL_CTRL, ctrl_a }, { 0, 0, 0 } }; @@ -439,5 +442,5 @@ int Fl_Text_Editor::handle(int event) { } // -// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.8 2002/10/23 12:23:40 easysw Exp $". +// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.9 2002/10/29 17:34:47 easysw Exp $". // |