Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Shanmugam2019-12-16 10:43:45 +0000
committerLakshmi Shanmugam2019-12-16 10:43:45 +0000
commitffd21d4efdd0e46b1967be08942bc6f828787c40 (patch)
tree9e3890bc630f3c535864deb39a62ab7d486c7743
parent046a55777fb038824e491832a5e1a84df92ac25e (diff)
downloadeclipse.platform.swt-ffd21d4efdd0e46b1967be08942bc6f828787c40.tar.gz
eclipse.platform.swt-ffd21d4efdd0e46b1967be08942bc6f828787c40.tar.xz
eclipse.platform.swt-ffd21d4efdd0e46b1967be08942bc6f828787c40.zip
Bug 558353 - Fix deprecated warnings during Mac native build
Remove deprecated functions that are not being used Change-Id: Icad0fedba3cad205c1cc032ef126ae839fe9fd57
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c90
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras15
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java26
7 files changed, 0 insertions, 151 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 f869bd729d..8207275c20 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
@@ -2097,18 +2097,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGPoint_1sizeof)
}
#endif
-#ifndef NO_CGPostKeyboardEvent
-JNIEXPORT jint JNICALL OS_NATIVE(CGPostKeyboardEvent)
- (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jboolean arg2)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, CGPostKeyboardEvent_FUNC);
- rc = (jint)CGPostKeyboardEvent((CGCharCode)arg0, (CGKeyCode)arg1, (boolean_t)arg2);
- OS_NATIVE_EXIT(env, that, CGPostKeyboardEvent_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_CGRect_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(CGRect_1sizeof)
(JNIEnv *env, jclass that)
@@ -2121,30 +2109,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGRect_1sizeof)
}
#endif
-#ifndef NO_CGSetLocalEventsFilterDuringSuppressionState
-JNIEXPORT jint JNICALL OS_NATIVE(CGSetLocalEventsFilterDuringSuppressionState)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, CGSetLocalEventsFilterDuringSuppressionState_FUNC);
- rc = (jint)CGSetLocalEventsFilterDuringSuppressionState((CGEventFilterMask)arg0, (CGEventSuppressionState)arg1);
- OS_NATIVE_EXIT(env, that, CGSetLocalEventsFilterDuringSuppressionState_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_CGSetLocalEventsSuppressionInterval
-JNIEXPORT jint JNICALL OS_NATIVE(CGSetLocalEventsSuppressionInterval)
- (JNIEnv *env, jclass that, jdouble arg0)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, CGSetLocalEventsSuppressionInterval_FUNC);
- rc = (jint)CGSetLocalEventsSuppressionInterval((CFTimeInterval)arg0);
- OS_NATIVE_EXIT(env, that, CGSetLocalEventsSuppressionInterval_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_CGSize_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(CGSize_1sizeof)
(JNIEnv *env, jclass that)
@@ -2512,22 +2476,6 @@ fail:
}
#endif
-#ifndef NO_Gestalt
-JNIEXPORT jint JNICALL OS_NATIVE(Gestalt)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-{
- jint *lparg1=NULL;
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, Gestalt_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)Gestalt(arg0, lparg1);
-fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, Gestalt_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_GetCurrentEventButtonState
JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentEventButtonState)
(JNIEnv *env, jclass that)
@@ -3991,18 +3939,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySliderRole)
}
#endif
-#ifndef NO_NSAccessibilitySortButtonRole
-JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySortButtonRole)
- (JNIEnv *env, jclass that)
-{
- jlong rc = 0;
- OS_NATIVE_ENTER(env, that, NSAccessibilitySortButtonRole_FUNC);
- rc = (jlong)NSAccessibilitySortButtonRole;
- OS_NATIVE_EXIT(env, that, NSAccessibilitySortButtonRole_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_NSAccessibilitySplitterRole
JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySplitterRole)
(JNIEnv *env, jclass that)
@@ -4625,20 +4561,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(NSCalibratedRGBColorSpace)
}
#endif
-#ifndef NO_NSCountWindows
-JNIEXPORT void JNICALL OS_NATIVE(NSCountWindows)
- (JNIEnv *env, jclass that, jlongArray arg0)
-{
- jlong *lparg0=NULL;
- OS_NATIVE_ENTER(env, that, NSCountWindows_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
- NSCountWindows((NSInteger*)lparg0);
-fail:
- if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, NSCountWindows_FUNC);
-}
-#endif
-
#ifndef NO_NSCursorAttributeName
JNIEXPORT jlong JNICALL OS_NATIVE(NSCursorAttributeName)
(JNIEnv *env, jclass that)
@@ -4718,18 +4640,6 @@ fail:
}
#endif
-#ifndef NO_NSErrorFailingURLStringKey
-JNIEXPORT jlong JNICALL OS_NATIVE(NSErrorFailingURLStringKey)
- (JNIEnv *env, jclass that)
-{
- jlong rc = 0;
- OS_NATIVE_ENTER(env, that, NSErrorFailingURLStringKey_FUNC);
- rc = (jlong)NSErrorFailingURLStringKey;
- OS_NATIVE_EXIT(env, that, NSErrorFailingURLStringKey_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_NSEventTrackingRunLoopMode
JNIEXPORT jlong JNICALL OS_NATIVE(NSEventTrackingRunLoopMode)
(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 10882deb69..f3fa023024 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
@@ -150,10 +150,7 @@ char * OS_nativeFunctionNames[] = {
"CGPathMoveToPoint",
"CGPathRelease",
"CGPoint_1sizeof",
- "CGPostKeyboardEvent",
"CGRect_1sizeof",
- "CGSetLocalEventsFilterDuringSuppressionState",
- "CGSetLocalEventsSuppressionInterval",
"CGSize_1sizeof",
"CGWarpMouseCursorPosition",
"CPSSetProcessName",
@@ -179,7 +176,6 @@ char * OS_nativeFunctionNames[] = {
"EmptyRgn",
"FSPathMakeRef",
"FindWindow",
- "Gestalt",
"GetCurrentEventButtonState",
"GetCurrentProcess",
"GetDblTime",
@@ -296,7 +292,6 @@ char * OS_nativeFunctionNames[] = {
"NSAccessibilityShowMenuAction",
"NSAccessibilitySizeAttribute",
"NSAccessibilitySliderRole",
- "NSAccessibilitySortButtonRole",
"NSAccessibilitySplitterRole",
"NSAccessibilityStandardWindowSubrole",
"NSAccessibilityStaticTextRole",
@@ -349,14 +344,12 @@ char * OS_nativeFunctionNames[] = {
"NSBeep",
"NSBitsPerPixelFromDepth",
"NSCalibratedRGBColorSpace",
- "NSCountWindows",
"NSCursorAttributeName",
"NSDefaultRunLoopMode",
"NSDeviceRGBColorSpace",
"NSDeviceResolution",
"NSDragPboard",
"NSEqualRects",
- "NSErrorFailingURLStringKey",
"NSEventTrackingRunLoopMode",
"NSFileTypeForHFSTypeCode",
"NSFilenamesPboardType",
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 3488f71691..fedb8b276b 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
@@ -160,10 +160,7 @@ typedef enum {
CGPathMoveToPoint_FUNC,
CGPathRelease_FUNC,
CGPoint_1sizeof_FUNC,
- CGPostKeyboardEvent_FUNC,
CGRect_1sizeof_FUNC,
- CGSetLocalEventsFilterDuringSuppressionState_FUNC,
- CGSetLocalEventsSuppressionInterval_FUNC,
CGSize_1sizeof_FUNC,
CGWarpMouseCursorPosition_FUNC,
CPSSetProcessName_FUNC,
@@ -189,7 +186,6 @@ typedef enum {
EmptyRgn_FUNC,
FSPathMakeRef_FUNC,
FindWindow_FUNC,
- Gestalt_FUNC,
GetCurrentEventButtonState_FUNC,
GetCurrentProcess_FUNC,
GetDblTime_FUNC,
@@ -306,7 +302,6 @@ typedef enum {
NSAccessibilityShowMenuAction_FUNC,
NSAccessibilitySizeAttribute_FUNC,
NSAccessibilitySliderRole_FUNC,
- NSAccessibilitySortButtonRole_FUNC,
NSAccessibilitySplitterRole_FUNC,
NSAccessibilityStandardWindowSubrole_FUNC,
NSAccessibilityStaticTextRole_FUNC,
@@ -359,14 +354,12 @@ typedef enum {
NSBeep_FUNC,
NSBitsPerPixelFromDepth_FUNC,
NSCalibratedRGBColorSpace_FUNC,
- NSCountWindows_FUNC,
NSCursorAttributeName_FUNC,
NSDefaultRunLoopMode_FUNC,
NSDeviceRGBColorSpace_FUNC,
NSDeviceResolution_FUNC,
NSDragPboard_FUNC,
NSEqualRects_FUNC,
- NSErrorFailingURLStringKey_FUNC,
NSEventTrackingRunLoopMode_FUNC,
NSFileTypeForHFSTypeCode_FUNC,
NSFilenamesPboardType_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index 7f87cf010a..39c1762c55 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -4732,7 +4732,6 @@
<constant name="NSAccessibilityShowMenuAction" swt_gen="true"></constant>
<constant name="NSAccessibilitySizeAttribute" swt_gen="true"></constant>
<constant name="NSAccessibilitySliderRole" swt_gen="true"></constant>
- <constant name="NSAccessibilitySortButtonRole" swt_gen="true"></constant>
<constant name="NSAccessibilitySplitterRole" swt_gen="true"></constant>
<constant name="NSAccessibilityStandardWindowSubrole" swt_gen="true"></constant>
<constant name="NSAccessibilityStaticTextRole" swt_gen="true"></constant>
@@ -5108,10 +5107,6 @@
<arg swt_gen="true"></arg>
<retval swt_gen="true"></retval>
</function>
- <function name="NSCountWindows" swt_gen="true">
- <arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg>
- <retval></retval>
- </function>
<function name="NSNumberOfColorComponents" swt_gen="true">
<arg swt_gen="true"></arg>
<retval swt_gen="true"></retval>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
index c565af1c30..ff1423fdce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
@@ -342,12 +342,6 @@
<arg swt_gen="true"></arg>
<retval></retval>
</function>
- <function name="CGPostKeyboardEvent" swt_gen="true">
- <arg swt_gen="true"></arg>
- <arg swt_gen="true"></arg>
- <arg swt_gen="true" swt_java_type="boolean"></arg>
- <retval swt_gen="true"></retval>
- </function>
<function name="CGPostMouseEvent" swt_variadic_count="4" swt_variadic_java_types="boolean,*">
<arg></arg>
<arg swt_java_type="boolean"></arg>
@@ -355,15 +349,6 @@
<arg swt_java_type="boolean"></arg>
<retval></retval>
</function>
- <function name="CGSetLocalEventsFilterDuringSuppressionState" swt_gen="true">
- <arg swt_gen="true"></arg>
- <arg swt_gen="true"></arg>
- <retval swt_gen="true"></retval>
- </function>
- <function name="CGSetLocalEventsSuppressionInterval" swt_gen="true">
- <arg swt_gen="true"></arg>
- <retval swt_gen="true"></retval>
- </function>
<function name="CGWarpMouseCursorPosition" swt_gen="true">
<arg swt_gen="true"></arg>
<retval swt_gen="true"></retval>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index 940e398314..fbfb01690e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
@@ -1176,7 +1176,6 @@
<class name="NSXMLElement" swt_superclass="NSXMLNode">
</class>
<constant name="NSDefaultRunLoopMode" swt_gen="true"></constant>
- <constant name="NSErrorFailingURLStringKey" swt_gen="true"></constant>
<constant name="NSLocaleLanguageCode" swt_gen="true"></constant>
<constant name="NSNotFound" swt_gen="true"></constant>
<enum name="NSAllApplicationsDirectory" swt_gen="true"></enum>
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 20944400bc..25a13092b8 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
@@ -235,7 +235,6 @@ public static final native Object JNIGetObject(long globalRef);
/** Carbon calls */
-public static final native int Gestalt(int selector, int[] response);
/** @param psn cast=(ProcessSerialNumber *) */
public static final native int GetCurrentProcess(int[] psn);
/** @param psn cast=(ProcessSerialNumber *) */
@@ -2951,9 +2950,6 @@ public static final NSString NSAccessibilitySizeAttribute = new NSString(NSAcces
public static final native long NSAccessibilitySliderRole();
public static final NSString NSAccessibilitySliderRole = new NSString(NSAccessibilitySliderRole());
/** @method flags=const */
-public static final native long NSAccessibilitySortButtonRole();
-public static final NSString NSAccessibilitySortButtonRole = new NSString(NSAccessibilitySortButtonRole());
-/** @method flags=const */
public static final native long NSAccessibilitySplitterRole();
public static final NSString NSAccessibilitySplitterRole = new NSString(NSAccessibilitySplitterRole());
/** @method flags=const */
@@ -3272,9 +3268,6 @@ public static final native long kCTParagraphStyleAttributeName();
public static final native long NSDefaultRunLoopMode();
public static final NSString NSDefaultRunLoopMode = new NSString(NSDefaultRunLoopMode());
/** @method flags=const */
-public static final native long NSErrorFailingURLStringKey();
-public static final NSString NSErrorFailingURLStringKey = new NSString(NSErrorFailingURLStringKey());
-/** @method flags=const */
public static final native long NSLocaleLanguageCode();
public static final NSString NSLocaleLanguageCode = new NSString(NSLocaleLanguageCode());
/** @method flags=const */
@@ -3328,10 +3321,6 @@ public static final native void NSBeep();
*/
public static final native long NSBitsPerPixelFromDepth(int depth);
/**
- * @param count cast=(NSInteger*)
- */
-public static final native void NSCountWindows(long[] count);
-/**
* @param colorSpaceName cast=(NSString*)
*/
public static final native long NSNumberOfColorComponents(long colorSpaceName);
@@ -3710,21 +3699,6 @@ public static final native void CGPathMoveToPoint(long path, long m, double x, d
*/
public static final native void CGPathRelease(long path);
/**
- * @param keyChar cast=(CGCharCode)
- * @param virtualKey cast=(CGKeyCode)
- * @param keyDown cast=(boolean_t)
- */
-public static final native int CGPostKeyboardEvent(short keyChar, short virtualKey, boolean keyDown);
-/**
- * @param filter cast=(CGEventFilterMask)
- * @param state cast=(CGEventSuppressionState)
- */
-public static final native int CGSetLocalEventsFilterDuringSuppressionState(int filter, int state);
-/**
- * @param seconds cast=(CFTimeInterval)
- */
-public static final native int CGSetLocalEventsSuppressionInterval(double seconds);
-/**
* @param newCursorPosition flags=struct
*/
public static final native int CGWarpMouseCursorPosition(CGPoint newCursorPosition);

Back to the top