From 9a267b8a01a91bca162e7c9e2026e8610e87dee1 Mon Sep 17 00:00:00 2001 From: Phillipus Date: Mon, 20 May 2024 18:09:12 +0100 Subject: [PATCH] Revert "Fix warning message on Mac about secure coding not enabled (#1231)" - This can cause a crash to desktop --- .../cocoa/org/eclipse/swt/internal/cocoa/OS.java | 5 ++--- .../cocoa/org/eclipse/swt/internal/cocoa/Selector.java | 3 +-- .../Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java | 4 ---- 3 files changed, 3 insertions(+), 9 deletions(-) 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 49403b17c9e..e125e46194e 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 @@ -156,9 +156,8 @@ public static int VERSION (int major, int minor, int bugfix) { public static final long sel_setStyle = Selector.sel_setStyle.value; public static final int NSTableViewStylePlain = 4; - /** 14.0 selectors */ - public static final long sel_setClipsToBounds_ = Selector.sel_setClipsToBounds_.value; - public static final long sel_applicationSupportsSecureRestorableState_ = Selector.sel_applicationSupportsSecureRestorableState_.value; + /** 14.0 selector */ + public static final long sel_setClipsToBounds_ = Selector.sel_setClipsToBounds_.value; /* AWT application delegate. Remove these when JavaRuntimeSupport.framework has bridgesupport generated for it. */ public static final long class_JRSAppKitAWT = objc_getClass("JRSAppKitAWT"); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java index a88a45b46db..d400229e1a4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java @@ -82,9 +82,8 @@ public enum Selector { /** 11.0 selector */ , sel_setStyle("setStyle:") - /** 14.0 selectors */ + /** 14.0 selector */ , sel_setClipsToBounds_("setClipsToBounds:") - , sel_applicationSupportsSecureRestorableState_("applicationSupportsSecureRestorableState:") , sel_awtAppDelegate("awtAppDelegate") diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java index 9c72a0e296f..c1abd1a31bf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java @@ -1052,7 +1052,6 @@ void createDisplay (DeviceData data) { OS.class_addMethod(cls, OS.sel_application_openUrls_, appProc4, "@:@@"); OS.class_addMethod(cls, OS.sel_applicationShouldHandleReopen_hasVisibleWindows_, appProc4, "@:@B"); OS.class_addMethod(cls, OS.sel_applicationShouldTerminate_, appProc3, "@:@"); - OS.class_addMethod(cls, OS.sel_applicationSupportsSecureRestorableState_, appProc3, "@:@"); OS.objc_registerClassPair(cls); } @@ -5903,9 +5902,6 @@ static long applicationProc(long id, long sel, long arg0) { } return 0; } - case sel_applicationSupportsSecureRestorableState_: { - return 1; - } default: { return 0; }