diff options
| author | Lakshmi Shanmugam | 2015-10-23 10:14:16 +0000 |
|---|---|---|
| committer | Lakshmi Shanmugam | 2015-10-23 11:17:47 +0000 |
| commit | bec6bb11a053d17cfefea4cccfbf882fa9c023c9 (patch) | |
| tree | 83f7fd5941d9f474b6b59720610d66b206b201c2 /bundles/org.eclipse.swt/Eclipse SWT PI | |
| parent | a9c4d77e32dd96ac0692346ec3fe8ffd464c5e98 (diff) | |
| download | eclipse.platform.swt-bec6bb11a053d17cfefea4cccfbf882fa9c023c9.tar.gz eclipse.platform.swt-bec6bb11a053d17cfefea4cccfbf882fa9c023c9.tar.xz eclipse.platform.swt-bec6bb11a053d17cfefea4cccfbf882fa9c023c9.zip | |
fix mac generator problems
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
3 files changed, 4 insertions, 5 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 c62b90b3f4..adcb6f8f79 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 @@ -563,7 +563,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1firstRectForCharacterRange_1) #ifndef NO_CALLBACK_1focusRingMaskBoundsForFrame_1inView_1 static jintLong CALLBACK_1focusRingMaskBoundsForFrame_1inView_1; static NSRect proc_CALLBACK_1focusRingMaskBoundsForFrame_1inView_1(id arg0, SEL arg1, NSRect arg2, NSView* arg3) { - NSRect* lprc = ((NSRect* (*)(id, SEL, NSRect*, NSView**))CALLBACK_1focusRingMaskBoundsForFrame_1inView_1)(arg0, arg1, &arg2, &arg3); + NSRect* lprc = ((NSRect* (*)(id, SEL, NSRect*, NSView*))CALLBACK_1focusRingMaskBoundsForFrame_1inView_1)(arg0, arg1, &arg2, arg3); NSRect rc; if (lprc) { rc = *lprc; 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 b49e3f442b..3f9737b1b6 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 @@ -665,7 +665,7 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> - <method selector="focusRingMaskBoundsForFrame:inView:" swt_gen="true"> + <method selector="focusRingMaskBoundsForFrame:inView:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> <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/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java index 7f0a660ae6..4a27915bce 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 @@ -104,8 +104,6 @@ public class OS extends C { public static final long /*int*/ sel_overwriteExistingFileCheck = sel_registerName("_overwriteExistingFileCheck:"); public static final long /*int*/ sel_setShowsHiddenFiles_ = sel_registerName("setShowsHiddenFiles:"); - - public static final long /*int*/ sel_setMovable_ = OS.sel_registerName("setMovable:"); public static final long /*int*/ sel_contextID = OS.sel_registerName("contextID"); @@ -700,7 +698,7 @@ public static final native long /*int*/ CALLBACK_drawWithExpansionFrame_inView_( public static final native long /*int*/ CALLBACK_expansionFrameWithFrame_inView_(long /*int*/ func); /** @method callback_types=NSRect;id;SEL;NSRange;,callback_flags=struct;none;none;struct; */ public static final native long /*int*/ CALLBACK_firstRectForCharacterRange_(long /*int*/ func); -/** @method callback_types=NSRect;id;SEL;NSRect;NSView*;,callback_flags=struct;none;none;struct;struct; */ +/** @method callback_types=NSRect;id;SEL;NSRect;NSView*;,callback_flags=struct;none;none;struct;none; */ public static final native long /*int*/ CALLBACK_focusRingMaskBoundsForFrame_inView_(long /*int*/ func); /** @method callback_types=NSRect;id;SEL;NSInteger;,callback_flags=struct;none;none;none; */ public static final native long /*int*/ CALLBACK_headerRectOfColumn_(long /*int*/ func); @@ -2005,6 +2003,7 @@ public static final long /*int*/ sel_setMinimum_ = sel_registerName("setMinimum: public static final long /*int*/ sel_setMinimumFractionDigits_ = sel_registerName("setMinimumFractionDigits:"); public static final long /*int*/ sel_setMinimumIntegerDigits_ = sel_registerName("setMinimumIntegerDigits:"); public static final long /*int*/ sel_setMiterLimit_ = sel_registerName("setMiterLimit:"); +public static final long /*int*/ sel_setMovable_ = sel_registerName("setMovable:"); public static final long /*int*/ sel_setNeedsDisplay_ = sel_registerName("setNeedsDisplay:"); public static final long /*int*/ sel_setNeedsDisplayInRect_ = sel_registerName("setNeedsDisplayInRect:"); public static final long /*int*/ sel_setNumberOfVisibleItems_ = sel_registerName("setNumberOfVisibleItems:"); |