diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse')
13 files changed, 63 insertions, 111 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java index 3aa6f2fedf..e0f0559b89 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CFRange { + /** @field cast=(CFIndex) */ public long /*int*/ location; + /** @field cast=(CFIndex) */ public long /*int*/ length; - public static int sizeof = OS.CFRange_sizeof(); + public static final int sizeof = OS.CFRange_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java index 4edd7aab50..5b18762594 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,16 +9,22 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CGAffineTransform { + /** @field cast=(CGFloat) */ public double /*float*/ a; + /** @field cast=(CGFloat) */ public double /*float*/ b; + /** @field cast=(CGFloat) */ public double /*float*/ c; + /** @field cast=(CGFloat) */ public double /*float*/ d; + /** @field cast=(CGFloat) */ public double /*float*/ tx; + /** @field cast=(CGFloat) */ public double /*float*/ ty; - public static int sizeof = OS.CGAffineTransform_sizeof(); + public static final int sizeof = OS.CGAffineTransform_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java index 60cdf1d044..381738c3c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,15 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.swt.internal.cocoa; public class CGPathElement { /** @field cast=(CGPathElementType) */ public int type; - /** @field cast=(CGPoint *) */ + /** @field cast=(CGPoint*) */ public long /*int*/ points; public static final int sizeof = OS.CGPathElement_sizeof(); -}
\ No newline at end of file +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java index 3a082ac0e9..1364ba524b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CGPoint { + /** @field cast=(CGFloat) */ public double /*float*/ x; + /** @field cast=(CGFloat) */ public double /*float*/ y; public static final int sizeof = OS.CGPoint_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java index e7e50a8d43..09edc415d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CGSize { + /** @field cast=(CGFloat) */ public double /*float*/ width; + /** @field cast=(CGFloat) */ public double /*float*/ height; public static final int sizeof = OS.CGSize_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java index 0aa9941ca3..0163c64bd3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,16 +9,16 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.swt.internal.cocoa; public class CTParagraphStyleSetting { /** @field cast=(CTParagraphStyleSpecifier) */ public int spec; + /** @field cast=(size_t) */ public long /*int*/ valueSize; - /** @field cast=(void *) */ + /** @field cast=(void*) */ public long /*int*/ value; public static final int sizeof = OS.CTParagraphStyleSetting_sizeof(); -}
\ No newline at end of file +} 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 a4f0c02ccb..c565af1c30 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 @@ -376,7 +376,7 @@ <field name="tx" swt_gen="true"></field> <field name="ty" swt_gen="true"></field> </struct> - <struct name="CGPathElement" swt_gen="true"> + <struct name="CGPathElement" swt_gen="true" swt_gen_memmove="true"> <field name="points" swt_gen="true"></field> <field name="type" swt_gen="true"></field> </struct> 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 3a0d229a6b..8617aa1c03 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 @@ -1227,19 +1227,17 @@ <field name="tX" swt_gen="true"></field> <field name="tY" swt_gen="true"></field> </struct> - <struct name="NSPoint" swt_gen="true"> + <struct name="NSPoint" swt_gen="true" swt_gen_memmove="true" swt_gen_tostring="true"> <field name="x" swt_gen="true"></field> <field name="y" swt_gen="true"></field> </struct> - <struct name="NSRange" swt_gen="true"> + <struct name="NSRange" swt_gen="true" swt_gen_memmove="true"> <field name="length" swt_gen="true"></field> <field name="location" swt_gen="true"></field> </struct> - <struct name="NSRect" swt_gen="true"> - <field name="origin" swt_gen="true"></field> - <field name="size" swt_gen="true"></field> + <struct name="NSRect" swt_gen_memmove="true"> </struct> - <struct name="NSSize" swt_gen="true"> + <struct name="NSSize" swt_gen="true" swt_gen_memmove="true" swt_gen_tostring="true"> <field name="height" swt_gen="true"></field> <field name="width" swt_gen="true"></field> </struct> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java index 0624e16c83..a31170102e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,22 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class NSAffineTransformStruct { - public double /*float*/ m11, m12, m21, m22; - public double /*float*/ tX, tY; + /** @field cast=(CGFloat) */ + public double /*float*/ m11; + /** @field cast=(CGFloat) */ + public double /*float*/ m12; + /** @field cast=(CGFloat) */ + public double /*float*/ m21; + /** @field cast=(CGFloat) */ + public double /*float*/ m22; + /** @field cast=(CGFloat) */ + public double /*float*/ tX; + /** @field cast=(CGFloat) */ + public double /*float*/ tY; public static final int sizeof = OS.NSAffineTransformStruct_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java index def75627e6..8b4c02e918 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,13 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; - public class NSPoint { + /** @field cast=(CGFloat) */ public double /*float*/ x; + /** @field cast=(CGFloat) */ public double /*float*/ y; public static final int sizeof = OS.NSPoint_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java index 84f8f1ac1a..f6acd7013e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class NSRange { + /** @field cast=(NSUInteger) */ public long /*int*/ location; + /** @field cast=(NSUInteger) */ public long /*int*/ length; - public static int sizeof = OS.NSRange_sizeof(); + public static final int sizeof = OS.NSRange_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java index 4befead30f..044949eadd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.swt.internal.cocoa; - public class NSSize { + /** @field cast=(CGFloat) */ public double /*float*/ width; + /** @field cast=(CGFloat) */ public double /*float*/ height; public static final int sizeof = OS.NSSize_sizeof(); 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 06e7414bf2..839feea199 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 @@ -4351,26 +4351,6 @@ public static final native int NSSize_sizeof(); * @param dest cast=(void *),flags=no_in critical * @param src cast=(void *),flags=critical */ -public static final native void memmove(long /*int*/ dest, CFRange src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CFRange dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CGAffineTransform src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGAffineTransform dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ public static final native void memmove(long /*int*/ dest, CGPathElement src, long /*int*/ size); /** * @param dest cast=(void *),flags=no_in critical @@ -4381,56 +4361,6 @@ public static final native void memmove(CGPathElement dest, long /*int*/ src, lo * @param dest cast=(void *),flags=no_in critical * @param src cast=(void *),flags=critical */ -public static final native void memmove(long /*int*/ dest, CGPoint src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGPoint dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CGRect src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGRect dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CGSize src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGSize dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CTParagraphStyleSetting src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CTParagraphStyleSetting dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, NSAffineTransformStruct src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(NSAffineTransformStruct dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ public static final native void memmove(long /*int*/ dest, NSPoint src, long /*int*/ size); /** * @param dest cast=(void *),flags=no_in critical |