Fixes bug 24493

1 files changed, 8 insertions, 5 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index 0cd401f50d..8abab9a4ef 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -4985,13 +4985,16 @@ void handleKey(Event event) {
 		action = getKeyBinding(event.character | event.stateMask);

 	}

 	if (action == SWT.NULL) {

-		// -ignore any ALT and CTRL key combination except for CTRL + ALT 

-		//  itself which is the Alt Gr key on some keyboards.

+		// -ignore any ALT, SHIFT+ALT, CTRL, SHIFT+CTRL key combination; 

+		//  Don't ignore CTRL+ALT combinations since that is the Alt Gr 

+		//	key on some keyboards.

 		// -ignore anything below SPACE except for line delimiter keys and tab.

 		// -ignore DEL 

-		boolean isCtrlAlt = (event.stateMask & (SWT.ALT | SWT.CTRL)) == 0 || 

-			event.stateMask == (SWT.ALT | SWT.CTRL);

-		if (isCtrlAlt && event.character > 31 && event.character != SWT.DEL || 

+		boolean isCtrlAlt = (event.stateMask ^ SWT.ALT) == 0 || 

+							(event.stateMask ^ SWT.CTRL) == 0 ||

+							(event.stateMask ^ (SWT.ALT | SWT.SHIFT)) == 0 ||

+							(event.stateMask ^ (SWT.CTRL | SWT.SHIFT)) == 0;

+		if (isCtrlAlt == false && event.character > 31 && event.character != SWT.DEL || 

 		    event.character == SWT.CR || event.character == SWT.LF || 

 		    event.character == TAB) {

 			doContent(event.character);