diff options
9 files changed, 2 insertions, 101 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties index 94e28c2406..18ec4df76d 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties @@ -448,10 +448,6 @@ NMLISTVIEW_x=accessor=ptAction.x NMLISTVIEW_y=accessor=ptAction.y NMLISTVIEW_lParam= -org_eclipse_swt_internal_win32_NMLVCACHEHINT= -NMLVCACHEHINT_iFrom= -NMLVCACHEHINT_iTo= - org_eclipse_swt_internal_win32_NMLVCUSTOMDRAW= NMLVCUSTOMDRAW_clrText= NMLVCUSTOMDRAW_clrTextBk= @@ -2387,11 +2383,6 @@ OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_0=cast=(PVOID),fla OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_1=cast=(CONST VOID *) OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_2= -OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II= -OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II_0=cast=PVOID,flags=no_in -OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II_1=cast=CONST VOID * -OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II_2= - OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II= OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_0=cast=(PVOID),flags=no_in OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_1=cast=(CONST VOID *) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index eb4ca9caab..5c0aa9d214 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -5998,20 +5998,6 @@ fail: } #endif -#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II) - (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2) -{ - NMLVCACHEHINT _arg0, *lparg0=NULL; - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II_FUNC); - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); -fail: - if (arg0 && lparg0) setNMLVCACHEHINTFields(env, arg0, lparg0); - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II_FUNC); -} -#endif - #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II) (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c index bc978114db..1ea3b0142c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 631; -int OS_nativeFunctionCallCount[631]; +int OS_nativeFunctionCount = 630; +int OS_nativeFunctionCallCount[630]; char * OS_nativeFunctionNames[] = { "AbortDoc", "ActivateKeyboardLayout", @@ -398,7 +398,6 @@ char * OS_nativeFunctionNames[] = { "MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II", - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h index 762e352e14..8e1a2494e0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h @@ -402,7 +402,6 @@ typedef enum { MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC, - MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCACHEHINT_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II_FUNC, 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 8726f3f9f1..1a669ac0a4 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 @@ -2489,43 +2489,6 @@ void setNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStruct) } #endif -#ifndef NO_NMLVCACHEHINT -typedef struct NMLVCACHEHINT_FID_CACHE { - int cached; - jclass clazz; - jfieldID iFrom, iTo; -} NMLVCACHEHINT_FID_CACHE; - -NMLVCACHEHINT_FID_CACHE NMLVCACHEHINTFc; - -void cacheNMLVCACHEHINTFields(JNIEnv *env, jobject lpObject) -{ - if (NMLVCACHEHINTFc.cached) return; - cacheNMHDRFields(env, lpObject); - NMLVCACHEHINTFc.clazz = (*env)->GetObjectClass(env, lpObject); - NMLVCACHEHINTFc.iFrom = (*env)->GetFieldID(env, NMLVCACHEHINTFc.clazz, "iFrom", "I"); - NMLVCACHEHINTFc.iTo = (*env)->GetFieldID(env, NMLVCACHEHINTFc.clazz, "iTo", "I"); - NMLVCACHEHINTFc.cached = 1; -} - -NMLVCACHEHINT *getNMLVCACHEHINTFields(JNIEnv *env, jobject lpObject, NMLVCACHEHINT *lpStruct) -{ - if (!NMLVCACHEHINTFc.cached) cacheNMLVCACHEHINTFields(env, lpObject); - getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); - lpStruct->iFrom = (*env)->GetIntField(env, lpObject, NMLVCACHEHINTFc.iFrom); - lpStruct->iTo = (*env)->GetIntField(env, lpObject, NMLVCACHEHINTFc.iTo); - return lpStruct; -} - -void setNMLVCACHEHINTFields(JNIEnv *env, jobject lpObject, NMLVCACHEHINT *lpStruct) -{ - if (!NMLVCACHEHINTFc.cached) cacheNMLVCACHEHINTFields(env, lpObject); - setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); - (*env)->SetIntField(env, lpObject, NMLVCACHEHINTFc.iFrom, (jint)lpStruct->iFrom); - (*env)->SetIntField(env, lpObject, NMLVCACHEHINTFc.iTo, (jint)lpStruct->iTo); -} -#endif - #ifndef NO_NMLVCUSTOMDRAW typedef struct NMLVCUSTOMDRAW_FID_CACHE { int cached; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h index 58ef5ded29..a30bc3f630 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h @@ -599,18 +599,6 @@ void setNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStruct); #define NMLISTVIEW_sizeof() 0 #endif -#ifndef NO_NMLVCACHEHINT -void cacheNMLVCACHEHINTFields(JNIEnv *env, jobject lpObject); -NMLVCACHEHINT *getNMLVCACHEHINTFields(JNIEnv *env, jobject lpObject, NMLVCACHEHINT *lpStruct); -void setNMLVCACHEHINTFields(JNIEnv *env, jobject lpObject, NMLVCACHEHINT *lpStruct); -#define NMLVCACHEHINT_sizeof() sizeof(NMLVCACHEHINT) -#else -#define cacheNMLVCACHEHINTFields(a,b) -#define getNMLVCACHEHINTFields(a,b,c) NULL -#define setNMLVCACHEHINTFields(a,b,c) -#define NMLVCACHEHINT_sizeof() 0 -#endif - #ifndef NO_NMLVCUSTOMDRAW void cacheNMLVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject); NMLVCUSTOMDRAW *getNMLVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMLVCUSTOMDRAW *lpStruct); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCACHEHINT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCACHEHINT.java deleted file mode 100644 index 740fa71869..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCACHEHINT.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.win32; - -public class NMLVCACHEHINT extends NMHDR { - public int iFrom; - public int iTo; - public static final int sizeof = 20; -} 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 aac92a8055..06e198b491 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 @@ -714,7 +714,6 @@ public class OS extends Platform { public static final int LVN_ITEMACTIVATE = 0xffffff8e; public static final int LVN_ITEMCHANGED = 0xffffff9b; public static final int LVN_MARQUEEBEGIN = 0xffffff64; - public static final int LVN_ODCACHEHINT = LVN_FIRST - 13; public static final int LVN_ODFINDITEMA = LVN_FIRST - 52; public static final int LVN_ODFINDITEMW = LVN_FIRST - 79; public static final int LVSCW_AUTOSIZE = 0xffffffff; @@ -2735,7 +2734,6 @@ public static final native void MoveMemory (int Destination, NMTVDISPINFO Source public static final native void MoveMemory (NMLVDISPINFO Destination, int Source, int Length); public static final native void MoveMemory (NMTVDISPINFO Destination, int Source, int Length); public static final native void MoveMemory (NMLVFINDITEM Destination, int Source, int Length); -public static final native void MoveMemory (NMLVCACHEHINT Destination, int Source, int Length); public static final native void MoveMemory (NMHEADER Destination, int Source, int Length); public static final native void MoveMemory (NMLISTVIEW Destination, int Source, int Length); public static final native void MoveMemory (NMREBARCHILDSIZE Destination, int Source, int Length); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index 13424367b4..c11dc443a5 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -3393,12 +3393,6 @@ LRESULT wmNotifyChild (int wParam, int lParam) { NMHDR hdr = new NMHDR (); OS.MoveMemory (hdr, lParam, NMHDR.sizeof); switch (hdr.code) { - case OS.LVN_ODCACHEHINT: - if ((style & SWT.VIRTUAL) != 0) { - NMLVCACHEHINT pCachehint = new NMLVCACHEHINT (); - OS.MoveMemory (pCachehint, lParam, NMLVCACHEHINT.sizeof); - } - break; case OS.LVN_ODFINDITEMA: case OS.LVN_ODFINDITEMW: { if ((style & SWT.VIRTUAL) != 0) { |