Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2008-05-30 11:35:22 -0400
committerSilenio Quarti2008-05-30 11:35:22 -0400
commit0607b23e08ea72653ea113f08262bc9d91c1b6d7 (patch)
treea1f85ec1c4495f668567726994637a7d0ad1ce84
parent43b37a66dcb69f4c7dd8a761be9a446f1ea77e81 (diff)
downloadeclipse.platform.swt-0607b23e08ea72653ea113f08262bc9d91c1b6d7.tar.gz
eclipse.platform.swt-0607b23e08ea72653ea113f08262bc9d91c1b6d7.tar.xz
eclipse.platform.swt-0607b23e08ea72653ea113f08262bc9d91c1b6d7.zip
234751 - Warnings in SWT builds
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties6
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp28
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.h2
13 files changed, 42 insertions, 42 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
index fd72522725..c033fea454 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -453,11 +453,11 @@ Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_0=cast=(Graphics
Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_1=cast=Rect *,flags=struct
Gdip_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_2=cast=(CombineMode)
-Gdip_Graphics_1SetClipPath__II=flags=no_gen
+Gdip_Graphics_1SetClipPath__II=accessor=SetClip,flags=cpp
Gdip_Graphics_1SetClipPath__II_0=cast=(Graphics *)
Gdip_Graphics_1SetClipPath__II_1=cast=(GraphicsPath *)
-Gdip_Graphics_1SetClipPath__III=flags=no_gen
+Gdip_Graphics_1SetClipPath__III=accessor=SetClip,flags=cpp
Gdip_Graphics_1SetClipPath__III_0=cast=(Graphics *)
Gdip_Graphics_1SetClipPath__III_1=cast=(GraphicsPath *)
Gdip_Graphics_1SetClipPath__III_2=cast=(CombineMode)
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
index 7ab212dd27..898e4d6780 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -285,7 +285,7 @@ COM_SHDoDragDrop_0=cast=HWND
COM_SHDoDragDrop_1=cast=IDataObject *
COM_SHDoDragDrop_2=cast=IDropSource *
COM_SHDoDragDrop_3=
-COM_SHDoDragDrop_4=
+COM_SHDoDragDrop_4=cast=DWORD *
COM_STATSTG_sizeof=
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
index 9ee3fd8ae8..03067ca4b3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -969,7 +969,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(SHDoDragDrop)
jint rc = 0;
COM_NATIVE_ENTER(env, that, SHDoDragDrop_FUNC);
if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
- rc = (jint)SHDoDragDrop((HWND)arg0, (IDataObject *)arg1, (IDropSource *)arg2, arg3, lparg4);
+ rc = (jint)SHDoDragDrop((HWND)arg0, (IDataObject *)arg1, (IDropSource *)arg2, arg3, (DWORD *)lparg4);
fail:
if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
COM_NATIVE_EXIT(env, that, SHDoDragDrop_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
index 6596570dfa..3e98a9babf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
index cf73ae7952..a6db98fdf8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
index 0f8b79cf19..700e21c89c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
index 580dde632c..099dee8882 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
index e8324d0eaa..17cd181cc0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1154,6 +1154,32 @@ fail:
}
#endif
+#ifndef NO_Graphics_1SetClipPath__II
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__II_FUNC);
+ rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1);
+ Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__II_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_Graphics_1SetClipPath__III
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+ jint rc = 0;
+ Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__III_FUNC);
+ rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1, (CombineMode)arg2);
+ Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__III_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_Graphics_1SetCompositingQuality
extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jint arg0, jint arg1);
JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
index d2492de362..eb300918db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
@@ -188,32 +188,6 @@ fail:
}
#endif
-#ifndef NO_Graphics_1SetClipPath__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- jint rc = 0;
- Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__II_FUNC);
- rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1);
- Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__II_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_Graphics_1SetClipPath__III
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-{
- jint rc = 0;
- Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__III_FUNC);
- rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1, (CombineMode)arg2);
- Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__III_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_PathGradientBrush_1SetInterpolationColors
JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors)
(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
index 3db4ae597f..81fdb2a82e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
index b3c4a05931..177ae50433 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
index 248718c352..bf74f01eed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.h
index 279cadc106..8146d990c9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at

Back to the top