diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-11-25 14:50:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-11-25 14:50:22 +0000 |
| commit | fe286dfe7b0ae6827942d40586906431c1d97287 (patch) | |
| tree | bf7ed3b5c9ac2b1f9c46b9ac670a33455310b6f5 /src/Fl_Sys_Menu_Bar.cxx | |
| parent | 2a4b7134970f80d41557f6be45bd76a42a01d9d4 (diff) | |
OSX fixes...
src/Fl.cxx:
- Don't compile in static functions that aren't used.
src/Fl_mac.cxx:
- Coding style...
src/Fl_Sys_Menu_Bar.cxx:
- Fix FL_META handling - FL_META incorrectly set the CTRL modifier,
and it was not possible to get all combos of modifiers. The new
coding should work properly for all combos...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4651 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Sys_Menu_Bar.cxx')
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index 87f9cbd08..002689917 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/src/Fl_Sys_Menu_Bar.cxx @@ -133,11 +133,11 @@ static void setMenuShortcut( MenuHandle mh, int miCnt, const Fl_Menu_Item *m ) if ( !isalnum( key ) ) return; - long macMod = kMenuNoModifiers; + long macMod = kMenuNoCommandModifier; + if ( m->shortcut_ & FL_META ) macMod = kMenuNoModifiers; if ( m->shortcut_ & FL_SHIFT || isupper(key) ) macMod |= kMenuShiftModifier; if ( m->shortcut_ & FL_ALT ) macMod |= kMenuOptionModifier; - if ( m->shortcut_ & FL_META ) macMod |= kMenuControlModifier; - if ( !(m->shortcut_ & FL_CTRL) ) macMod |= kMenuNoCommandModifier; + if ( m->shortcut_ & FL_CTRL ) macMod |= kMenuControlModifier; //SetMenuItemKeyGlyph( mh, miCnt, key ); SetItemCmd( mh, miCnt, toupper(key) ); |