diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-30 14:23:16 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-30 14:23:16 +0000 |
| commit | 299ebf295a9f729f68d1ad3b923cef9e6747132c (patch) | |
| tree | bb8ca12853e707816b69d83e2deaef40683a9dd7 /src | |
| parent | 4bed0a3665cfa558009b8ac9b995eac11278c7a7 (diff) | |
Update tile documentation to be explicit about widgets touching and doing
their own borders.
Support CMD+[cxv] for copy/cut/paste on OSX.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2717 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Input.cxx | 12 | ||||
| -rw-r--r-- | src/Fl_Text_Editor.cxx | 13 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index 236a4cc71..25f6cd00b 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.14 2002/10/10 19:39:49 easysw Exp $" +// "$Id: Fl_Input.cxx,v 1.10.2.15.2.15 2002/10/30 14:23:15 easysw Exp $" // // Input widget for the Fast Light Tool Kit (FLTK). // @@ -145,6 +145,14 @@ int Fl_Input::handle_key() { case FL_Tab: if (Fl::event_state(FL_CTRL|FL_SHIFT) || input_type()!=FL_MULTILINE_INPUT || readonly()) return 0; return replace(position(), mark(), &ascii, 1); +#ifdef __APPLE__ + case 'c' : + case 'v' : + case 'x' : + case 'z' : + if (Fl::event_state(FL_META)) ascii = ctrl(Fl::event_key()); + break; +#endif // __APPLE__ } int i; @@ -396,5 +404,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.14 2002/10/10 19:39:49 easysw Exp $". +// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.15 2002/10/30 14:23:15 easysw Exp $". // diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx index 29725ca42..25c9fe54b 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.9 2002/10/29 17:34:47 easysw Exp $" +// "$Id: Fl_Text_Editor.cxx,v 1.9.2.10 2002/10/30 14:23:16 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -102,6 +102,15 @@ static struct { { 'v', FL_CTRL, Fl_Text_Editor::kf_paste }, { FL_Insert, FL_SHIFT, Fl_Text_Editor::kf_paste }, { 'a', FL_CTRL, ctrl_a }, + +#ifdef __APPLE__ + // Define CMD+key accelerators... + { 'x', FL_COMMAND, Fl_Text_Editor::kf_cut }, + { 'c', FL_COMMAND, Fl_Text_Editor::kf_copy }, + { 'v', FL_COMMAND, Fl_Text_Editor::kf_paste }, + { 'a', FL_COMMAND, ctrl_a }, +#endif // __APPLE__ + { 0, 0, 0 } }; @@ -442,5 +451,5 @@ int Fl_Text_Editor::handle(int event) { } // -// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.9 2002/10/29 17:34:47 easysw Exp $". +// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.10 2002/10/30 14:23:16 easysw Exp $". // |