Mercurial > projects > dwt2
comparison org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/TextLayout.d @ 112:9f4c18c268b2
Update to compile and execute with dmd 2.052.
author | kntroh |
---|---|
date | Wed, 16 Mar 2011 21:53:53 +0900 |
parents | 0ecb2b338560 |
children | 536e43f63c81 |
comparison
equal
deleted
inserted
replaced
111:b6e9904989ed | 112:9f4c18c268b2 |
---|---|
533 mLangFontLink2 = null; | 533 mLangFontLink2 = null; |
534 } | 534 } |
535 OS.OleUninitialize(); | 535 OS.OleUninitialize(); |
536 } | 536 } |
537 | 537 |
538 SCRIPT_ANALYSIS cloneScriptAnalysis ( inout SCRIPT_ANALYSIS src) { | 538 SCRIPT_ANALYSIS cloneScriptAnalysis ( ref SCRIPT_ANALYSIS src) { |
539 SCRIPT_ANALYSIS dst; | 539 SCRIPT_ANALYSIS dst; |
540 dst.eScript = src.eScript; | 540 dst.eScript = src.eScript; |
541 dst.fRTL = src.fRTL; | 541 dst.fRTL = src.fRTL; |
542 dst.fLayoutRTL = src.fLayoutRTL; | 542 dst.fLayoutRTL = src.fLayoutRTL; |
543 dst.fLinkBefore = src.fLinkBefore; | 543 dst.fLinkBefore = src.fLinkBefore; |
2958 if (run.clusters is null) SWT.error(SWT.ERROR_NO_HANDLES); | 2958 if (run.clusters is null) SWT.error(SWT.ERROR_NO_HANDLES); |
2959 run.visAttrs = cast(SCRIPT_VISATTR*)OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * SCRIPT_VISATTR_SIZEOF); | 2959 run.visAttrs = cast(SCRIPT_VISATTR*)OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * SCRIPT_VISATTR_SIZEOF); |
2960 if (run.visAttrs is null) SWT.error(SWT.ERROR_NO_HANDLES); | 2960 if (run.visAttrs is null) SWT.error(SWT.ERROR_NO_HANDLES); |
2961 run.psc = cast(SCRIPT_CACHE*)OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, (void*).sizeof); | 2961 run.psc = cast(SCRIPT_CACHE*)OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, (void*).sizeof); |
2962 if (run.psc is null) SWT.error(SWT.ERROR_NO_HANDLES); | 2962 if (run.psc is null) SWT.error(SWT.ERROR_NO_HANDLES); |
2963 short script = run.analysis.eScript; | 2963 short script = cast(short) run.analysis.eScript; |
2964 SCRIPT_PROPERTIES sp = *device.scripts[script]; | 2964 SCRIPT_PROPERTIES sp = *device.scripts[script]; |
2965 bool shapeSucceed = shape(hdc, run, wchars, buffer, maxGlyphs, &sp); | 2965 bool shapeSucceed = shape(hdc, run, wchars, buffer, maxGlyphs, &sp); |
2966 int res; | 2966 int res; |
2967 if (!shapeSucceed) { | 2967 if (!shapeSucceed) { |
2968 auto hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT); | 2968 auto hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT); |