Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Shanmugam2017-09-29 01:46:27 -0400
committerLakshmi Shanmugam2017-09-29 01:46:27 -0400
commit1391d1e854f7ff317f836a800a7059ebc862d234 (patch)
tree2688204a4aaf5a985f199438f7fa5bc715806025 /bundles/org.eclipse.swt
parent1af14fcabbfe1af82acdaa69cc84a9ccda312cf1 (diff)
downloadeclipse.platform.swt-1391d1e854f7ff317f836a800a7059ebc862d234.tar.gz
eclipse.platform.swt-1391d1e854f7ff317f836a800a7059ebc862d234.tar.xz
eclipse.platform.swt-1391d1e854f7ff317f836a800a7059ebc862d234.zip
Bug 521849: Fix deprecated warnings in Mac native build
'NSAddImage' is deprecated in macOS 10.5. It was required for xulrunner10 support. Remove it now as there is no XULRunner code/support. Change-Id: Ic8f2eb7d7ba66cda16072452beda43ced11655f8
Diffstat (limited to 'bundles/org.eclipse.swt')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java7
4 files changed, 0 insertions, 25 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index 89fea469ff..07aef59421 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
@@ -4488,22 +4488,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityWindowRole)
}
#endif
-#ifndef NO_NSAddImage
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAddImage)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
- jbyte *lparg0=NULL;
- jintLong rc = 0;
- OS_NATIVE_ENTER(env, that, NSAddImage_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jintLong)NSAddImage((const char*)lparg0, (uint32_t)arg1);
-fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, NSAddImage_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_NSAffineTransformStruct_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(NSAffineTransformStruct_1sizeof)
(JNIEnv *env, jclass that)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
index 7573c46376..acc68b97f1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
@@ -336,7 +336,6 @@ char * OS_nativeFunctionNames[] = {
"NSAccessibilityVisibleRowsAttribute",
"NSAccessibilityWindowAttribute",
"NSAccessibilityWindowRole",
- "NSAddImage",
"NSAffineTransformStruct_1sizeof",
"NSApplicationDidChangeScreenParametersNotification",
"NSAttachmentAttributeName",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
index be6e54d407..5f4b5e9aba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
@@ -346,7 +346,6 @@ typedef enum {
NSAccessibilityVisibleRowsAttribute_FUNC,
NSAccessibilityWindowAttribute_FUNC,
NSAccessibilityWindowRole_FUNC,
- NSAddImage_FUNC,
NSAffineTransformStruct_1sizeof_FUNC,
NSApplicationDidChangeScreenParametersNotification_FUNC,
NSAttachmentAttributeName_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 02cbb61513..75b7edcf97 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -353,13 +353,6 @@ public static final native int GetIndMenuItemWithCommandID(long /*int*/ mHandle,
* @param index cast=(short)
*/
public static final native void DeleteMenuItem(long /*int*/ mHandle, short index);
-/**
- * @param image_name cast=(const char*)
- * @param options cast=(uint32_t)
- */
-public static final native long /*int*/ NSAddImage(byte[] image_name, int options);
-public static final int NSADDIMAGE_OPTION_RETURN_ON_ERROR = 0x1;
-public static final int NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME = 0x8;
/** @method flags=dynamic
* @param pmSessionInfo cast=(PMPrintSession)
* @param outPMPrinter cast=(PMPrinter *)

Back to the top