summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-09-13 18:21:40 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-09-13 18:21:40 +0000
commit5aa3ce735eb514bee64d878d9443ae1704d2cc33 (patch)
tree486ae1688854f1a4e3bd5c879212e3c68ede9df5
parent743cd4f95d6b3e9ad2cfe7c299647f2260791b76 (diff)
Fix menu shortcuts.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1587 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--fluid/fluid.cxx12
2 files changed, 8 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index c5fd0f4a9..9dc6d6542 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,8 @@ CHANGES IN FLTK 1.1.0b2
- Improved the Fl_HelpView table formatting code; now
dynamically sizes the table columns, and supports
COLSPAN.
+ - The FLUID keyboard shortcuts now work as expected
+ (CTRL-C copies, SHIFT-CTRL-C writes code, etc.)
CHANGES IN FLTK 1.1.0b1
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index f659f78e8..d0af61e65 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fluid.cxx,v 1.15.2.13.2.3 2001/08/11 16:09:26 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.4 2001/09/13 18:21:40 easysw Exp $"
//
// FLUID main entry for the Fast Light Tool Kit (FLTK).
//
@@ -362,10 +362,10 @@ Fl_Menu_Item Main_Menu[] = {
{"New", 0, new_cb, 0},
{"Open...", FL_CTRL+'o', open_cb, 0},
{"Save", FL_CTRL+'s', save_cb, 0},
- {"Save As...", FL_CTRL+'S', save_cb, (void*)1},
+ {"Save As...", FL_CTRL+FL_SHIFT+'s', save_cb, (void*)1},
{"Merge...", FL_CTRL+'i', open_cb, (void*)1, FL_MENU_DIVIDER},
- {"Write code", FL_CTRL+'C', write_cb, 0},
- {"Write strings", FL_CTRL+'W', write_strings_cb, 0},
+ {"Write code", FL_CTRL+FL_SHIFT+'c', write_cb, 0},
+ {"Write strings", FL_CTRL+FL_SHIFT+'w', write_strings_cb, 0},
{"Quit", FL_CTRL+'q', exit_cb},
{0},
{"&Edit",0,0,0,FL_SUBMENU},
@@ -384,7 +384,7 @@ Fl_Menu_Item Main_Menu[] = {
{"Ungroup", FL_F+8, ungroup_cb,0, FL_MENU_DIVIDER},
//{"Deactivate", 0, nyi},
//{"Activate", 0, nyi, 0, FL_MENU_DIVIDER},
- {"Overlays on/off",FL_CTRL+'O',toggle_overlays},
+ {"Overlays on/off",FL_CTRL+FL_SHIFT+'o',toggle_overlays},
{"Preferences",FL_CTRL+'p',show_alignment_cb},
{0},
{"&New", 0, 0, (void *)New_Menu, FL_SUBMENU_POINTER},
@@ -502,5 +502,5 @@ int main(int argc,char **argv) {
}
//
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.3 2001/08/11 16:09:26 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.4 2001/09/13 18:21:40 easysw Exp $".
//