diff options
| author | Nikita Nemkin | 2018-03-10 17:24:49 +0000 |
|---|---|---|
| committer | Niraj Modi | 2018-04-17 06:25:45 +0000 |
| commit | 36eb56513ac01971058419bae5bcda99a562df24 (patch) | |
| tree | e6c6beee46ce4186c637110d825c1c3c00481790 /bundles/org.eclipse.swt/Eclipse SWT PI/win32 | |
| parent | ba5783401dfcb52280151e05dd55ab4d991de672 (diff) | |
| download | eclipse.platform.swt-36eb56513ac01971058419bae5bcda99a562df24.tar.gz eclipse.platform.swt-36eb56513ac01971058419bae5bcda99a562df24.tar.xz eclipse.platform.swt-36eb56513ac01971058419bae5bcda99a562df24.zip | |
Bug 533556 - [Win32] Fix compiler warning in native code
os_structs.c(4456): warning C4133: '=': incompatible types - from 'HBRUSH' to 'HPEN'
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
Change-Id: I644248039facc38e42a8dbf387b5aeabb231ec70
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/win32')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c index 0c4015467e..0d7a40a5ee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c @@ -4453,7 +4453,7 @@ NMTBCUSTOMDRAW *getNMTBCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMTBCUSTO } lpStruct->hbrMonoDither = (HBRUSH)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrMonoDither); lpStruct->hbrLines = (HBRUSH)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrLines); - lpStruct->hpenLines = (HBRUSH)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hpenLines); + lpStruct->hpenLines = (HPEN)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hpenLines); lpStruct->clrText = (*env)->GetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrText); lpStruct->clrMark = (*env)->GetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrMark); lpStruct->clrTextHighlight = (*env)->GetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrTextHighlight); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java index 75dfbc8291..77371df926 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java @@ -16,7 +16,7 @@ public class NMTBCUSTOMDRAW extends NMCUSTOMDRAW { public long /*int*/ hbrMonoDither; /** @field cast=(HBRUSH) */ public long /*int*/ hbrLines; - /** @field cast=(HBRUSH) */ + /** @field cast=(HPEN) */ public long /*int*/ hpenLines; public int clrText; public int clrMark; |