Index: editor/libsrc/org/netbeans/editor/BaseKit.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/BaseKit.java,v retrieving revision 1.101 diff -r1.101 BaseKit.java 17a18 > import java.awt.Toolkit; 765c766 < boolean ctrl = ((mod & ActionEvent.CTRL_MASK) != 0); --- > boolean ctrl = ((mod & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 0); Index: editor/libsrc/org/netbeans/editor/MultiKeymap.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/MultiKeymap.java,v retrieving revision 1.24 diff -r1.24 MultiKeymap.java 15a16 > import java.awt.Toolkit; 208c209 < && (key.getModifiers() & InputEvent.CTRL_MASK) == 0 // Ctrl not pressed --- > && (key.getModifiers() & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) == 0 // Ctrl not pressed 251c252 < if (key == KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK)) { --- > if (key == KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())) { Index: editor/libsrc/org/netbeans/editor/SettingsDefaults.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/SettingsDefaults.java,v retrieving revision 1.28 diff -r1.28 SettingsDefaults.java 19a20 > import java.awt.Toolkit; 197c198 < KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 224c225 < KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK), 244c245 < KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 248c249 < KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 264c265 < KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 268c269 < KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 284c285 < KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 300c301 < KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_UP, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 328c329 < KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_HOME, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 332c333 < KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 344c345 < KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_END, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 348c349 < KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 354c355 < KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 358c359 < KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 370c371 < KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 378c379 < KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 392c393 < KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 400c401 < KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 406c407 < KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 417c418 < KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 421c422 < KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 425c426 < KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 433c434 < KeyStroke.getKeyStroke(KeyEvent.VK_F2, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_F2, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 449c450 < KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_F3, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 457c458 < KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 461c462 < KeyStroke.getKeyStroke(KeyEvent.VK_K, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_K, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 465c466 < KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 469c470 < KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 477c478 < KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK), 517c518 < KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK ), --- > KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK ), 563c564 < KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 569c570 < KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 577c578 < KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), Index: editor/libsrc/org/netbeans/editor/ext/ExtKit.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/ExtKit.java,v retrieving revision 1.37 diff -r1.37 ExtKit.java 16a17 > import java.awt.Toolkit; 780c781 < if (cmd != null && cmd.equals(" ") && (mod == ActionEvent.CTRL_MASK)) { // NOI18N --- > if (cmd != null && cmd.equals(" ") && (mod == Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())) { // NOI18N 793c794 < && (mod & ActionEvent.CTRL_MASK) == 0) --- > && (mod & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) == 0) Index: editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java,v retrieving revision 1.31 diff -r1.31 ExtSettingsDefaults.java 17a18 > import java.awt.Toolkit; 85c86 < KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 93c94 < KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 97c98 < KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 101c102 < KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 105c106 < KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 113c114 < KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 117c118 < KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK), 129,130c130,131 < KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK), < // KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), > // KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), Index: editor/libsrc/org/netbeans/editor/ext/JDCPopupPanel.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/JDCPopupPanel.java,v retrieving revision 1.20 diff -r1.20 JDCPopupPanel.java 18a19 > import java.awt.Toolkit; 609c610 < KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.ALT_MASK | KeyEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.ALT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), Index: editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java =================================================================== RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java,v retrieving revision 1.21 diff -r1.21 JavaSettingsDefaults.java 19a20 > import java.awt.Toolkit; 167c168 < KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 173c174 < KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK), 177c178 < KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), --- > KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK), Index: editor/src/org/netbeans/modules/editor/NbToolbarSupport.java =================================================================== RCS file: /cvs/editor/src/org/netbeans/modules/editor/NbToolbarSupport.java,v retrieving revision 1.12 diff -r1.12 NbToolbarSupport.java 605a606 > Index: openide/src/org/openide/explorer/propertysheet/BaseTable.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/BaseTable.java,v retrieving revision 1.6 diff -r1.6 BaseTable.java 31a32 > import java.awt.Toolkit; 188c189 < KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT); --- > Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT); 190c191 < KeyEvent.CTRL_MASK, false), ACTION_FOCUS_NEXT); --- > Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false), ACTION_FOCUS_NEXT); Index: openide/src/org/openide/explorer/propertysheet/PropertyPanel.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertyPanel.java,v retrieving revision 1.137 diff -r1.137 PropertyPanel.java 22a23 > import java.awt.Toolkit; 242c243 < getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, KeyEvent.CTRL_MASK), "dump"); --- > getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "dump"); Index: openide/src/org/openide/explorer/propertysheet/SheetTable.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/SheetTable.java,v retrieving revision 1.20 diff -r1.20 SheetTable.java 248c248 < KeyEvent.SHIFT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK), --- > KeyEvent.SHIFT_DOWN_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), 260c260 < KeyEvent.CTRL_MASK), ACTION_CUSTOM_EDITOR); --- > Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), ACTION_CUSTOM_EDITOR); Index: openide/src/org/openide/explorer/propertysheet/StringInplaceEditor.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/StringInplaceEditor.java,v retrieving revision 1.9 diff -r1.9 StringInplaceEditor.java 27a28 > import java.awt.Toolkit; 95c96 < KeyStroke.getKeyStroke(KeyEvent.VK_HOME, KeyEvent.CTRL_DOWN_MASK | --- > KeyStroke.getKeyStroke(KeyEvent.VK_HOME, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | 97c98 < KeyStroke.getKeyStroke(KeyEvent.VK_END, KeyEvent.CTRL_DOWN_MASK | --- > KeyStroke.getKeyStroke(KeyEvent.VK_END, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | Index: openide/src/org/openide/explorer/view/TreeTable.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/view/TreeTable.java,v retrieving revision 1.39 diff -r1.39 TreeTable.java 136c136 < KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT); --- > Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT); 138c138 < KeyEvent.CTRL_MASK, false), ACTION_FOCUS_NEXT); --- > Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false), ACTION_FOCUS_NEXT); Index: openide/src/org/openide/util/Utilities.java =================================================================== RCS file: /cvs/openide/src/org/openide/util/Utilities.java,v retrieving revision 1.138 diff -r1.138 Utilities.java 1326c1326 < if ((modif & KeyEvent.CTRL_MASK) != 0) { --- > if ((modif & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 0) { 1356c1356 < m |= KeyEvent.CTRL_MASK; --- > m |= Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();