diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2003-05-28 05:10:05 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2003-05-28 05:10:05 +0000 |
| commit | 1d4edf5fb93fffc9d81a75b40c5e28235d3147c9 (patch) | |
| tree | 52d13cef1dc566a3622c806d58409692d0ac7a80 /src/Fl_mac.cxx | |
| parent | 9636dd13c147e93636258eca6d510235821bcf3e (diff) | |
Mac OS X's version of Fl::get_key(int) would mixup ctrl and meta.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3009 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_mac.cxx')
| -rw-r--r-- | src/Fl_mac.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 855b9536d..f2ee20c16 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.42 2003/05/26 14:19:48 easysw Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.43 2003/05/28 05:10:05 matthiaswm Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -116,7 +116,7 @@ static unsigned short macKeyLookUp[128] = 'u', '[', 'i', 'p', FL_Enter, 'l', 'j', '\'', 'k', ';', '\\', ',', '/', 'n', 'm', '.', - FL_Tab, ' ', '`', FL_BackSpace, 0, FL_Escape, 0, 0, + FL_Tab, ' ', '`', FL_BackSpace, 0/*kp_enter on powerbook G4*/, FL_Escape, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FL_KP+'.', FL_Right, FL_KP+'*', 0, FL_KP+'+', FL_Left, FL_Num_Lock, @@ -770,7 +770,8 @@ static void chord_to_e_state( UInt32 chord ) static ulong state[] = { 0, FL_BUTTON1, FL_BUTTON3, FL_BUTTON1|FL_BUTTON3, FL_BUTTON2, - FL_BUTTON2|FL_BUTTON1, FL_BUTTON2|FL_BUTTON3, FL_BUTTON2|FL_BUTTON1|FL_BUTTON3 + FL_BUTTON2|FL_BUTTON1, FL_BUTTON2|FL_BUTTON3, + FL_BUTTON2|FL_BUTTON1|FL_BUTTON3 }; Fl::e_state = ( Fl::e_state & 0xff0000 ) | state[ chord & 0x07 ]; } @@ -1775,6 +1776,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.42 2003/05/26 14:19:48 easysw Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.43 2003/05/28 05:10:05 matthiaswm Exp $". // |