summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Heidrich <fheidric>2008-08-26 19:13:09 +0000
committerFelipe Heidrich <fheidric>2008-08-26 19:13:09 +0000
commit89031c932d2932e3704c8a78a3bf5194682f987f (patch)
treed9ba4e65dfae73b6ec1f84fe5942a7259da1bdd2
parentea81254f709cb19518368dbc4296a7e1d07d5d39 (diff)
downloadeclipse.platform.swt-89031c932d2932e3704c8a78a3bf5194682f987f.tar.gz
eclipse.platform.swt-89031c932d2932e3704c8a78a3bf5194682f987f.tar.xz
eclipse.platform.swt-89031c932d2932e3704c8a78a3bf5194682f987f.zip
Backport: Bug 245185 - Message in the MessaeBox is not BiDi correctly
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java1
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java4
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index dbdc7942fa..74a4029cda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -1075,6 +1075,7 @@ public class OS extends C {
public static final int MB_OKCANCEL = 0x1;
public static final int MB_PRECOMPOSED = 0x1;
public static final int MB_RETRYCANCEL = 0x5;
+ public static final int MB_RIGHT = 0x00080000;
public static final int MB_RTLREADING = 0x100000;
public static final int MB_SYSTEMMODAL = 0x1000;
public static final int MB_TASKMODAL = 0x2000;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
index c10b1359f5..eea0a1fe63 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
@@ -150,10 +150,10 @@ public int open () {
}
int bits = buttonBits | iconBits | modalBits;
- if ((style & SWT.RIGHT_TO_LEFT) != 0) bits |= OS.MB_RTLREADING;
+ if ((style & SWT.RIGHT_TO_LEFT) != 0) bits |= OS.MB_RTLREADING | OS.MB_RIGHT;
if ((style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT)) == 0) {
if (parent != null && (parent.style & SWT.MIRRORED) != 0) {
- bits |= OS.MB_RTLREADING;
+ bits |= OS.MB_RTLREADING | OS.MB_RIGHT;
}
}