Mercurial > projects > dwt-win
diff dwt/internal/BidiUtil.d @ 212:ab60f3309436
reverted the char[] to String and use the an alias.
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Mon, 05 May 2008 00:12:38 +0200 |
parents | 184ab53b7785 |
children | 36f5cb12e1a2 |
line wrap: on
line diff
--- a/dwt/internal/BidiUtil.d Sat Apr 26 10:01:48 2008 +0200 +++ b/dwt/internal/BidiUtil.d Mon May 05 00:12:38 2008 +0200 @@ -50,7 +50,7 @@ * they are targeted for CLDC. */ // static Callback callback = new Callback (BidiUtil.class, "windowProc", 4); - static const char[] CLASS_NAME = "org.eclipse.swt.internal.BidiUtil"; //$NON-NLS-1$ + static const String CLASS_NAME = "org.eclipse.swt.internal.BidiUtil"; //$NON-NLS-1$ // static this() { // try { // callback = new Callback (Class.forName (CLASS_NAME), "windowProc", 4); //$NON-NLS-1$ @@ -76,8 +76,8 @@ static const int LANG_ARABIC = 0x01; static const int LANG_HEBREW = 0x0d; // code page identifiers - static const char[] CD_PG_HEBREW = "1255"; //$NON-NLS-1$ - static const char[] CD_PG_ARABIC = "1256"; //$NON-NLS-1$ + static const String CD_PG_HEBREW = "1255"; //$NON-NLS-1$ + static const String CD_PG_ARABIC = "1256"; //$NON-NLS-1$ // ActivateKeyboard constants static const int HKL_NEXT = 1; static const int HKL_PREV = 0; @@ -169,7 +169,7 @@ * parameter. See org.eclipse.swt.custom.BidiSegmentEvent for details. * @return buffer with the glyphs that should be rendered for the given text */ -public static char[] getRenderInfo(GC gc, char[] text, int[] order, byte[] classBuffer, int[] dx, int flags, int [] offsets) { +public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] classBuffer, int[] dx, int flags, int [] offsets) { auto fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle); auto hHeap = OS.GetProcessHeap(); int[8] lpCs; @@ -302,7 +302,7 @@ * @param offsets text segments that should be measured and reordered separately, input * parameter. See org.eclipse.swt.custom.BidiSegmentEvent for details. */ -public static void getOrderInfo(GC gc, char[] text, int[] order, byte[] classBuffer, int flags, int [] offsets) { +public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuffer, int flags, int [] offsets) { int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle); auto hHeap = OS.GetProcessHeap(); int[8] lpCs; @@ -466,7 +466,7 @@ if (isBidiPlatform_ is 1) return true; // need to look at system code page for NT & 98 platforms since EnumSystemLanguageGroups is // not supported for these platforms - char[] codePage = to!(char[])(OS.GetACP()); + String codePage = to!(String)(OS.GetACP()); if (CD_PG_ARABIC==/*eq*/codePage || CD_PG_HEBREW==/*eq*/codePage) { isBidiPlatform_ = 1; }