| commit | 3bfb21e2f41802f1123dd33047e6d8ba6b00da49 | [log] [tgz] |
|---|---|---|
| author | Grant Gayed <ggayed> | Tue Dec 16 15:06:00 2003 +0000 |
| committer | Grant Gayed <ggayed> | Tue Dec 16 15:06:00 2003 +0000 |
| tree | a969271ab2dd32e1959a40f92cace673acabb58c | |
| parent | 21949f8262bfbe982e0298261ecd4a94a7dbf5f4 [diff] |
45877
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java index 0cf527c..9556e64 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
@@ -35,8 +35,15 @@ if (osName.equals ("HP-UX")) isHPUX = true; IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsDBLocale = OS.MB_CUR_MAX () != 1; + if (IsLinux) { + CODESET = 14; + } else if (IsHPUX) { + CODESET = 62; + } else { + CODESET = 49; + } } - public static final int CODESET = OS.IsLinux ? 14 : 49; + public static final int CODESET; public static final int LC_CTYPE = OS.IsAIX ? 1 : 0; static final int RESOURCE_LENGTH = 1024 * 3;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java index a44e223..6ff2cfc 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java
@@ -47,7 +47,11 @@ static int BufferTimes4; static { - Unicode = getAsciiBytes("UCS-2"); + if (OS.IsHPUX) { + Unicode = getAsciiBytes("ucs2"); + } else { + Unicode = getAsciiBytes("UCS-2"); + } int length, item = OS.nl_langinfo (OS.CODESET); if (item != 0 && (length = OS.strlen (item)) > 0) {