View | Details | Raw Unified | Return to bug 201154 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse SWT PI/carbon/library/os.c (+16 lines)
Lines 129-134 Link Here
129
}
129
}
130
#endif
130
#endif
131
131
132
#ifndef NO_AEGetParamDesc
133
JNIEXPORT jint JNICALL OS_NATIVE(AEGetParamDesc)
134
	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
135
{
136
	AEDesc _arg3, *lparg3=NULL;
137
	jint rc = 0;
138
	OS_NATIVE_ENTER(env, that, AEGetParamDesc_FUNC);
139
	if (arg3) if ((lparg3 = getAEDescFields(env, arg3, &_arg3)) == NULL) goto fail;
140
	rc = (jint)AEGetParamDesc((const AppleEvent *)arg0, (AEKeyword)arg1, (DescType)arg2, (AEDesc *)lparg3);
141
fail:
142
	if (arg3 && lparg3) setAEDescFields(env, arg3, lparg3);
143
	OS_NATIVE_EXIT(env, that, AEGetParamDesc_FUNC);
144
	return rc;
145
}
146
#endif
147
132
#ifndef NO_AEInstallEventHandler
148
#ifndef NO_AEInstallEventHandler
133
JNIEXPORT jint JNICALL OS_NATIVE(AEInstallEventHandler)
149
JNIEXPORT jint JNICALL OS_NATIVE(AEInstallEventHandler)
134
	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
150
	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
(-)Eclipse SWT PI/carbon/library/os_stats.c (-2 / +3 lines)
Lines 14-21 Link Here
14
14
15
#ifdef NATIVE_STATS
15
#ifdef NATIVE_STATS
16
16
17
int OS_nativeFunctionCount = 999;
17
int OS_nativeFunctionCount = 1000;
18
int OS_nativeFunctionCallCount[999];
18
int OS_nativeFunctionCallCount[1000];
19
char * OS_nativeFunctionNames[] = {
19
char * OS_nativeFunctionNames[] = {
20
	"AECoerceDesc",
20
	"AECoerceDesc",
21
	"AECountItems",
21
	"AECountItems",
Lines 23-28 Link Here
23
	"AEDisposeDesc",
23
	"AEDisposeDesc",
24
	"AEGetDescData",
24
	"AEGetDescData",
25
	"AEGetNthPtr",
25
	"AEGetNthPtr",
26
	"AEGetParamDesc",
26
	"AEInstallEventHandler",
27
	"AEInstallEventHandler",
27
	"AEProcessAppleEvent",
28
	"AEProcessAppleEvent",
28
	"ATSFontActivateFromFileSpecification",
29
	"ATSFontActivateFromFileSpecification",
(-)Eclipse SWT PI/carbon/library/os_stats.h (+1 lines)
Lines 31-36 Link Here
31
	AEDisposeDesc_FUNC,
31
	AEDisposeDesc_FUNC,
32
	AEGetDescData_FUNC,
32
	AEGetDescData_FUNC,
33
	AEGetNthPtr_FUNC,
33
	AEGetNthPtr_FUNC,
34
	AEGetParamDesc_FUNC,
34
	AEInstallEventHandler_FUNC,
35
	AEInstallEventHandler_FUNC,
35
	AEProcessAppleEvent_FUNC,
36
	AEProcessAppleEvent_FUNC,
36
	ATSFontActivateFromFileSpecification_FUNC,
37
	ATSFontActivateFromFileSpecification_FUNC,
(-)Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java (+10 lines)
Lines 62-67 Link Here
62
	public static final int kAESmallSystemFontChanged = ('s'<<24) + ('s'<<16) + ('f'<<8) + 'n';
62
	public static final int kAESmallSystemFontChanged = ('s'<<24) + ('s'<<16) + ('f'<<8) + 'n';
63
	public static final int kAEViewsFontChanged = ('v'<<24) + ('f'<<16) + ('n'<<8) + 't';
63
	public static final int kAEViewsFontChanged = ('v'<<24) + ('f'<<16) + ('n'<<8) + 't';
64
	public static final int kAEQuitApplication = ('q'<<24) + ('u'<<16) + ('i'<<8) + 't';
64
	public static final int kAEQuitApplication = ('q'<<24) + ('u'<<16) + ('i'<<8) + 't';
65
	public static final int kAEOpenDocuments = ('o' << 24) + ('d' << 16) + ('o' << 8) + 'c';
66
	public static final int keyDirectObject = ('-' << 24) + ('-' << 16) + ('-' << 8) + '-';
67
	public static final int typeAEList = ('l' << 24) + ('i' << 16) + ('s' << 8) + 't';
65
	public static final int kCoreEventClass = ('a'<<24) + ('e'<<16) + ('v'<<8) + 't';
68
	public static final int kCoreEventClass = ('a'<<24) + ('e'<<16) + ('v'<<8) + 't';
66
	public static final int kAlertCautionAlert = 2;
69
	public static final int kAlertCautionAlert = 2;
67
	public static final int kAlertCautionIcon = ('c'<<24) + ('a'<<16) + ('u'<<8) + 't';
70
	public static final int kAlertCautionIcon = ('c'<<24) + ('a'<<16) + ('u'<<8) + 't';
Lines 1131-1136 Link Here
1131
 */
1134
 */
1132
public static final native int AEGetNthPtr(AEDesc theAEDescList, int index, int desiredType, int[] theAEKeyword, int[] typeCode, int dataPtr, int maximumSize, int[] actualSize);
1135
public static final native int AEGetNthPtr(AEDesc theAEDescList, int index, int desiredType, int[] theAEKeyword, int[] typeCode, int dataPtr, int maximumSize, int[] actualSize);
1133
/**
1136
/**
1137
 * @param theAppleEvent cast=(const AppleEvent *)
1138
 * @param theAEKeyword cast=(AEKeyword)
1139
 * @param desiredType cast=(DescType)
1140
 * @param result cast=(AEDesc *)
1141
 */
1142
public static final native int AEGetParamDesc (int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
1143
/**
1134
 * @param theAEEventClass cast=(AEEventClass)
1144
 * @param theAEEventClass cast=(AEEventClass)
1135
 * @param theAEEventID cast=(AEEventID)
1145
 * @param theAEEventID cast=(AEEventID)
1136
 * @param handler cast=(AEEventHandlerUPP)
1146
 * @param handler cast=(AEEventHandlerUPP)
(-)Eclipse SWT PI/cocoa/library/os.c (-1 / +36 lines)
Lines 1547-1553 Link Here
1547
	jint rc = 0;
1547
	jint rc = 0;
1548
	OS_NATIVE_ENTER(env, that, CGGetDisplaysWithRect_FUNC);
1548
	OS_NATIVE_ENTER(env, that, CGGetDisplaysWithRect_FUNC);
1549
	if (arg0) if ((lparg0 = getCGRectFields(env, arg0, &_arg0)) == NULL) goto fail;
1549
	if (arg0) if ((lparg0 = getCGRectFields(env, arg0, &_arg0)) == NULL) goto fail;
1550
	rc = (jint)CGGetDisplaysWithRect(*lparg0, (CGDisplayCount)arg1, (CGDirectDisplayID*)arg2, (CGDisplayCount*)arg3);
1550
	rc = (jint)CGGetDisplaysWithRect(*lparg0, (uint32_t)arg1, (CGDirectDisplayID*)arg2, (uint32_t*)arg3);
1551
fail:
1551
fail:
1552
	if (arg0 && lparg0) setCGRectFields(env, arg0, lparg0);
1552
	if (arg0 && lparg0) setCGRectFields(env, arg0, lparg0);
1553
	OS_NATIVE_EXIT(env, that, CGGetDisplaysWithRect_FUNC);
1553
	OS_NATIVE_EXIT(env, that, CGGetDisplaysWithRect_FUNC);
Lines 7535-7540 Link Here
7535
}
7535
}
7536
#endif
7536
#endif
7537
7537
7538
#ifndef NO_objc_1msgSend__JJJJII
7539
JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJII)
7540
	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
7541
{
7542
	jlong rc = 0;
7543
	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJII_FUNC);
7544
	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jint, jint))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
7545
	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJII_FUNC);
7546
	return rc;
7547
}
7548
#endif
7549
7538
#ifndef NO_objc_1msgSend__JJ_3I
7550
#ifndef NO_objc_1msgSend__JJ_3I
7539
JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3I)
7551
JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3I)
7540
	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2)
7552
	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2)
Lines 8318-8323 Link Here
8318
}
8330
}
8319
#endif
8331
#endif
8320
8332
8333
#if (!defined(NO_objc_1msgSend_1bool__IIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJZ) && defined(JNI64))
8334
#ifndef JNI64
8335
JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
8336
#else
8337
JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
8338
#endif
8339
{
8340
	jboolean rc = 0;
8341
#ifndef JNI64
8342
	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIIZ_FUNC);
8343
#else
8344
	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJZ_FUNC);
8345
#endif
8346
	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, jboolean))objc_msgSend_bool)(arg0, arg1, arg2, arg3);
8347
#ifndef JNI64
8348
	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIIZ_FUNC);
8349
#else
8350
	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJZ_FUNC);
8351
#endif
8352
	return rc;
8353
}
8354
#endif
8355
8321
#if (!defined(NO_objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
8356
#if (!defined(NO_objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
8322
#ifndef JNI64
8357
#ifndef JNI64
8323
JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
8358
JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
(-)Eclipse SWT PI/cocoa/library/os_stats.c (-2 / +8 lines)
Lines 14-21 Link Here
14
14
15
#ifdef NATIVE_STATS
15
#ifdef NATIVE_STATS
16
16
17
int OS_nativeFunctionCount = 532;
17
int OS_nativeFunctionCount = 534;
18
int OS_nativeFunctionCallCount[532];
18
int OS_nativeFunctionCallCount[534];
19
char * OS_nativeFunctionNames[] = {
19
char * OS_nativeFunctionNames[] = {
20
	"ATSFontActivateFromFileReference",
20
	"ATSFontActivateFromFileReference",
21
	"AcquireRootMenu",
21
	"AcquireRootMenu",
Lines 846-851 Link Here
846
#endif
846
#endif
847
	"objc_1msgSend__JJFD",
847
	"objc_1msgSend__JJFD",
848
	"objc_1msgSend__JJI",
848
	"objc_1msgSend__JJI",
849
	"objc_1msgSend__JJJJII",
849
	"objc_1msgSend__JJ_3I",
850
	"objc_1msgSend__JJ_3I",
850
	"objc_1msgSend__JJ_3JJJ",
851
	"objc_1msgSend__JJ_3JJJ",
851
#ifndef JNI64
852
#ifndef JNI64
Lines 980-985 Link Here
980
	"objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z",
981
	"objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z",
981
#endif
982
#endif
982
#ifndef JNI64
983
#ifndef JNI64
984
	"objc_1msgSend_1bool__IIIZ",
985
#else
986
	"objc_1msgSend_1bool__JJJZ",
987
#endif
988
#ifndef JNI64
983
	"objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
989
	"objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
984
#else
990
#else
985
	"objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
991
	"objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
(-)Eclipse SWT PI/cocoa/library/os_stats.h (+6 lines)
Lines 854-859 Link Here
854
#endif
854
#endif
855
	objc_1msgSend__JJFD_FUNC,
855
	objc_1msgSend__JJFD_FUNC,
856
	objc_1msgSend__JJI_FUNC,
856
	objc_1msgSend__JJI_FUNC,
857
	objc_1msgSend__JJJJII_FUNC,
857
	objc_1msgSend__JJ_3I_FUNC,
858
	objc_1msgSend__JJ_3I_FUNC,
858
	objc_1msgSend__JJ_3JJJ_FUNC,
859
	objc_1msgSend__JJ_3JJJ_FUNC,
859
#ifndef JNI64
860
#ifndef JNI64
Lines 988-993 Link Here
988
	objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC,
989
	objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC,
989
#endif
990
#endif
990
#ifndef JNI64
991
#ifndef JNI64
992
	objc_1msgSend_1bool__IIIZ_FUNC,
993
#else
994
	objc_1msgSend_1bool__JJJZ_FUNC,
995
#endif
996
#ifndef JNI64
991
	objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
997
	objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
992
#else
998
#else
993
	objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
999
	objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras (-216 / +245 lines)
Lines 151-156 Link Here
151
	<enum name="NSAlphaNonpremultipliedBitmapFormat" swt_gen="true"></enum>
151
	<enum name="NSAlphaNonpremultipliedBitmapFormat" swt_gen="true"></enum>
152
	<enum name="NSAlternateKeyMask" swt_gen="true"></enum>
152
	<enum name="NSAlternateKeyMask" swt_gen="true"></enum>
153
	<enum name="NSApplicationDefined" swt_gen="true"></enum>
153
	<enum name="NSApplicationDefined" swt_gen="true"></enum>
154
	<enum name="NSApplicationDelegateReplySuccess" swt_gen="true"></enum>
154
	<enum name="NSAtTop" swt_gen="true"></enum>
155
	<enum name="NSAtTop" swt_gen="true"></enum>
155
	<enum name="NSBackingStoreBuffered" swt_gen="true"></enum>
156
	<enum name="NSBackingStoreBuffered" swt_gen="true"></enum>
156
	<enum name="NSBackspaceCharacter" swt_gen="true"></enum>
157
	<enum name="NSBackspaceCharacter" swt_gen="true"></enum>
Lines 521-526 Link Here
521
			<arg name="flag" swt_gen="true"></arg>
522
			<arg name="flag" swt_gen="true"></arg>
522
			<retval swt_gen="true"></retval>
523
			<retval swt_gen="true"></retval>
523
		</method>
524
		</method>
525
		<method selector="replyToOpenOrPrint:" swt_gen="true">
526
			<arg name="reply" swt_gen="true"></arg>
527
			<retval swt_gen="true"></retval>
528
		</method>
524
		<method selector="run" swt_gen="true">
529
		<method selector="run" swt_gen="true">
525
			<retval swt_gen="true"></retval>
530
			<retval swt_gen="true"></retval>
526
		</method>
531
		</method>
Lines 2254-2259 Link Here
2254
			<arg name="attribute" swt_gen="true"></arg>
2259
			<arg name="attribute" swt_gen="true"></arg>
2255
			<retval swt_gen="true"></retval>
2260
			<retval swt_gen="true"></retval>
2256
		</method>
2261
		</method>
2262
		<method selector="application:openFile:" swt_gen="true">
2263
			<arg name="sender" swt_gen="true"></arg>
2264
			<arg name="filename" swt_gen="true"></arg>
2265
			<retval swt_gen="true"></retval>
2266
		</method>
2267
		<method selector="application:openFileWithoutUI:" swt_gen="true">
2268
			<arg name="sender" swt_gen="true"></arg>
2269
			<arg name="filename" swt_gen="true"></arg>
2270
			<retval swt_gen="true"></retval>
2271
		</method>
2272
		<method selector="application:openFiles:" swt_gen="true">
2273
			<arg name="sender" swt_gen="true"></arg>
2274
			<arg name="filenames" swt_gen="true"></arg>
2275
			<retval swt_gen="true"></retval>
2276
		</method>
2277
		<method selector="applicationOpenUntitledFile:" swt_gen="true">
2278
			<arg name="sender" swt_gen="true"></arg>
2279
			<retval swt_gen="true"></retval>
2280
		</method>
2281
		<method selector="applicationShouldHandleReopen:hasVisibleWindows:" swt_gen="true">
2282
			<arg name="sender" swt_gen="true"></arg>
2283
			<arg name="flag" swt_gen="true"></arg>
2284
			<retval swt_gen="true"></retval>
2285
		</method>
2257
		<method selector="draggedImage:endedAt:operation:" swt_gen="true" swt_gen_super_msgSend="true">
2286
		<method selector="draggedImage:endedAt:operation:" swt_gen="true" swt_gen_super_msgSend="true">
2258
			<arg name="image" swt_gen="true"></arg>
2287
			<arg name="image" swt_gen="true"></arg>
2259
			<arg name="screenPoint" swt_gen="true"></arg>
2288
			<arg name="screenPoint" swt_gen="true"></arg>
Lines 3314-3320 Link Here
3314
	</class>
3343
	</class>
3315
	<class name="NSTableView" swt_gen="mixed" swt_superclass="NSControl">
3344
	<class name="NSTableView" swt_gen="mixed" swt_superclass="NSControl">
3316
		<method selector="addTableColumn:" swt_gen="true">
3345
		<method selector="addTableColumn:" swt_gen="true">
3317
			<arg name="column" swt_gen="true"></arg>
3346
			<arg name="tableColumn"></arg>
3318
			<retval swt_gen="true"></retval>
3347
			<retval swt_gen="true"></retval>
3319
		</method>
3348
		</method>
3320
		<method selector="allowsColumnReordering" swt_gen="true">
3349
		<method selector="allowsColumnReordering" swt_gen="true">
Lines 3382-3388 Link Here
3382
			<retval swt_gen="true"></retval>
3411
			<retval swt_gen="true"></retval>
3383
		</method>
3412
		</method>
3384
		<method selector="moveColumn:toColumn:" swt_gen="true">
3413
		<method selector="moveColumn:toColumn:" swt_gen="true">
3385
			<arg name="column" swt_gen="true"></arg>
3414
			<arg name="oldIndex"></arg>
3386
			<arg name="newIndex" swt_gen="true"></arg>
3415
			<arg name="newIndex" swt_gen="true"></arg>
3387
			<retval swt_gen="true"></retval>
3416
			<retval swt_gen="true"></retval>
3388
		</method>
3417
		</method>
Lines 3410-3416 Link Here
3410
			<retval swt_gen="true"></retval>
3439
			<retval swt_gen="true"></retval>
3411
		</method>
3440
		</method>
3412
		<method selector="removeTableColumn:" swt_gen="true">
3441
		<method selector="removeTableColumn:" swt_gen="true">
3413
			<arg name="column" swt_gen="true"></arg>
3442
			<arg name="tableColumn"></arg>
3414
			<retval swt_gen="true"></retval>
3443
			<retval swt_gen="true"></retval>
3415
		</method>
3444
		</method>
3416
		<method selector="rowAtPoint:" swt_gen="true">
3445
		<method selector="rowAtPoint:" swt_gen="true">
Lines 3477-3483 Link Here
3477
		</method>
3506
		</method>
3478
		<method selector="setDropRow:dropOperation:" swt_gen="true">
3507
		<method selector="setDropRow:dropOperation:" swt_gen="true">
3479
			<arg name="row" swt_gen="true"></arg>
3508
			<arg name="row" swt_gen="true"></arg>
3480
			<arg name="op" swt_gen="true"></arg>
3509
			<arg name="dropOperation"></arg>
3481
			<retval swt_gen="true"></retval>
3510
			<retval swt_gen="true"></retval>
3482
		</method>
3511
		</method>
3483
		<method selector="setHeaderView:" swt_gen="true">
3512
		<method selector="setHeaderView:" swt_gen="true">
Lines 3485-3496 Link Here
3485
			<retval swt_gen="true"></retval>
3514
			<retval swt_gen="true"></retval>
3486
		</method>
3515
		</method>
3487
		<method selector="setHighlightedTableColumn:" swt_gen="true">
3516
		<method selector="setHighlightedTableColumn:" swt_gen="true">
3488
			<arg name="tc" swt_gen="true"></arg>
3517
			<arg name="tableColumn"></arg>
3489
			<retval swt_gen="true"></retval>
3518
			<retval swt_gen="true"></retval>
3490
		</method>
3519
		</method>
3491
		<method selector="setIndicatorImage:inTableColumn:" swt_gen="true">
3520
		<method selector="setIndicatorImage:inTableColumn:" swt_gen="true">
3492
			<arg name="anImage" swt_gen="true"></arg>
3521
			<arg name="anImage" swt_gen="true"></arg>
3493
			<arg name="tc" swt_gen="true"></arg>
3522
			<arg name="tableColumn"></arg>
3494
			<retval swt_gen="true"></retval>
3523
			<retval swt_gen="true"></retval>
3495
		</method>
3524
		</method>
3496
		<method selector="setIntercellSpacing:" swt_gen="true">
3525
		<method selector="setIntercellSpacing:" swt_gen="true">
Lines 4022-4028 Link Here
4022
			<retval swt_gen="true"></retval>
4051
			<retval swt_gen="true"></retval>
4023
		</method>
4052
		</method>
4024
		<method selector="drawRect:" swt_gen="true" swt_gen_custom_callback="true">
4053
		<method selector="drawRect:" swt_gen="true" swt_gen_custom_callback="true">
4025
			<arg name="rect" swt_gen="true"></arg>
4054
			<arg name="dirtyRect"></arg>
4026
			<retval swt_gen="true"></retval>
4055
			<retval swt_gen="true"></retval>
4027
		</method>
4056
		</method>
4028
		<method selector="endDocument" swt_gen="true">
4057
		<method selector="endDocument" swt_gen="true">
Lines 4537-4577 Link Here
4537
			<arg name="attribute" swt_gen="true"></arg>
4566
			<arg name="attribute" swt_gen="true"></arg>
4538
		</method>
4567
		</method>
4539
	</informal_protocol>
4568
	</informal_protocol>
4540
	<informal_protocol name="NSApplicationDelegate" swt_gen="mixed">
4541
		<method selector="applicationShouldTerminate:" swt_gen="true">
4542
			<arg name="sender" swt_gen="true"></arg>
4543
		</method>
4544
	</informal_protocol>
4545
	<informal_protocol name="NSApplicationNotifications" swt_gen="mixed">
4546
		<method selector="applicationDidBecomeActive:" swt_gen="true">
4547
			<arg name="notification" swt_gen="true"></arg>
4548
		</method>
4549
		<method selector="applicationDidFinishLaunching:" swt_gen="true">
4550
			<arg name="notification" swt_gen="true"></arg>
4551
		</method>
4552
		<method selector="applicationDidResignActive:" swt_gen="true">
4553
			<arg name="notification" swt_gen="true"></arg>
4554
		</method>
4555
		<method selector="applicationWillFinishLaunching:" swt_gen="true">
4556
			<arg name="notification" swt_gen="true"></arg>
4557
		</method>
4558
		<method selector="applicationWillTerminate:" swt_gen="true">
4559
			<arg name="notification" swt_gen="true"></arg>
4560
		</method>
4561
	</informal_protocol>
4562
	<informal_protocol name="NSColorPanelResponderMethod" swt_gen="true">
4569
	<informal_protocol name="NSColorPanelResponderMethod" swt_gen="true">
4563
		<method selector="changeColor:" swt_gen="true">
4570
		<method selector="changeColor:" swt_gen="true">
4564
			<arg name="sender" swt_gen="true"></arg>
4571
			<arg name="sender" swt_gen="true"></arg>
4565
		</method>
4572
		</method>
4566
	</informal_protocol>
4573
	</informal_protocol>
4567
	<informal_protocol name="NSComboBoxNotifications" swt_gen="mixed">
4568
		<method selector="comboBoxSelectionDidChange:" swt_gen="true">
4569
			<arg name="notification" swt_gen="true"></arg>
4570
		</method>
4571
		<method selector="comboBoxWillDismiss:" swt_gen="true">
4572
			<arg name="notification" swt_gen="true"></arg>
4573
		</method>
4574
	</informal_protocol>
4575
	<informal_protocol name="NSDraggingDestination" swt_gen="mixed">
4574
	<informal_protocol name="NSDraggingDestination" swt_gen="mixed">
4576
		<method selector="draggingEnded:" swt_gen="true">
4575
		<method selector="draggingEnded:" swt_gen="true">
4577
			<arg name="sender" swt_gen="true"></arg>
4576
			<arg name="sender" swt_gen="true"></arg>
Lines 4610-4852 Link Here
4610
			<arg name="sender" swt_gen="true"></arg>
4609
			<arg name="sender" swt_gen="true"></arg>
4611
		</method>
4610
		</method>
4612
	</informal_protocol>
4611
	</informal_protocol>
4612
	<informal_protocol name="NSOutlineViewNotifications" swt_gen="mixed">
4613
		<method selector="outlineViewColumnDidMove:" swt_gen="true">
4614
			<arg name="notification" swt_gen="true"></arg>
4615
		</method>
4616
		<method selector="outlineViewColumnDidResize:" swt_gen="true">
4617
			<arg name="notification" swt_gen="true"></arg>
4618
		</method>
4619
		<method selector="outlineViewItemDidExpand:" swt_gen="true">
4620
			<arg name="notification" swt_gen="true"></arg>
4621
		</method>
4622
		<method selector="outlineViewSelectionDidChange:" swt_gen="true">
4623
			<arg name="notification" swt_gen="true"></arg>
4624
		</method>
4625
		<method selector="outlineViewSelectionIsChanging:" swt_gen="true">
4626
			<arg name="notification" swt_gen="true"></arg>
4627
		</method>
4628
	</informal_protocol>
4629
	<informal_protocol name="NSPasteboardOwner" swt_gen="mixed">
4630
		<method selector="pasteboard:provideDataForType:" swt_gen="true">
4631
			<arg name="sender" swt_gen="true"></arg>
4632
			<arg name="type" swt_gen="true"></arg>
4633
		</method>
4634
	</informal_protocol>
4635
	<informal_protocol name="NSTextDelegate" swt_gen="mixed">
4636
		<method selector="textDidChange:" swt_gen="true">
4637
			<arg name="notification" swt_gen="true"></arg>
4638
		</method>
4639
		<method selector="textDidEndEditing:" swt_gen="true">
4640
			<arg name="notification" swt_gen="true"></arg>
4641
		</method>
4642
	</informal_protocol>
4643
	<informal_protocol name="NSToolTipOwner" swt_gen="true">
4644
		<method selector="view:stringForToolTip:point:userData:" swt_gen="true" swt_gen_custom_callback="true">
4645
			<arg name="view" swt_gen="true"></arg>
4646
			<arg name="tag" swt_gen="true"></arg>
4647
			<arg name="point" swt_gen="true"></arg>
4648
			<arg name="data" swt_gen="true"></arg>
4649
		</method>
4650
	</informal_protocol>
4651
	<class name="NSSecureTextField" swt_gen="true" swt_superclass="NSTextField"></class>
4613
	<informal_protocol name="NSMenuDelegate" swt_gen="mixed">
4652
	<informal_protocol name="NSMenuDelegate" swt_gen="mixed">
4614
		<method selector="menu:willHighlightItem:" swt_gen="true">
4653
		<method selector="menuNeedsUpdate:" swt_gen="true">
4615
			<arg name="menu" swt_gen="true"></arg>
4654
			<arg name="menu" swt_gen="true"></arg>
4616
			<arg name="item" swt_gen="true"></arg>
4617
		</method>
4655
		</method>
4618
		<method selector="menuDidClose:" swt_gen="true">
4656
		<method selector="menuDidClose:" swt_gen="true">
4619
			<arg name="menu" swt_gen="true"></arg>
4657
			<arg name="menu" swt_gen="true"></arg>
4620
		</method>
4658
		</method>
4621
		<method selector="menuNeedsUpdate:" swt_gen="true">
4659
		<method selector="menu:willHighlightItem:" swt_gen="true">
4622
			<arg name="menu" swt_gen="true"></arg>
4660
			<arg name="menu" swt_gen="true"></arg>
4661
			<arg name="item" swt_gen="true"></arg>
4623
		</method>
4662
		</method>
4624
		<method selector="menuWillOpen:" swt_gen="true">
4663
		<method selector="menuWillOpen:" swt_gen="true">
4625
			<arg name="menu" swt_gen="true"></arg>
4664
			<arg name="menu" swt_gen="true"></arg>
4626
		</method>
4665
		</method>
4627
	</informal_protocol>
4666
	</informal_protocol>
4628
	<informal_protocol name="NSOutlineViewDataSource" swt_gen="mixed">
4667
	<informal_protocol name="NSOutlineViewDataSource" swt_gen="mixed">
4629
		<method selector="outlineView:acceptDrop:item:childIndex:" swt_gen="true">
4668
		<method selector="outlineView:numberOfChildrenOfItem:" swt_gen="true">
4630
			<arg name="outlineView" swt_gen="true"></arg>
4631
			<arg name="info" swt_gen="true"></arg>
4632
			<arg name="item" swt_gen="true"></arg>
4669
			<arg name="item" swt_gen="true"></arg>
4633
			<arg name="index" swt_gen="true"></arg>
4634
		</method>
4635
		<method selector="outlineView:child:ofItem:" swt_gen="true">
4636
			<arg name="outlineView" swt_gen="true"></arg>
4670
			<arg name="outlineView" swt_gen="true"></arg>
4637
			<arg name="index" swt_gen="true"></arg>
4638
			<arg name="item" swt_gen="true"></arg>
4639
		</method>
4671
		</method>
4640
		<method selector="outlineView:isItemExpandable:" swt_gen="true">
4672
		<method selector="outlineView:writeItems:toPasteboard:" swt_gen="true">
4673
			<arg name="items" swt_gen="true"></arg>
4674
			<arg name="pasteboard" swt_gen="true"></arg>
4641
			<arg name="outlineView" swt_gen="true"></arg>
4675
			<arg name="outlineView" swt_gen="true"></arg>
4642
			<arg name="item" swt_gen="true"></arg>
4643
		</method>
4676
		</method>
4644
		<method selector="outlineView:numberOfChildrenOfItem:" swt_gen="true">
4677
		<method selector="outlineView:setObjectValue:forTableColumn:byItem:" swt_gen="true">
4645
			<arg name="outlineView" swt_gen="true"></arg>
4646
			<arg name="item" swt_gen="true"></arg>
4678
			<arg name="item" swt_gen="true"></arg>
4647
		</method>
4679
			<arg name="object" swt_gen="true"></arg>
4648
		<method selector="outlineView:objectValueForTableColumn:byItem:" swt_gen="true">
4649
			<arg name="outlineView" swt_gen="true"></arg>
4680
			<arg name="outlineView" swt_gen="true"></arg>
4650
			<arg name="tableColumn" swt_gen="true"></arg>
4681
			<arg name="tableColumn" swt_gen="true"></arg>
4651
			<arg name="item" swt_gen="true"></arg>
4652
		</method>
4682
		</method>
4653
		<method selector="outlineView:setObjectValue:forTableColumn:byItem:" swt_gen="true">
4683
		<method selector="outlineView:validateDrop:proposedItem:proposedChildIndex:" swt_gen="true">
4654
			<arg name="outlineView" swt_gen="true"></arg>
4684
			<arg name="index" swt_gen="true"></arg>
4655
			<arg name="object" swt_gen="true"></arg>
4656
			<arg name="tableColumn" swt_gen="true"></arg>
4657
			<arg name="item" swt_gen="true"></arg>
4685
			<arg name="item" swt_gen="true"></arg>
4686
			<arg name="info" swt_gen="true"></arg>
4687
			<arg name="outlineView" swt_gen="true"></arg>
4658
		</method>
4688
		</method>
4659
		<method selector="outlineView:validateDrop:proposedItem:proposedChildIndex:" swt_gen="true">
4689
		<method selector="outlineView:child:ofItem:" swt_gen="true">
4660
			<arg name="outlineView" swt_gen="true"></arg>
4690
			<arg name="outlineView" swt_gen="true"></arg>
4661
			<arg name="info" swt_gen="true"></arg>
4662
			<arg name="item" swt_gen="true"></arg>
4691
			<arg name="item" swt_gen="true"></arg>
4663
			<arg name="index" swt_gen="true"></arg>
4692
			<arg name="index" swt_gen="true"></arg>
4664
		</method>
4693
		</method>
4665
		<method selector="outlineView:writeItems:toPasteboard:" swt_gen="true">
4694
		<method selector="outlineView:objectValueForTableColumn:byItem:" swt_gen="true">
4666
			<arg name="outlineView" swt_gen="true"></arg>
4667
			<arg name="items" swt_gen="true"></arg>
4668
			<arg name="pasteboard" swt_gen="true"></arg>
4669
		</method>
4670
	</informal_protocol>
4671
	<informal_protocol name="NSOutlineViewDelegate" swt_gen="mixed">
4672
		<method selector="outlineView:didClickTableColumn:" swt_gen="true">
4673
			<arg name="outlineView" swt_gen="true"></arg>
4695
			<arg name="outlineView" swt_gen="true"></arg>
4696
			<arg name="item" swt_gen="true"></arg>
4674
			<arg name="tableColumn" swt_gen="true"></arg>
4697
			<arg name="tableColumn" swt_gen="true"></arg>
4675
		</method>
4698
		</method>
4676
		<method selector="outlineView:shouldCollapseItem:" swt_gen="true">
4699
		<method selector="outlineView:isItemExpandable:" swt_gen="true">
4677
			<arg name="outlineView" swt_gen="true"></arg>
4678
			<arg name="item" swt_gen="true"></arg>
4700
			<arg name="item" swt_gen="true"></arg>
4679
		</method>
4680
		<method selector="outlineView:shouldExpandItem:" swt_gen="true">
4681
			<arg name="outlineView" swt_gen="true"></arg>
4701
			<arg name="outlineView" swt_gen="true"></arg>
4682
			<arg name="item" swt_gen="true"></arg>
4683
		</method>
4702
		</method>
4684
		<method selector="outlineView:willDisplayCell:forTableColumn:item:" swt_gen="true">
4703
		<method selector="outlineView:acceptDrop:item:childIndex:" swt_gen="true">
4685
			<arg name="outlineView" swt_gen="true"></arg>
4704
			<arg name="index" swt_gen="true"></arg>
4686
			<arg name="cell" swt_gen="true"></arg>
4687
			<arg name="tableColumn" swt_gen="true"></arg>
4688
			<arg name="item" swt_gen="true"></arg>
4705
			<arg name="item" swt_gen="true"></arg>
4689
		</method>
4706
			<arg name="outlineView" swt_gen="true"></arg>
4690
	</informal_protocol>
4707
			<arg name="info" swt_gen="true"></arg>
4691
	<informal_protocol name="NSOutlineViewNotifications" swt_gen="mixed">
4692
		<method selector="outlineViewColumnDidMove:" swt_gen="true">
4693
			<arg name="notification" swt_gen="true"></arg>
4694
		</method>
4695
		<method selector="outlineViewColumnDidResize:" swt_gen="true">
4696
			<arg name="notification" swt_gen="true"></arg>
4697
		</method>
4698
		<method selector="outlineViewItemDidExpand:" swt_gen="true">
4699
			<arg name="notification" swt_gen="true"></arg>
4700
		</method>
4701
		<method selector="outlineViewSelectionDidChange:" swt_gen="true">
4702
			<arg name="notification" swt_gen="true"></arg>
4703
		</method>
4704
		<method selector="outlineViewSelectionIsChanging:" swt_gen="true">
4705
			<arg name="notification" swt_gen="true"></arg>
4706
		</method>
4707
	</informal_protocol>
4708
	<informal_protocol name="NSPasteboardOwner" swt_gen="mixed">
4709
		<method selector="pasteboard:provideDataForType:" swt_gen="true">
4710
			<arg name="sender" swt_gen="true"></arg>
4711
			<arg name="type" swt_gen="true"></arg>
4712
		</method>
4713
	</informal_protocol>
4714
	<informal_protocol name="NSSavePanelDelegate" swt_gen="mixed">
4715
		<method selector="panel:shouldShowFilename:" swt_gen="true">
4716
			<arg name="sender" swt_gen="true"></arg>
4717
			<arg name="filename" swt_gen="true"></arg>
4718
		</method>
4719
	</informal_protocol>
4720
	<informal_protocol name="NSTabViewDelegate" swt_gen="mixed">
4721
		<method selector="tabView:didSelectTabViewItem:" swt_gen="true">
4722
			<arg name="tabView" swt_gen="true"></arg>
4723
			<arg name="tabViewItem" swt_gen="true"></arg>
4724
		</method>
4725
		<method selector="tabView:shouldSelectTabViewItem:" swt_gen="true">
4726
			<arg name="tabView" swt_gen="true"></arg>
4727
			<arg name="tabViewItem" swt_gen="true"></arg>
4728
		</method>
4729
		<method selector="tabView:willSelectTabViewItem:" swt_gen="true">
4730
			<arg name="tabView" swt_gen="true"></arg>
4731
			<arg name="tabViewItem" swt_gen="true"></arg>
4732
		</method>
4708
		</method>
4733
	</informal_protocol>
4709
	</informal_protocol>
4734
	<informal_protocol name="NSTableDataSource" swt_gen="mixed">
4710
	<informal_protocol name="NSTableDataSource" swt_gen="mixed">
4735
		<method selector="numberOfRowsInTableView:" swt_gen="true">
4711
		<method selector="numberOfRowsInTableView:" swt_gen="true">
4736
			<arg name="tableView" swt_gen="true"></arg>
4712
			<arg name="tableView" swt_gen="true"></arg>
4737
		</method>
4713
		</method>
4738
		<method selector="tableView:acceptDrop:row:dropOperation:" swt_gen="true">
4714
		<method selector="tableView:setObjectValue:forTableColumn:row:" swt_gen="true">
4739
			<arg name="tableView" swt_gen="true"></arg>
4740
			<arg name="info" swt_gen="true"></arg>
4741
			<arg name="row" swt_gen="true"></arg>
4715
			<arg name="row" swt_gen="true"></arg>
4742
			<arg name="dropOperation" swt_gen="true"></arg>
4716
			<arg name="object" swt_gen="true"></arg>
4717
			<arg name="tableView" swt_gen="true"></arg>
4718
			<arg name="tableColumn" swt_gen="true"></arg>
4719
		</method>
4720
		<method selector="tableView:writeRowsWithIndexes:toPasteboard:" swt_gen="true">
4721
			<arg name="pboard" swt_gen="true"></arg>
4722
			<arg name="tableView" swt_gen="true"></arg>
4723
			<arg name="rowIndexes" swt_gen="true"></arg>
4743
		</method>
4724
		</method>
4744
		<method selector="tableView:objectValueForTableColumn:row:" swt_gen="true">
4725
		<method selector="tableView:objectValueForTableColumn:row:" swt_gen="true">
4726
			<arg name="row" swt_gen="true"></arg>
4745
			<arg name="tableView" swt_gen="true"></arg>
4727
			<arg name="tableView" swt_gen="true"></arg>
4746
			<arg name="tableColumn" swt_gen="true"></arg>
4728
			<arg name="tableColumn" swt_gen="true"></arg>
4747
			<arg name="row" swt_gen="true"></arg>
4748
		</method>
4729
		</method>
4749
		<method selector="tableView:setObjectValue:forTableColumn:row:" swt_gen="true">
4730
		<method selector="tableView:acceptDrop:row:dropOperation:" swt_gen="true">
4731
			<arg name="dropOperation" swt_gen="true"></arg>
4732
			<arg name="info" swt_gen="true"></arg>
4750
			<arg name="tableView" swt_gen="true"></arg>
4733
			<arg name="tableView" swt_gen="true"></arg>
4751
			<arg name="object" swt_gen="true"></arg>
4752
			<arg name="tableColumn" swt_gen="true"></arg>
4753
			<arg name="row" swt_gen="true"></arg>
4734
			<arg name="row" swt_gen="true"></arg>
4754
		</method>
4735
		</method>
4755
		<method selector="tableView:validateDrop:proposedRow:proposedDropOperation:" swt_gen="true">
4736
		<method selector="tableView:validateDrop:proposedRow:proposedDropOperation:" swt_gen="true">
4756
			<arg name="tableView" swt_gen="true"></arg>
4737
			<arg name="tableView" swt_gen="true"></arg>
4757
			<arg name="info" swt_gen="true"></arg>
4758
			<arg name="row" swt_gen="true"></arg>
4738
			<arg name="row" swt_gen="true"></arg>
4739
			<arg name="info" swt_gen="true"></arg>
4759
			<arg name="dropOperation" swt_gen="true"></arg>
4740
			<arg name="dropOperation" swt_gen="true"></arg>
4760
		</method>
4741
		</method>
4761
		<method selector="tableView:writeRowsWithIndexes:toPasteboard:" swt_gen="true">
4762
			<arg name="tableView" swt_gen="true"></arg>
4763
			<arg name="rowIndexes" swt_gen="true"></arg>
4764
			<arg name="pboard" swt_gen="true"></arg>
4765
		</method>
4766
	</informal_protocol>
4742
	</informal_protocol>
4767
	<informal_protocol name="NSTableViewDelegate" swt_gen="mixed">
4743
	<informal_protocol name="NSTextInput" swt_gen="true">
4768
		<method selector="tableView:didClickTableColumn:" swt_gen="true">
4744
		<method selector="hasMarkedText" swt_gen="true"></method>
4769
			<arg name="tableView" swt_gen="true"></arg>
4745
		<method selector="insertText:" swt_gen="true">
4770
			<arg name="tableColumn" swt_gen="true"></arg>
4746
			<arg name="aString" swt_gen="true"></arg>
4771
		</method>
4747
		</method>
4772
		<method selector="tableView:shouldEditTableColumn:row:" swt_gen="true">
4748
		<method selector="unmarkText" swt_gen="true"></method>
4773
			<arg name="tableView" swt_gen="true"></arg>
4749
		<method selector="selectedRange" swt_gen="true" swt_gen_custom_callback="true"></method>
4774
			<arg name="tableColumn" swt_gen="true"></arg>
4750
		<method selector="characterIndexForPoint:" swt_gen="true" swt_gen_custom_callback="true">
4775
			<arg name="row" swt_gen="true"></arg>
4751
			<arg name="thePoint" swt_gen="true"></arg>
4776
		</method>
4752
		</method>
4777
		<method selector="tableView:willDisplayCell:forTableColumn:row:" swt_gen="true">
4753
		<method selector="firstRectForCharacterRange:" swt_gen="true" swt_gen_custom_callback="true">
4778
			<arg name="tableView" swt_gen="true"></arg>
4754
			<arg name="theRange" swt_gen="true"></arg>
4779
			<arg name="cell" swt_gen="true"></arg>
4755
		</method>
4780
			<arg name="tableColumn" swt_gen="true"></arg>
4756
		<method selector="validAttributesForMarkedText" swt_gen="true"></method>
4781
			<arg name="row" swt_gen="true"></arg>
4757
		<method selector="attributedSubstringFromRange:" swt_gen="true" swt_gen_custom_callback="true">
4758
			<arg name="theRange" swt_gen="true"></arg>
4759
		</method>
4760
		<method selector="setMarkedText:selectedRange:" swt_gen="true" swt_gen_custom_callback="true">
4761
			<arg name="selRange" swt_gen="true"></arg>
4762
			<arg name="aString" swt_gen="true"></arg>
4782
		</method>
4763
		</method>
4764
		<method selector="markedRange" swt_gen="true" swt_gen_custom_callback="true"></method>
4783
	</informal_protocol>
4765
	</informal_protocol>
4784
	<informal_protocol name="NSTableViewNotifications" swt_gen="true">
4766
	<informal_protocol name="NSApplicationDelegate" swt_gen="mixed">
4785
		<method selector="tableViewColumnDidMove:" swt_gen="true">
4767
		<method selector="applicationShouldTerminate:" swt_gen="true">
4786
			<arg name="notification" swt_gen="true"></arg>
4768
			<arg name="sender" swt_gen="true"></arg>
4787
		</method>
4769
		</method>
4788
		<method selector="tableViewColumnDidResize:" swt_gen="true">
4770
	</informal_protocol>
4771
	<informal_protocol name="NSApplicationNotifications" swt_gen="mixed">
4772
		<method selector="applicationDidResignActive:" swt_gen="true">
4789
			<arg name="notification" swt_gen="true"></arg>
4773
			<arg name="notification" swt_gen="true"></arg>
4790
		</method>
4774
		</method>
4791
		<method selector="tableViewSelectionDidChange:" swt_gen="true">
4775
		<method selector="applicationWillFinishLaunching:" swt_gen="true">
4792
			<arg name="notification" swt_gen="true"></arg>
4776
			<arg name="notification" swt_gen="true"></arg>
4793
		</method>
4777
		</method>
4794
		<method selector="tableViewSelectionIsChanging:" swt_gen="true">
4778
		<method selector="applicationDidBecomeActive:" swt_gen="true">
4795
			<arg name="notification" swt_gen="true"></arg>
4779
			<arg name="notification" swt_gen="true"></arg>
4796
		</method>
4780
		</method>
4797
	</informal_protocol>
4781
		<method selector="applicationDidFinishLaunching:" swt_gen="true">
4798
	<informal_protocol name="NSTextDelegate" swt_gen="mixed">
4799
		<method selector="textDidChange:" swt_gen="true">
4800
			<arg name="notification" swt_gen="true"></arg>
4782
			<arg name="notification" swt_gen="true"></arg>
4801
		</method>
4783
		</method>
4802
		<method selector="textDidEndEditing:" swt_gen="true">
4784
		<method selector="applicationWillTerminate:" swt_gen="true">
4803
			<arg name="notification" swt_gen="true"></arg>
4785
			<arg name="notification" swt_gen="true"></arg>
4804
		</method>
4786
		</method>
4805
	</informal_protocol>
4787
	</informal_protocol>
4806
	<informal_protocol name="NSTextViewDelegate" swt_gen="mixed">
4788
	<informal_protocol name="NSToolbarNotifications" swt_gen="true">
4807
		<method selector="textView:clickedOnLink:atIndex:" swt_gen="true">
4789
		<method selector="toolbarWillAddItem:" swt_gen="true">
4808
			<arg name="textView" swt_gen="true"></arg>
4809
			<arg name="link" swt_gen="true"></arg>
4810
			<arg name="charIndex" swt_gen="true"></arg>
4811
		</method>
4812
		<method selector="textView:willChangeSelectionFromCharacterRange:toCharacterRange:" swt_gen="true" swt_gen_custom_callback="true">
4813
			<arg name="textView" swt_gen="true"></arg>
4814
			<arg name="oldSelectedCharRange" swt_gen="true"></arg>
4815
			<arg name="newSelectedCharRange" swt_gen="true"></arg>
4816
		</method>
4817
		<method selector="textViewDidChangeSelection:" swt_gen="true">
4818
			<arg name="notification" swt_gen="true"></arg>
4790
			<arg name="notification" swt_gen="true"></arg>
4819
		</method>
4791
		</method>
4820
	</informal_protocol>
4792
		<method selector="toolbarDidRemoveItem:" swt_gen="true">
4821
	<informal_protocol name="NSToolTipOwner" swt_gen="true">
4793
			<arg name="notification" swt_gen="true"></arg>
4822
		<method selector="view:stringForToolTip:point:userData:" swt_gen="true" swt_gen_custom_callback="true">
4823
			<arg name="view" swt_gen="true"></arg>
4824
			<arg name="tag" swt_gen="true"></arg>
4825
			<arg name="point" swt_gen="true"></arg>
4826
			<arg name="data" swt_gen="true"></arg>
4827
		</method>
4794
		</method>
4828
	</informal_protocol>
4795
	</informal_protocol>
4829
	<informal_protocol name="NSToolbarDelegate" swt_gen="true">
4796
	<informal_protocol name="NSTableViewNotifications" swt_gen="true">
4830
		<method selector="toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:" swt_gen="true">
4797
		<method selector="tableViewColumnDidResize:" swt_gen="true">
4831
			<arg name="toolbar" swt_gen="true"></arg>
4798
			<arg name="notification" swt_gen="true"></arg>
4832
			<arg name="itemIdentifier" swt_gen="true"></arg>
4833
			<arg name="flag" swt_gen="true"></arg>
4834
		</method>
4835
		<method selector="toolbarAllowedItemIdentifiers:" swt_gen="true">
4836
			<arg name="toolbar" swt_gen="true"></arg>
4837
		</method>
4838
		<method selector="toolbarDefaultItemIdentifiers:" swt_gen="true">
4839
			<arg name="toolbar" swt_gen="true"></arg>
4840
		</method>
4799
		</method>
4841
		<method selector="toolbarSelectableItemIdentifiers:" swt_gen="true">
4800
		<method selector="tableViewSelectionIsChanging:" swt_gen="true">
4842
			<arg name="toolbar" swt_gen="true"></arg>
4801
			<arg name="notification" swt_gen="true"></arg>
4843
		</method>
4802
		</method>
4844
	</informal_protocol>
4803
		<method selector="tableViewSelectionDidChange:" swt_gen="true">
4845
	<informal_protocol name="NSToolbarNotifications" swt_gen="true">
4846
		<method selector="toolbarDidRemoveItem:" swt_gen="true">
4847
			<arg name="notification" swt_gen="true"></arg>
4804
			<arg name="notification" swt_gen="true"></arg>
4848
		</method>
4805
		</method>
4849
		<method selector="toolbarWillAddItem:" swt_gen="true">
4806
		<method selector="tableViewColumnDidMove:" swt_gen="true">
4850
			<arg name="notification" swt_gen="true"></arg>
4807
			<arg name="notification" swt_gen="true"></arg>
4851
		</method>
4808
		</method>
4852
	</informal_protocol>
4809
	</informal_protocol>
Lines 4856-4905 Link Here
4856
		</method>
4813
		</method>
4857
	</informal_protocol>
4814
	</informal_protocol>
4858
	<informal_protocol name="NSWindowNotifications" swt_gen="mixed">
4815
	<informal_protocol name="NSWindowNotifications" swt_gen="mixed">
4859
		<method selector="windowDidBecomeKey:" swt_gen="true">
4816
		<method selector="windowDidResize:" swt_gen="true">
4860
			<arg name="notification" swt_gen="true"></arg>
4817
			<arg name="notification" swt_gen="true"></arg>
4861
		</method>
4818
		</method>
4862
		<method selector="windowDidDeminiaturize:" swt_gen="true">
4819
		<method selector="windowWillClose:" swt_gen="true">
4863
			<arg name="notification" swt_gen="true"></arg>
4820
			<arg name="notification" swt_gen="true"></arg>
4864
		</method>
4821
		</method>
4865
		<method selector="windowDidMiniaturize:" swt_gen="true">
4822
		<method selector="windowDidMiniaturize:" swt_gen="true">
4866
			<arg name="notification" swt_gen="true"></arg>
4823
			<arg name="notification" swt_gen="true"></arg>
4867
		</method>
4824
		</method>
4825
		<method selector="windowDidBecomeKey:" swt_gen="true">
4826
			<arg name="notification" swt_gen="true"></arg>
4827
		</method>
4828
		<method selector="windowDidDeminiaturize:" swt_gen="true">
4829
			<arg name="notification" swt_gen="true"></arg>
4830
		</method>
4868
		<method selector="windowDidMove:" swt_gen="true">
4831
		<method selector="windowDidMove:" swt_gen="true">
4869
			<arg name="notification" swt_gen="true"></arg>
4832
			<arg name="notification" swt_gen="true"></arg>
4870
		</method>
4833
		</method>
4871
		<method selector="windowDidResignKey:" swt_gen="true">
4834
		<method selector="windowDidResignKey:" swt_gen="true">
4872
			<arg name="notification" swt_gen="true"></arg>
4835
			<arg name="notification" swt_gen="true"></arg>
4873
		</method>
4836
		</method>
4874
		<method selector="windowDidResize:" swt_gen="true">
4837
	</informal_protocol>
4838
	<informal_protocol name="NSTableViewDelegate" swt_gen="mixed">
4839
		<method selector="tableView:willDisplayCell:forTableColumn:row:" swt_gen="true">
4840
			<arg name="row" swt_gen="true"></arg>
4841
			<arg name="cell" swt_gen="true"></arg>
4842
			<arg name="tableView" swt_gen="true"></arg>
4843
			<arg name="tableColumn" swt_gen="true"></arg>
4844
		</method>
4845
		<method selector="tableView:didClickTableColumn:" swt_gen="true">
4846
			<arg name="tableView" swt_gen="true"></arg>
4847
			<arg name="tableColumn" swt_gen="true"></arg>
4848
		</method>
4849
		<method selector="tableView:shouldEditTableColumn:row:" swt_gen="true">
4850
			<arg name="tableColumn" swt_gen="true"></arg>
4851
			<arg name="row" swt_gen="true"></arg>
4852
			<arg name="tableView" swt_gen="true"></arg>
4853
		</method>
4854
	</informal_protocol>
4855
	<informal_protocol name="NSTabViewDelegate" swt_gen="mixed">
4856
		<method selector="tabView:willSelectTabViewItem:" swt_gen="true">
4857
			<arg name="tabView" swt_gen="true"></arg>
4858
			<arg name="tabViewItem" swt_gen="true"></arg>
4859
		</method>
4860
		<method selector="tabView:shouldSelectTabViewItem:" swt_gen="true">
4861
			<arg name="tabViewItem" swt_gen="true"></arg>
4862
			<arg name="tabView" swt_gen="true"></arg>
4863
		</method>
4864
		<method selector="tabView:didSelectTabViewItem:" swt_gen="true">
4865
			<arg name="tabViewItem" swt_gen="true"></arg>
4866
			<arg name="tabView" swt_gen="true"></arg>
4867
		</method>
4868
	</informal_protocol>
4869
	<informal_protocol name="NSToolbarDelegate" swt_gen="true">
4870
		<method selector="toolbarAllowedItemIdentifiers:" swt_gen="true">
4871
			<arg name="toolbar" swt_gen="true"></arg>
4872
		</method>
4873
		<method selector="toolbarDefaultItemIdentifiers:" swt_gen="true">
4874
			<arg name="toolbar" swt_gen="true"></arg>
4875
		</method>
4876
		<method selector="toolbarSelectableItemIdentifiers:" swt_gen="true">
4877
			<arg name="toolbar" swt_gen="true"></arg>
4878
		</method>
4879
		<method selector="toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:" swt_gen="true">
4880
			<arg name="itemIdentifier" swt_gen="true"></arg>
4881
			<arg name="toolbar" swt_gen="true"></arg>
4882
			<arg name="flag" swt_gen="true"></arg>
4883
		</method>
4884
	</informal_protocol>
4885
	<informal_protocol name="NSComboBoxNotifications" swt_gen="mixed">
4886
		<method selector="comboBoxWillDismiss:" swt_gen="true">
4875
			<arg name="notification" swt_gen="true"></arg>
4887
			<arg name="notification" swt_gen="true"></arg>
4876
		</method>
4888
		</method>
4877
		<method selector="windowWillClose:" swt_gen="true">
4889
		<method selector="comboBoxSelectionDidChange:" swt_gen="true">
4878
			<arg name="notification" swt_gen="true"></arg>
4890
			<arg name="notification" swt_gen="true"></arg>
4879
		</method>
4891
		</method>
4880
	</informal_protocol>
4892
	</informal_protocol>
4881
	<class name="NSSecureTextField" swt_gen="true" swt_superclass="NSTextField"></class>
4893
	<informal_protocol name="NSTextViewDelegate" swt_gen="mixed">
4882
	<informal_protocol name="NSTextInput" swt_gen="true">
4894
		<method selector="textViewDidChangeSelection:" swt_gen="true">
4883
		<method selector="markedRange" swt_gen="true" swt_gen_custom_callback="true"></method>
4895
			<arg name="notification" swt_gen="true"></arg>
4884
		<method selector="insertText:" swt_gen="true">
4885
			<arg name="aString" swt_gen="true"></arg>
4886
		</method>
4896
		</method>
4887
		<method selector="unmarkText" swt_gen="true"></method>
4897
		<method selector="textView:clickedOnLink:atIndex:" swt_gen="true">
4888
		<method selector="hasMarkedText" swt_gen="true"></method>
4898
			<arg name="charIndex" swt_gen="true"></arg>
4889
		<method selector="validAttributesForMarkedText" swt_gen="true"></method>
4899
			<arg name="textView" swt_gen="true"></arg>
4890
		<method selector="characterIndexForPoint:" swt_gen="true" swt_gen_custom_callback="true">
4900
			<arg name="link" swt_gen="true"></arg>
4891
			<arg name="thePoint" swt_gen="true"></arg>
4892
		</method>
4901
		</method>
4893
		<method selector="attributedSubstringFromRange:" swt_gen="true" swt_gen_custom_callback="true">
4902
		<method selector="textView:willChangeSelectionFromCharacterRange:toCharacterRange:" swt_gen="true" swt_gen_custom_callback="true">
4894
			<arg name="theRange" swt_gen="true"></arg>
4903
			<arg name="oldSelectedCharRange" swt_gen="true"></arg>
4904
			<arg name="textView" swt_gen="true"></arg>
4905
			<arg name="newSelectedCharRange" swt_gen="true"></arg>
4895
		</method>
4906
		</method>
4896
		<method selector="selectedRange" swt_gen="true" swt_gen_custom_callback="true"></method>
4907
	</informal_protocol>
4897
		<method selector="setMarkedText:selectedRange:" swt_gen="true" swt_gen_custom_callback="true">
4908
	<informal_protocol name="NSSavePanelDelegate" swt_gen="mixed">
4898
			<arg name="selRange" swt_gen="true"></arg>
4909
		<method selector="panel:shouldShowFilename:" swt_gen="true">
4899
			<arg name="aString" swt_gen="true"></arg>
4910
			<arg name="filename" swt_gen="true"></arg>
4911
			<arg name="sender" swt_gen="true"></arg>
4900
		</method>
4912
		</method>
4901
		<method selector="firstRectForCharacterRange:" swt_gen="true" swt_gen_custom_callback="true">
4913
	</informal_protocol>
4902
			<arg name="theRange" swt_gen="true"></arg>
4914
	<informal_protocol name="NSOutlineViewDelegate" swt_gen="mixed">
4915
		<method selector="outlineView:willDisplayCell:forTableColumn:item:" swt_gen="true">
4916
			<arg name="outlineView" swt_gen="true"></arg>
4917
			<arg name="cell" swt_gen="true"></arg>
4918
			<arg name="item" swt_gen="true"></arg>
4919
			<arg name="tableColumn" swt_gen="true"></arg>
4920
		</method>
4921
		<method selector="outlineView:shouldCollapseItem:" swt_gen="true">
4922
			<arg name="outlineView" swt_gen="true"></arg>
4923
			<arg name="item" swt_gen="true"></arg>
4924
		</method>
4925
		<method selector="outlineView:didClickTableColumn:" swt_gen="true">
4926
			<arg name="outlineView" swt_gen="true"></arg>
4927
			<arg name="tableColumn" swt_gen="true"></arg>
4928
		</method>
4929
		<method selector="outlineView:shouldExpandItem:" swt_gen="true">
4930
			<arg name="item" swt_gen="true"></arg>
4931
			<arg name="outlineView" swt_gen="true"></arg>
4903
		</method>
4932
		</method>
4904
	</informal_protocol>
4933
	</informal_protocol>
4905
</signatures>
4934
</signatures>
(-)Eclipse (+16 lines)
Added Link Here
1
package org.eclipse.swt.internal.cocoa;
2
3
public class AppleEventDelegate extends NSObject {
4
5
	public AppleEventDelegate() {
6
	}
7
8
	public AppleEventDelegate(int id) {
9
		super(id);
10
	}
11
12
	public AppleEventDelegate(id id) {
13
		super(id);
14
	}
15
16
}
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras (-11 / +11 lines)
Lines 57-72 Link Here
57
		<arg name="height" swt_gen="true"></arg>
57
		<arg name="height" swt_gen="true"></arg>
58
		<arg name="bitsPerComponent" swt_gen="true"></arg>
58
		<arg name="bitsPerComponent" swt_gen="true"></arg>
59
		<arg name="bytesPerRow" swt_gen="true"></arg>
59
		<arg name="bytesPerRow" swt_gen="true"></arg>
60
		<arg name="colorspace" swt_gen="true"></arg>
60
		<arg name="space"></arg>
61
		<arg name="bitmapInfo" swt_gen="true"></arg>
61
		<arg name="bitmapInfo" swt_gen="true"></arg>
62
		<retval swt_gen="true"></retval>
62
		<retval swt_gen="true"></retval>
63
	</function>
63
	</function>
64
	<function name="CGBitmapContextCreateImage" swt_gen="true">
64
	<function name="CGBitmapContextCreateImage" swt_gen="true">
65
		<arg name="c" swt_gen="true"></arg>
65
		<arg name="context"></arg>
66
		<retval swt_gen="true"></retval>
66
		<retval swt_gen="true"></retval>
67
	</function>
67
	</function>
68
	<function name="CGBitmapContextGetData" swt_gen="true">
68
	<function name="CGBitmapContextGetData" swt_gen="true">
69
		<arg name="c" swt_gen="true"></arg>
69
		<arg name="context"></arg>
70
		<retval swt_gen="true"></retval>
70
		<retval swt_gen="true"></retval>
71
	</function>
71
	</function>
72
	<function name="CGColorCreate" swt_gen="true">
72
	<function name="CGColorCreate" swt_gen="true">
Lines 115-126 Link Here
115
		<arg name="mode" swt_gen="true"></arg>
115
		<arg name="mode" swt_gen="true"></arg>
116
	</function>
116
	</function>
117
	<function name="CGContextSetFillColor" swt_gen="true">
117
	<function name="CGContextSetFillColor" swt_gen="true">
118
		<arg name="c" swt_gen="true"></arg>
118
		<arg name="context"></arg>
119
		<arg name="components" swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
119
		<arg name="components" swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
120
	</function>
120
	</function>
121
	<function name="CGContextSetFillColorSpace" swt_gen="true">
121
	<function name="CGContextSetFillColorSpace" swt_gen="true">
122
		<arg name="c" swt_gen="true"></arg>
122
		<arg name="context"></arg>
123
		<arg name="colorspace" swt_gen="true"></arg>
123
		<arg name="space"></arg>
124
	</function>
124
	</function>
125
	<function name="CGContextSetLineCap" swt_gen="true">
125
	<function name="CGContextSetLineCap" swt_gen="true">
126
		<arg name="c" swt_gen="true"></arg>
126
		<arg name="c" swt_gen="true"></arg>
Lines 145-151 Link Here
145
		<arg name="limit" swt_gen="true"></arg>
145
		<arg name="limit" swt_gen="true"></arg>
146
	</function>
146
	</function>
147
	<function name="CGContextSetShouldAntialias" swt_gen="true">
147
	<function name="CGContextSetShouldAntialias" swt_gen="true">
148
		<arg name="c" swt_gen="true"></arg>
148
		<arg name="context"></arg>
149
		<arg name="shouldAntialias" swt_gen="true"></arg>
149
		<arg name="shouldAntialias" swt_gen="true"></arg>
150
	</function>
150
	</function>
151
	<function name="CGContextSetTextDrawingMode" swt_gen="true">
151
	<function name="CGContextSetTextDrawingMode" swt_gen="true">
Lines 209-215 Link Here
209
		<retval swt_gen="true"></retval>
209
		<retval swt_gen="true"></retval>
210
	</function>
210
	</function>
211
	<function name="CGEnableEventStateCombining" swt_gen="true">
211
	<function name="CGEnableEventStateCombining" swt_gen="true">
212
		<arg name="doCombineState" swt_gen="true"></arg>
212
		<arg name="combineState"></arg>
213
		<retval swt_gen="true"></retval>
213
		<retval swt_gen="true"></retval>
214
	</function>
214
	</function>
215
	<function name="CGEventCreateKeyboardEvent" swt_gen="true">
215
	<function name="CGEventCreateKeyboardEvent" swt_gen="true">
Lines 235-242 Link Here
235
	<function name="CGGetDisplaysWithRect" swt_gen="true">
235
	<function name="CGGetDisplaysWithRect" swt_gen="true">
236
		<arg name="rect" swt_gen="true"></arg>
236
		<arg name="rect" swt_gen="true"></arg>
237
		<arg name="maxDisplays" swt_gen="true"></arg>
237
		<arg name="maxDisplays" swt_gen="true"></arg>
238
		<arg name="dspys" swt_gen="true"></arg>
238
		<arg name="displays"></arg>
239
		<arg name="dspyCnt" swt_gen="true"></arg>
239
		<arg name="matchingDisplayCount"></arg>
240
		<retval swt_gen="true"></retval>
240
		<retval swt_gen="true"></retval>
241
	</function>
241
	</function>
242
	<function name="CGImageCreate" swt_gen="true">
242
	<function name="CGImageCreate" swt_gen="true">
Lines 245-251 Link Here
245
		<arg name="bitsPerComponent" swt_gen="true"></arg>
245
		<arg name="bitsPerComponent" swt_gen="true"></arg>
246
		<arg name="bitsPerPixel" swt_gen="true"></arg>
246
		<arg name="bitsPerPixel" swt_gen="true"></arg>
247
		<arg name="bytesPerRow" swt_gen="true"></arg>
247
		<arg name="bytesPerRow" swt_gen="true"></arg>
248
		<arg name="colorspace" swt_gen="true"></arg>
248
		<arg name="space"></arg>
249
		<arg name="bitmapInfo" swt_gen="true"></arg>
249
		<arg name="bitmapInfo" swt_gen="true"></arg>
250
		<arg name="provider" swt_gen="true"></arg>
250
		<arg name="provider" swt_gen="true"></arg>
251
		<arg name="decode" swt_gen="true"></arg>
251
		<arg name="decode" swt_gen="true"></arg>
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras (+12 lines)
Lines 68-73 Link Here
68
			<retval swt_gen="true" swt_java_type="NSAppleEventDescriptor"></retval>
68
			<retval swt_gen="true" swt_java_type="NSAppleEventDescriptor"></retval>
69
		</method>
69
		</method>
70
	</class>
70
	</class>
71
	<class name="NSAppleEventManager" swt_gen="mixed">
72
		<method selector="setEventHandler:andSelector:forEventClass:andEventID:" swt_gen="true">
73
			<arg name="handler" swt_gen="true"></arg>
74
			<arg name="handleEventSelector" swt_gen="true"></arg>
75
			<arg name="eventClass" swt_gen="true"></arg>
76
			<arg name="eventID" swt_gen="true"></arg>
77
			<retval swt_gen="true"></retval>
78
		</method>
79
		<method class_method="true" selector="sharedAppleEventManager" swt_gen="true">
80
			<retval swt_gen="true"></retval>
81
		</method>
82
	</class>
71
	<class name="NSArray" swt_gen="mixed">
83
	<class name="NSArray" swt_gen="mixed">
72
		<method class_method="true" selector="array" swt_gen="true">
84
		<method class_method="true" selector="array" swt_gen="true">
73
			<retval swt_gen="true" swt_java_type="NSArray"></retval>
85
			<retval swt_gen="true" swt_java_type="NSArray"></retval>
(-)Eclipse (+36 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Contributors:
9
 *    IBM Corporation - initial API and implementation
10
 *******************************************************************************/
11
package org.eclipse.swt.internal.cocoa;
12
13
public class NSAppleEventManager extends NSObject {
14
15
public NSAppleEventManager() {
16
	super();
17
}
18
19
public NSAppleEventManager(int /*long*/ id) {
20
	super(id);
21
}
22
23
public NSAppleEventManager(id id) {
24
	super(id);
25
}
26
27
public void setEventHandler(id handler, int /*long*/ handleEventSelector, int eventClass, int eventID) {
28
	OS.objc_msgSend(this.id, OS.sel_setEventHandler_andSelector_forEventClass_andEventID_, handler != null ? handler.id : 0, handleEventSelector, eventClass, eventID);
29
}
30
31
public static NSAppleEventManager sharedAppleEventManager() {
32
	int /*long*/ result = OS.objc_msgSend(OS.class_NSAppleEventManager, OS.sel_sharedAppleEventManager);
33
	return result != 0 ? new NSAppleEventManager(result) : null;
34
}
35
36
}
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java (+4 lines)
Lines 89-94 Link Here
89
	OS.objc_msgSend(this.id, OS.sel_postEvent_atStart_, event != null ? event.id : 0, flag);
89
	OS.objc_msgSend(this.id, OS.sel_postEvent_atStart_, event != null ? event.id : 0, flag);
90
}
90
}
91
91
92
public void replyToOpenOrPrint(int /*long*/ reply) {
93
	OS.objc_msgSend(this.id, OS.sel_replyToOpenOrPrint_, reply);
94
}
95
92
public void run() {
96
public void run() {
93
	OS.objc_msgSend(this.id, OS.sel_run);
97
	OS.objc_msgSend(this.id, OS.sel_run);
94
}
98
}
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java (+20 lines)
Lines 38-43 Link Here
38
	return OS.objc_msgSend_bool(this.id, OS.sel_accessibilitySetOverrideValue_forAttribute_, value != null ? value.id : 0, attribute != null ? attribute.id : 0);
38
	return OS.objc_msgSend_bool(this.id, OS.sel_accessibilitySetOverrideValue_forAttribute_, value != null ? value.id : 0, attribute != null ? attribute.id : 0);
39
}
39
}
40
40
41
public boolean application(NSApplication sender, NSString filename) {
42
	return OS.objc_msgSend_bool(this.id, OS.sel_application_openFile_, sender != null ? sender.id : 0, filename != null ? filename.id : 0);
43
}
44
45
public boolean application(id sender, NSString filename) {
46
	return OS.objc_msgSend_bool(this.id, OS.sel_application_openFileWithoutUI_, sender != null ? sender.id : 0, filename != null ? filename.id : 0);
47
}
48
49
public void application(NSApplication sender, NSArray filenames) {
50
	OS.objc_msgSend(this.id, OS.sel_application_openFiles_, sender != null ? sender.id : 0, filenames != null ? filenames.id : 0);
51
}
52
53
public boolean applicationOpenUntitledFile(NSApplication sender) {
54
	return OS.objc_msgSend_bool(this.id, OS.sel_applicationOpenUntitledFile_, sender != null ? sender.id : 0);
55
}
56
57
public boolean applicationShouldHandleReopen(NSApplication sender, boolean flag) {
58
	return OS.objc_msgSend_bool(this.id, OS.sel_applicationShouldHandleReopen_hasVisibleWindows_, sender != null ? sender.id : 0, flag);
59
}
60
41
public void draggedImage(NSImage image, NSPoint screenPoint, int /*long*/ operation) {
61
public void draggedImage(NSImage image, NSPoint screenPoint, int /*long*/ operation) {
42
	OS.objc_msgSend(this.id, OS.sel_draggedImage_endedAt_operation_, image != null ? image.id : 0, screenPoint, operation);
62
	OS.objc_msgSend(this.id, OS.sel_draggedImage_endedAt_operation_, image != null ? image.id : 0, screenPoint, operation);
43
}
63
}
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java (-12 / +12 lines)
Lines 24-31 Link Here
24
	super(id);
24
	super(id);
25
}
25
}
26
26
27
public void addTableColumn(NSTableColumn column) {
27
public void addTableColumn(NSTableColumn tableColumn) {
28
	OS.objc_msgSend(this.id, OS.sel_addTableColumn_, column != null ? column.id : 0);
28
	OS.objc_msgSend(this.id, OS.sel_addTableColumn_, tableColumn != null ? tableColumn.id : 0);
29
}
29
}
30
30
31
public boolean allowsColumnReordering() {
31
public boolean allowsColumnReordering() {
Lines 99-106 Link Here
99
	return OS.objc_msgSend_bool(this.id, OS.sel_isRowSelected_, row);
99
	return OS.objc_msgSend_bool(this.id, OS.sel_isRowSelected_, row);
100
}
100
}
101
101
102
public void moveColumn(int /*long*/ column, int /*long*/ newIndex) {
102
public void moveColumn(int /*long*/ oldIndex, int /*long*/ newIndex) {
103
	OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, column, newIndex);
103
	OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, oldIndex, newIndex);
104
}
104
}
105
105
106
public void noteNumberOfRowsChanged() {
106
public void noteNumberOfRowsChanged() {
Lines 135-142 Link Here
135
	OS.objc_msgSend(this.id, OS.sel_reloadData);
135
	OS.objc_msgSend(this.id, OS.sel_reloadData);
136
}
136
}
137
137
138
public void removeTableColumn(NSTableColumn column) {
138
public void removeTableColumn(NSTableColumn tableColumn) {
139
	OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, column != null ? column.id : 0);
139
	OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, tableColumn != null ? tableColumn.id : 0);
140
}
140
}
141
141
142
public int /*long*/ rowAtPoint(NSPoint point) {
142
public int /*long*/ rowAtPoint(NSPoint point) {
Lines 206-225 Link Here
206
	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, aSelector);
206
	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, aSelector);
207
}
207
}
208
208
209
public void setDropRow(int /*long*/ row, int /*long*/ op) {
209
public void setDropRow(int /*long*/ row, int /*long*/ dropOperation) {
210
	OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, op);
210
	OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, dropOperation);
211
}
211
}
212
212
213
public void setHeaderView(NSTableHeaderView headerView) {
213
public void setHeaderView(NSTableHeaderView headerView) {
214
	OS.objc_msgSend(this.id, OS.sel_setHeaderView_, headerView != null ? headerView.id : 0);
214
	OS.objc_msgSend(this.id, OS.sel_setHeaderView_, headerView != null ? headerView.id : 0);
215
}
215
}
216
216
217
public void setHighlightedTableColumn(NSTableColumn tc) {
217
public void setHighlightedTableColumn(NSTableColumn tableColumn) {
218
	OS.objc_msgSend(this.id, OS.sel_setHighlightedTableColumn_, tc != null ? tc.id : 0);
218
	OS.objc_msgSend(this.id, OS.sel_setHighlightedTableColumn_, tableColumn != null ? tableColumn.id : 0);
219
}
219
}
220
220
221
public void setIndicatorImage(NSImage anImage, NSTableColumn tc) {
221
public void setIndicatorImage(NSImage anImage, NSTableColumn tableColumn) {
222
	OS.objc_msgSend(this.id, OS.sel_setIndicatorImage_inTableColumn_, anImage != null ? anImage.id : 0, tc != null ? tc.id : 0);
222
	OS.objc_msgSend(this.id, OS.sel_setIndicatorImage_inTableColumn_, anImage != null ? anImage.id : 0, tableColumn != null ? tableColumn.id : 0);
223
}
223
}
224
224
225
public void setIntercellSpacing(NSSize aSize) {
225
public void setIntercellSpacing(NSSize aSize) {
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java (-2 / +2 lines)
Lines 150-157 Link Here
150
	OS.objc_msgSend(this.id, OS.sel_dragImage_at_offset_event_pasteboard_source_slideBack_, anImage != null ? anImage.id : 0, viewLocation, initialOffset, event != null ? event.id : 0, pboard != null ? pboard.id : 0, sourceObj != null ? sourceObj.id : 0, slideFlag);
150
	OS.objc_msgSend(this.id, OS.sel_dragImage_at_offset_event_pasteboard_source_slideBack_, anImage != null ? anImage.id : 0, viewLocation, initialOffset, event != null ? event.id : 0, pboard != null ? pboard.id : 0, sourceObj != null ? sourceObj.id : 0, slideFlag);
151
}
151
}
152
152
153
public void drawRect(NSRect rect) {
153
public void drawRect(NSRect dirtyRect) {
154
	OS.objc_msgSend(this.id, OS.sel_drawRect_, rect);
154
	OS.objc_msgSend(this.id, OS.sel_drawRect_, dirtyRect);
155
}
155
}
156
156
157
public void endDocument() {
157
public void endDocument() {
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java (-21 / +35 lines)
Lines 462-467 Link Here
462
public static final int /*long*/ class_NSAffineTransform = objc_getClass("NSAffineTransform");
462
public static final int /*long*/ class_NSAffineTransform = objc_getClass("NSAffineTransform");
463
public static final int /*long*/ class_NSAlert = objc_getClass("NSAlert");
463
public static final int /*long*/ class_NSAlert = objc_getClass("NSAlert");
464
public static final int /*long*/ class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
464
public static final int /*long*/ class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
465
public static final int /*long*/ class_NSAppleEventManager = objc_getClass("NSAppleEventManager");
465
public static final int /*long*/ class_NSApplication = objc_getClass("NSApplication");
466
public static final int /*long*/ class_NSApplication = objc_getClass("NSApplication");
466
public static final int /*long*/ class_NSArray = objc_getClass("NSArray");
467
public static final int /*long*/ class_NSArray = objc_getClass("NSArray");
467
public static final int /*long*/ class_NSAssertionHandler = objc_getClass("NSAssertionHandler");
468
public static final int /*long*/ class_NSAssertionHandler = objc_getClass("NSAssertionHandler");
Lines 704-712 Link Here
704
public static final int /*long*/ sel_appendBezierPathWithRect_ = sel_registerName("appendBezierPathWithRect:");
705
public static final int /*long*/ sel_appendBezierPathWithRect_ = sel_registerName("appendBezierPathWithRect:");
705
public static final int /*long*/ sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = sel_registerName("appendBezierPathWithRoundedRect:xRadius:yRadius:");
706
public static final int /*long*/ sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = sel_registerName("appendBezierPathWithRoundedRect:xRadius:yRadius:");
706
public static final int /*long*/ sel_appendString_ = sel_registerName("appendString:");
707
public static final int /*long*/ sel_appendString_ = sel_registerName("appendString:");
708
public static final int /*long*/ sel_application_openFile_ = sel_registerName("application:openFile:");
709
public static final int /*long*/ sel_application_openFileWithoutUI_ = sel_registerName("application:openFileWithoutUI:");
710
public static final int /*long*/ sel_application_openFiles_ = sel_registerName("application:openFiles:");
707
public static final int /*long*/ sel_applicationDidBecomeActive_ = sel_registerName("applicationDidBecomeActive:");
711
public static final int /*long*/ sel_applicationDidBecomeActive_ = sel_registerName("applicationDidBecomeActive:");
708
public static final int /*long*/ sel_applicationDidFinishLaunching_ = sel_registerName("applicationDidFinishLaunching:");
712
public static final int /*long*/ sel_applicationDidFinishLaunching_ = sel_registerName("applicationDidFinishLaunching:");
709
public static final int /*long*/ sel_applicationDidResignActive_ = sel_registerName("applicationDidResignActive:");
713
public static final int /*long*/ sel_applicationDidResignActive_ = sel_registerName("applicationDidResignActive:");
714
public static final int /*long*/ sel_applicationOpenUntitledFile_ = sel_registerName("applicationOpenUntitledFile:");
715
public static final int /*long*/ sel_applicationShouldHandleReopen_hasVisibleWindows_ = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
710
public static final int /*long*/ sel_applicationShouldTerminate_ = sel_registerName("applicationShouldTerminate:");
716
public static final int /*long*/ sel_applicationShouldTerminate_ = sel_registerName("applicationShouldTerminate:");
711
public static final int /*long*/ sel_applicationWillFinishLaunching_ = sel_registerName("applicationWillFinishLaunching:");
717
public static final int /*long*/ sel_applicationWillFinishLaunching_ = sel_registerName("applicationWillFinishLaunching:");
712
public static final int /*long*/ sel_applicationWillTerminate_ = sel_registerName("applicationWillTerminate:");
718
public static final int /*long*/ sel_applicationWillTerminate_ = sel_registerName("applicationWillTerminate:");
Lines 1365-1370 Link Here
1365
public static final int /*long*/ sel_removeTemporaryAttribute_forCharacterRange_ = sel_registerName("removeTemporaryAttribute:forCharacterRange:");
1371
public static final int /*long*/ sel_removeTemporaryAttribute_forCharacterRange_ = sel_registerName("removeTemporaryAttribute:forCharacterRange:");
1366
public static final int /*long*/ sel_removeTrackingArea_ = sel_registerName("removeTrackingArea:");
1372
public static final int /*long*/ sel_removeTrackingArea_ = sel_registerName("removeTrackingArea:");
1367
public static final int /*long*/ sel_replaceCharactersInRange_withString_ = sel_registerName("replaceCharactersInRange:withString:");
1373
public static final int /*long*/ sel_replaceCharactersInRange_withString_ = sel_registerName("replaceCharactersInRange:withString:");
1374
public static final int /*long*/ sel_replyToOpenOrPrint_ = sel_registerName("replyToOpenOrPrint:");
1368
public static final int /*long*/ sel_representation = sel_registerName("representation");
1375
public static final int /*long*/ sel_representation = sel_registerName("representation");
1369
public static final int /*long*/ sel_representations = sel_registerName("representations");
1376
public static final int /*long*/ sel_representations = sel_registerName("representations");
1370
public static final int /*long*/ sel_request = sel_registerName("request");
1377
public static final int /*long*/ sel_request = sel_registerName("request");
Lines 1523-1528 Link Here
1523
public static final int /*long*/ sel_setEditable_ = sel_registerName("setEditable:");
1530
public static final int /*long*/ sel_setEditable_ = sel_registerName("setEditable:");
1524
public static final int /*long*/ sel_setEnabled_ = sel_registerName("setEnabled:");
1531
public static final int /*long*/ sel_setEnabled_ = sel_registerName("setEnabled:");
1525
public static final int /*long*/ sel_setEnabled_forSegment_ = sel_registerName("setEnabled:forSegment:");
1532
public static final int /*long*/ sel_setEnabled_forSegment_ = sel_registerName("setEnabled:forSegment:");
1533
public static final int /*long*/ sel_setEventHandler_andSelector_forEventClass_andEventID_ = sel_registerName("setEventHandler:andSelector:forEventClass:andEventID:");
1526
public static final int /*long*/ sel_setFill = sel_registerName("setFill");
1534
public static final int /*long*/ sel_setFill = sel_registerName("setFill");
1527
public static final int /*long*/ sel_setFillColor_ = sel_registerName("setFillColor:");
1535
public static final int /*long*/ sel_setFillColor_ = sel_registerName("setFillColor:");
1528
public static final int /*long*/ sel_setFireDate_ = sel_registerName("setFireDate:");
1536
public static final int /*long*/ sel_setFireDate_ = sel_registerName("setFireDate:");
Lines 1683-1688 Link Here
1683
public static final int /*long*/ sel_setWindingRule_ = sel_registerName("setWindingRule:");
1691
public static final int /*long*/ sel_setWindingRule_ = sel_registerName("setWindingRule:");
1684
public static final int /*long*/ sel_setWorksWhenModal_ = sel_registerName("setWorksWhenModal:");
1692
public static final int /*long*/ sel_setWorksWhenModal_ = sel_registerName("setWorksWhenModal:");
1685
public static final int /*long*/ sel_setWraps_ = sel_registerName("setWraps:");
1693
public static final int /*long*/ sel_setWraps_ = sel_registerName("setWraps:");
1694
public static final int /*long*/ sel_sharedAppleEventManager = sel_registerName("sharedAppleEventManager");
1686
public static final int /*long*/ sel_sharedApplication = sel_registerName("sharedApplication");
1695
public static final int /*long*/ sel_sharedApplication = sel_registerName("sharedApplication");
1687
public static final int /*long*/ sel_sharedColorPanel = sel_registerName("sharedColorPanel");
1696
public static final int /*long*/ sel_sharedColorPanel = sel_registerName("sharedColorPanel");
1688
public static final int /*long*/ sel_sharedFontManager = sel_registerName("sharedFontManager");
1697
public static final int /*long*/ sel_sharedFontManager = sel_registerName("sharedFontManager");
Lines 1894-1899 Link Here
1894
public static final int NSAlphaNonpremultipliedBitmapFormat = 2;
1903
public static final int NSAlphaNonpremultipliedBitmapFormat = 2;
1895
public static final int NSAlternateKeyMask = 524288;
1904
public static final int NSAlternateKeyMask = 524288;
1896
public static final int NSApplicationDefined = 15;
1905
public static final int NSApplicationDefined = 15;
1906
public static final int NSApplicationDelegateReplySuccess = 0;
1897
public static final int NSAtTop = 2;
1907
public static final int NSAtTop = 2;
1898
public static final int NSBackingStoreBuffered = 2;
1908
public static final int NSBackingStoreBuffered = 2;
1899
public static final int NSBackspaceCharacter = 8;
1909
public static final int NSBackspaceCharacter = 8;
Lines 2684-2701 Link Here
2684
 * @param height cast=(size_t)
2694
 * @param height cast=(size_t)
2685
 * @param bitsPerComponent cast=(size_t)
2695
 * @param bitsPerComponent cast=(size_t)
2686
 * @param bytesPerRow cast=(size_t)
2696
 * @param bytesPerRow cast=(size_t)
2687
 * @param colorspace cast=(CGColorSpaceRef)
2697
 * @param space cast=(CGColorSpaceRef)
2688
 * @param bitmapInfo cast=(CGBitmapInfo)
2698
 * @param bitmapInfo cast=(CGBitmapInfo)
2689
 */
2699
 */
2690
public static final native int /*long*/ CGBitmapContextCreate(int /*long*/ data, int /*long*/ width, int /*long*/ height, int /*long*/ bitsPerComponent, int /*long*/ bytesPerRow, int /*long*/ colorspace, int bitmapInfo);
2700
public static final native int /*long*/ CGBitmapContextCreate(int /*long*/ data, int /*long*/ width, int /*long*/ height, int /*long*/ bitsPerComponent, int /*long*/ bytesPerRow, int /*long*/ space, int bitmapInfo);
2691
/**
2701
/**
2692
 * @param c cast=(CGContextRef)
2702
 * @param context cast=(CGContextRef)
2693
 */
2703
 */
2694
public static final native int /*long*/ CGBitmapContextCreateImage(int /*long*/ c);
2704
public static final native int /*long*/ CGBitmapContextCreateImage(int /*long*/ context);
2695
/**
2705
/**
2696
 * @param c cast=(CGContextRef)
2706
 * @param context cast=(CGContextRef)
2697
 */
2707
 */
2698
public static final native int /*long*/ CGBitmapContextGetData(int /*long*/ c);
2708
public static final native int /*long*/ CGBitmapContextGetData(int /*long*/ context);
2699
/**
2709
/**
2700
 * @param space cast=(CGColorSpaceRef)
2710
 * @param space cast=(CGColorSpaceRef)
2701
 * @param components cast=(CGFloat*)
2711
 * @param components cast=(CGFloat*)
Lines 2750-2764 Link Here
2750
 */
2760
 */
2751
public static final native void CGContextSetBlendMode(int /*long*/ context, int mode);
2761
public static final native void CGContextSetBlendMode(int /*long*/ context, int mode);
2752
/**
2762
/**
2753
 * @param c cast=(CGContextRef)
2763
 * @param context cast=(CGContextRef)
2754
 * @param components cast=(CGFloat*)
2764
 * @param components cast=(CGFloat*)
2755
 */
2765
 */
2756
public static final native void CGContextSetFillColor(int /*long*/ c, float[] /*double[]*/ components);
2766
public static final native void CGContextSetFillColor(int /*long*/ context, float[] /*double[]*/ components);
2757
/**
2767
/**
2758
 * @param c cast=(CGContextRef)
2768
 * @param context cast=(CGContextRef)
2759
 * @param colorspace cast=(CGColorSpaceRef)
2769
 * @param space cast=(CGColorSpaceRef)
2760
 */
2770
 */
2761
public static final native void CGContextSetFillColorSpace(int /*long*/ c, int /*long*/ colorspace);
2771
public static final native void CGContextSetFillColorSpace(int /*long*/ context, int /*long*/ space);
2762
/**
2772
/**
2763
 * @param c cast=(CGContextRef)
2773
 * @param c cast=(CGContextRef)
2764
 * @param cap cast=(CGLineCap)
2774
 * @param cap cast=(CGLineCap)
Lines 2787-2796 Link Here
2787
 */
2797
 */
2788
public static final native void CGContextSetMiterLimit(int /*long*/ c, float /*double*/ limit);
2798
public static final native void CGContextSetMiterLimit(int /*long*/ c, float /*double*/ limit);
2789
/**
2799
/**
2790
 * @param c cast=(CGContextRef)
2800
 * @param context cast=(CGContextRef)
2791
 * @param shouldAntialias cast=(_Bool)
2801
 * @param shouldAntialias cast=(_Bool)
2792
 */
2802
 */
2793
public static final native void CGContextSetShouldAntialias(int /*long*/ c, boolean shouldAntialias);
2803
public static final native void CGContextSetShouldAntialias(int /*long*/ context, boolean shouldAntialias);
2794
/**
2804
/**
2795
 * @param c cast=(CGContextRef)
2805
 * @param c cast=(CGContextRef)
2796
 * @param mode cast=(CGTextDrawingMode)
2806
 * @param mode cast=(CGTextDrawingMode)
Lines 2853-2861 Link Here
2853
 */
2863
 */
2854
public static final native int /*long*/ CGDisplayPixelsWide(int display);
2864
public static final native int /*long*/ CGDisplayPixelsWide(int display);
2855
/**
2865
/**
2856
 * @param doCombineState cast=(boolean_t)
2866
 * @param combineState cast=(boolean_t)
2857
 */
2867
 */
2858
public static final native int CGEnableEventStateCombining(int doCombineState);
2868
public static final native int CGEnableEventStateCombining(int combineState);
2859
/**
2869
/**
2860
 * @param source cast=(CGEventSourceRef)
2870
 * @param source cast=(CGEventSourceRef)
2861
 * @param virtualKey cast=(CGKeyCode)
2871
 * @param virtualKey cast=(CGKeyCode)
Lines 2880-2904 Link Here
2880
public static final native void CGEventPost(int tap, int /*long*/ event);
2890
public static final native void CGEventPost(int tap, int /*long*/ event);
2881
/**
2891
/**
2882
 * @param rect flags=struct
2892
 * @param rect flags=struct
2883
 * @param maxDisplays cast=(CGDisplayCount)
2893
 * @param maxDisplays cast=(uint32_t)
2884
 * @param dspys cast=(CGDirectDisplayID*)
2894
 * @param displays cast=(CGDirectDisplayID*)
2885
 * @param dspyCnt cast=(CGDisplayCount*)
2895
 * @param matchingDisplayCount cast=(uint32_t*)
2886
 */
2896
 */
2887
public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, int /*long*/ dspys, int /*long*/ dspyCnt);
2897
public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, int /*long*/ displays, int /*long*/ matchingDisplayCount);
2888
/**
2898
/**
2889
 * @param width cast=(size_t)
2899
 * @param width cast=(size_t)
2890
 * @param height cast=(size_t)
2900
 * @param height cast=(size_t)
2891
 * @param bitsPerComponent cast=(size_t)
2901
 * @param bitsPerComponent cast=(size_t)
2892
 * @param bitsPerPixel cast=(size_t)
2902
 * @param bitsPerPixel cast=(size_t)
2893
 * @param bytesPerRow cast=(size_t)
2903
 * @param bytesPerRow cast=(size_t)
2894
 * @param colorspace cast=(CGColorSpaceRef)
2904
 * @param space cast=(CGColorSpaceRef)
2895
 * @param bitmapInfo cast=(CGBitmapInfo)
2905
 * @param bitmapInfo cast=(CGBitmapInfo)
2896
 * @param provider cast=(CGDataProviderRef)
2906
 * @param provider cast=(CGDataProviderRef)
2897
 * @param decode cast=(CGFloat*)
2907
 * @param decode cast=(CGFloat*)
2898
 * @param shouldInterpolate cast=(_Bool)
2908
 * @param shouldInterpolate cast=(_Bool)
2899
 * @param intent cast=(CGColorRenderingIntent)
2909
 * @param intent cast=(CGColorRenderingIntent)
2900
 */
2910
 */
2901
public static final native int /*long*/ CGImageCreate(int /*long*/ width, int /*long*/ height, int /*long*/ bitsPerComponent, int /*long*/ bitsPerPixel, int /*long*/ bytesPerRow, int /*long*/ colorspace, int bitmapInfo, int /*long*/ provider, int /*long*/ decode, boolean shouldInterpolate, int intent);
2911
public static final native int /*long*/ CGImageCreate(int /*long*/ width, int /*long*/ height, int /*long*/ bitsPerComponent, int /*long*/ bitsPerPixel, int /*long*/ bytesPerRow, int /*long*/ space, int bitmapInfo, int /*long*/ provider, int /*long*/ decode, boolean shouldInterpolate, int intent);
2902
/**
2912
/**
2903
 * @param image cast=(CGImageRef)
2913
 * @param image cast=(CGImageRef)
2904
 */
2914
 */
Lines 3176-3181 Link Here
3176
 */
3186
 */
3177
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSSize arg1, boolean arg2);
3187
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSSize arg1, boolean arg2);
3178
/** @method flags=cast */
3188
/** @method flags=cast */
3189
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, boolean arg1);
3190
/** @method flags=cast */
3179
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
3191
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
3180
/** @method flags=cast */
3192
/** @method flags=cast */
3181
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
3193
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
Lines 3457-3462 Link Here
3457
/** @method flags=cast */
3469
/** @method flags=cast */
3458
public static final native long objc_msgSend(long id, long sel, int[] arg0);
3470
public static final native long objc_msgSend(long id, long sel, int[] arg0);
3459
/** @method flags=cast */
3471
/** @method flags=cast */
3472
public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, int arg2, int arg3);
3473
/** @method flags=cast */
3460
public static final native long objc_msgSend(long id, long sel, long[] arg0, long arg1, long arg2);
3474
public static final native long objc_msgSend(long id, long sel, long[] arg0, long arg1, long arg2);
3461
/** @method flags=cast */
3475
/** @method flags=cast */
3462
public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int /*long*/ id, int /*long*/ sel);
3476
public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int /*long*/ id, int /*long*/ sel);
(-)Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras (-4 / +4 lines)
Lines 413-429 Link Here
413
			<arg name="sender" swt_gen="true"></arg>
413
			<arg name="sender" swt_gen="true"></arg>
414
		</method>
414
		</method>
415
	</informal_protocol>
415
	</informal_protocol>
416
	<informal_protocol name="WebDocumentRepresentation" swt_gen="true">
417
		<method selector="documentSource" swt_gen="true"></method>
418
	</informal_protocol>
416
	<informal_protocol name="WebOpenPanelResultListener" swt_gen="true">
419
	<informal_protocol name="WebOpenPanelResultListener" swt_gen="true">
417
		<method selector="chooseFilename:" swt_gen="true">
420
		<method selector="chooseFilename:" swt_gen="true">
418
			<arg name="theRange" swt_gen="true"></arg>
421
			<arg name="theRange" swt_gen="true"></arg>
419
		</method>
422
		</method>
420
	</informal_protocol>
423
	</informal_protocol>
421
	<informal_protocol name="WebDocumentRepresentation" swt_gen="true">
422
		<method selector="documentSource" swt_gen="true"></method>
423
	</informal_protocol>
424
	<informal_protocol name="WebPolicyDecisionListener" swt_gen="true">
424
	<informal_protocol name="WebPolicyDecisionListener" swt_gen="true">
425
		<method selector="ignore" swt_gen="true"></method>
425
		<method selector="use" swt_gen="true"></method>
426
		<method selector="use" swt_gen="true"></method>
426
		<method selector="download" swt_gen="true"></method>
427
		<method selector="download" swt_gen="true"></method>
427
		<method selector="ignore" swt_gen="true"></method>
428
	</informal_protocol>
428
	</informal_protocol>
429
</signatures>
429
</signatures>
(-)Eclipse SWT PI/gtk/library/os.c (+73 lines)
Lines 567-572 Link Here
567
}
567
}
568
#endif
568
#endif
569
569
570
#ifndef NO_GdkEventProperty_1sizeof
571
JNIEXPORT jint JNICALL OS_NATIVE(GdkEventProperty_1sizeof)
572
	(JNIEnv *env, jclass that)
573
{
574
	jint rc = 0;
575
	OS_NATIVE_ENTER(env, that, GdkEventProperty_1sizeof_FUNC);
576
	rc = (jint)GdkEventProperty_sizeof();
577
	OS_NATIVE_EXIT(env, that, GdkEventProperty_1sizeof_FUNC);
578
	return rc;
579
}
580
#endif
581
570
#ifndef NO_GdkEventScroll_1sizeof
582
#ifndef NO_GdkEventScroll_1sizeof
571
JNIEXPORT jint JNICALL OS_NATIVE(GdkEventScroll_1sizeof)
583
JNIEXPORT jint JNICALL OS_NATIVE(GdkEventScroll_1sizeof)
572
	(JNIEnv *env, jclass that)
584
	(JNIEnv *env, jclass that)
Lines 1795-1800 Link Here
1795
}
1807
}
1796
#endif
1808
#endif
1797
1809
1810
#ifndef NO__1XGetWindowProperty
1811
JNIEXPORT jintLong JNICALL OS_NATIVE(_1XGetWindowProperty)
1812
	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jlong arg3, jlong arg4, jboolean arg5, jintLong arg6, jintLongArray arg7, jintLongArray arg8, jlongArray arg9, jlongArray arg10, jintLongArray arg11)
1813
{
1814
	jintLong *lparg7=NULL;
1815
	jintLong *lparg8=NULL;
1816
	jlong *lparg9=NULL;
1817
	jlong *lparg10=NULL;
1818
	jintLong *lparg11=NULL;
1819
	jintLong rc = 0;
1820
	OS_NATIVE_ENTER(env, that, _1XGetWindowProperty_FUNC);
1821
	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
1822
	if (arg8) if ((lparg8 = (*env)->GetIntLongArrayElements(env, arg8, NULL)) == NULL) goto fail;
1823
	if (arg9) if ((lparg9 = (*env)->GetLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
1824
	if (arg10) if ((lparg10 = (*env)->GetLongArrayElements(env, arg10, NULL)) == NULL) goto fail;
1825
	if (arg11) if ((lparg11 = (*env)->GetIntLongArrayElements(env, arg11, NULL)) == NULL) goto fail;
1826
	rc = (jintLong)XGetWindowProperty((Display *)arg0, (Window)arg1, (Atom)arg2, arg3, arg4, arg5, (Atom)arg6, (Atom*)lparg7, (int *)lparg8, (unsigned long *)lparg9, (unsigned long *)lparg10, (unsigned char **)lparg11);
1827
fail:
1828
	if (arg11 && lparg11) (*env)->ReleaseIntLongArrayElements(env, arg11, lparg11, 0);
1829
	if (arg10 && lparg10) (*env)->ReleaseLongArrayElements(env, arg10, lparg10, 0);
1830
	if (arg9 && lparg9) (*env)->ReleaseLongArrayElements(env, arg9, lparg9, 0);
1831
	if (arg8 && lparg8) (*env)->ReleaseIntLongArrayElements(env, arg8, lparg8, 0);
1832
	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
1833
	OS_NATIVE_EXIT(env, that, _1XGetWindowProperty_FUNC);
1834
	return rc;
1835
}
1836
#endif
1837
1798
#ifndef NO__1XInternAtom
1838
#ifndef NO__1XInternAtom
1799
JNIEXPORT jintLong JNICALL OS_NATIVE(_1XInternAtom)
1839
JNIEXPORT jintLong JNICALL OS_NATIVE(_1XInternAtom)
1800
	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2)
1840
	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2)
Lines 2158-2163 Link Here
2158
}
2198
}
2159
#endif
2199
#endif
2160
2200
2201
#ifndef NO__1XSetSelectionOwner
2202
JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetSelectionOwner)
2203
	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
2204
{
2205
	jintLong rc = 0;
2206
	OS_NATIVE_ENTER(env, that, _1XSetSelectionOwner_FUNC);
2207
	rc = (jintLong)XSetSelectionOwner((Display *)arg0, (Atom)arg1, arg2, (Time)arg3);
2208
	OS_NATIVE_EXIT(env, that, _1XSetSelectionOwner_FUNC);
2209
	return rc;
2210
}
2211
#endif
2212
2161
#ifndef NO__1XSetTransientForHint
2213
#ifndef NO__1XSetTransientForHint
2162
JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
2214
JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
2163
	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
2215
	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
Lines 18463-18468 Link Here
18463
}
18515
}
18464
#endif
18516
#endif
18465
18517
18518
#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J) && defined(JNI64))
18519
#ifndef JNI64
18520
JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
18521
#else
18522
JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
18523
#endif
18524
{
18525
#ifndef JNI64
18526
	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I_FUNC);
18527
#else
18528
	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J_FUNC);
18529
#endif
18530
	if (arg0) setGdkEventPropertyFields(env, arg0, (GdkEventProperty *)arg1);
18531
#ifndef JNI64
18532
	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I_FUNC);
18533
#else
18534
	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J_FUNC);
18535
#endif
18536
}
18537
#endif
18538
18466
#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ) && defined(JNI64))
18539
#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ) && defined(JNI64))
18467
#ifndef JNI64
18540
#ifndef JNI64
18468
JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
18541
JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
(-)Eclipse SWT PI/gtk/library/os_stats.c (-2 / +10 lines)
Lines 18-25 Link Here
18
18
19
#ifdef NATIVE_STATS
19
#ifdef NATIVE_STATS
20
20
21
int OS_nativeFunctionCount = 1328;
21
int OS_nativeFunctionCount = 1332;
22
int OS_nativeFunctionCallCount[1328];
22
int OS_nativeFunctionCallCount[1332];
23
char * OS_nativeFunctionNames[] = {
23
char * OS_nativeFunctionNames[] = {
24
#ifndef JNI64
24
#ifndef JNI64
25
	"Call__IIII",
25
	"Call__IIII",
Lines 75-80 Link Here
75
	"GdkEventFocus_1sizeof",
75
	"GdkEventFocus_1sizeof",
76
	"GdkEventKey_1sizeof",
76
	"GdkEventKey_1sizeof",
77
	"GdkEventMotion_1sizeof",
77
	"GdkEventMotion_1sizeof",
78
	"GdkEventProperty_1sizeof",
78
	"GdkEventScroll_1sizeof",
79
	"GdkEventScroll_1sizeof",
79
	"GdkEventVisibility_1sizeof",
80
	"GdkEventVisibility_1sizeof",
80
	"GdkEventWindowState_1sizeof",
81
	"GdkEventWindowState_1sizeof",
Lines 177-182 Link Here
177
	"_1XFlush",
178
	"_1XFlush",
178
	"_1XFree",
179
	"_1XFree",
179
	"_1XGetSelectionOwner",
180
	"_1XGetSelectionOwner",
181
	"_1XGetWindowProperty",
180
	"_1XInternAtom",
182
	"_1XInternAtom",
181
	"_1XKeysymToKeycode",
183
	"_1XKeysymToKeycode",
182
	"_1XListProperties",
184
	"_1XListProperties",
Lines 196-201 Link Here
196
	"_1XSetErrorHandler",
198
	"_1XSetErrorHandler",
197
	"_1XSetIOErrorHandler",
199
	"_1XSetIOErrorHandler",
198
	"_1XSetInputFocus",
200
	"_1XSetInputFocus",
201
	"_1XSetSelectionOwner",
199
	"_1XSetTransientForHint",
202
	"_1XSetTransientForHint",
200
	"_1XSynchronize",
203
	"_1XSynchronize",
201
	"_1XTestFakeButtonEvent",
204
	"_1XTestFakeButtonEvent",
Lines 1565-1570 Link Here
1565
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ",
1568
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ",
1566
#endif
1569
#endif
1567
#ifndef JNI64
1570
#ifndef JNI64
1571
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I",
1572
#else
1573
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J",
1574
#endif
1575
#ifndef JNI64
1568
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II",
1576
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II",
1569
#else
1577
#else
1570
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ",
1578
	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ",
(-)Eclipse SWT PI/gtk/library/os_stats.h (+8 lines)
Lines 83-88 Link Here
83
	GdkEventFocus_1sizeof_FUNC,
83
	GdkEventFocus_1sizeof_FUNC,
84
	GdkEventKey_1sizeof_FUNC,
84
	GdkEventKey_1sizeof_FUNC,
85
	GdkEventMotion_1sizeof_FUNC,
85
	GdkEventMotion_1sizeof_FUNC,
86
	GdkEventProperty_1sizeof_FUNC,
86
	GdkEventScroll_1sizeof_FUNC,
87
	GdkEventScroll_1sizeof_FUNC,
87
	GdkEventVisibility_1sizeof_FUNC,
88
	GdkEventVisibility_1sizeof_FUNC,
88
	GdkEventWindowState_1sizeof_FUNC,
89
	GdkEventWindowState_1sizeof_FUNC,
Lines 185-190 Link Here
185
	_1XFlush_FUNC,
186
	_1XFlush_FUNC,
186
	_1XFree_FUNC,
187
	_1XFree_FUNC,
187
	_1XGetSelectionOwner_FUNC,
188
	_1XGetSelectionOwner_FUNC,
189
	_1XGetWindowProperty_FUNC,
188
	_1XInternAtom_FUNC,
190
	_1XInternAtom_FUNC,
189
	_1XKeysymToKeycode_FUNC,
191
	_1XKeysymToKeycode_FUNC,
190
	_1XListProperties_FUNC,
192
	_1XListProperties_FUNC,
Lines 204-209 Link Here
204
	_1XSetErrorHandler_FUNC,
206
	_1XSetErrorHandler_FUNC,
205
	_1XSetIOErrorHandler_FUNC,
207
	_1XSetIOErrorHandler_FUNC,
206
	_1XSetInputFocus_FUNC,
208
	_1XSetInputFocus_FUNC,
209
	_1XSetSelectionOwner_FUNC,
207
	_1XSetTransientForHint_FUNC,
210
	_1XSetTransientForHint_FUNC,
208
	_1XSynchronize_FUNC,
211
	_1XSynchronize_FUNC,
209
	_1XTestFakeButtonEvent_FUNC,
212
	_1XTestFakeButtonEvent_FUNC,
Lines 1573-1578 Link Here
1573
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC,
1576
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC,
1574
#endif
1577
#endif
1575
#ifndef JNI64
1578
#ifndef JNI64
1579
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I_FUNC,
1580
#else
1581
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J_FUNC,
1582
#endif
1583
#ifndef JNI64
1576
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC,
1584
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC,
1577
#else
1585
#else
1578
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC,
1586
	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC,
(-)Eclipse SWT PI/gtk/library/os_structs.c (+46 lines)
Lines 711-716 Link Here
711
}
711
}
712
#endif
712
#endif
713
713
714
#ifndef NO_GdkEventProperty
715
typedef struct GdkEventProperty_FID_CACHE {
716
	int cached;
717
	jclass clazz;
718
	jfieldID window, send_event, atom, time, state;
719
} GdkEventProperty_FID_CACHE;
720
721
GdkEventProperty_FID_CACHE GdkEventPropertyFc;
722
723
void cacheGdkEventPropertyFields(JNIEnv *env, jobject lpObject)
724
{
725
	if (GdkEventPropertyFc.cached) return;
726
	cacheGdkEventFields(env, lpObject);
727
	GdkEventPropertyFc.clazz = (*env)->GetObjectClass(env, lpObject);
728
	GdkEventPropertyFc.window = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "window", I_J);
729
	GdkEventPropertyFc.send_event = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "send_event", "B");
730
	GdkEventPropertyFc.atom = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "atom", I_J);
731
	GdkEventPropertyFc.time = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "time", "I");
732
	GdkEventPropertyFc.state = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "state", "I");
733
	GdkEventPropertyFc.cached = 1;
734
}
735
736
GdkEventProperty *getGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct)
737
{
738
	if (!GdkEventPropertyFc.cached) cacheGdkEventPropertyFields(env, lpObject);
739
	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
740
	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventPropertyFc.window);
741
	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventPropertyFc.send_event);
742
	lpStruct->atom = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GdkEventPropertyFc.atom);
743
	lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventPropertyFc.time);
744
	lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventPropertyFc.state);
745
	return lpStruct;
746
}
747
748
void setGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct)
749
{
750
	if (!GdkEventPropertyFc.cached) cacheGdkEventPropertyFields(env, lpObject);
751
	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
752
	(*env)->SetIntLongField(env, lpObject, GdkEventPropertyFc.window, (jintLong)lpStruct->window);
753
	(*env)->SetByteField(env, lpObject, GdkEventPropertyFc.send_event, (jbyte)lpStruct->send_event);
754
	(*env)->SetIntLongField(env, lpObject, GdkEventPropertyFc.atom, (jintLong)lpStruct->atom);
755
	(*env)->SetIntField(env, lpObject, GdkEventPropertyFc.time, (jint)lpStruct->time);
756
	(*env)->SetIntField(env, lpObject, GdkEventPropertyFc.state, (jint)lpStruct->state);
757
}
758
#endif
759
714
#ifndef NO_GdkEventScroll
760
#ifndef NO_GdkEventScroll
715
typedef struct GdkEventScroll_FID_CACHE {
761
typedef struct GdkEventScroll_FID_CACHE {
716
	int cached;
762
	int cached;
(-)Eclipse SWT PI/gtk/library/os_structs.h (+12 lines)
Lines 183-188 Link Here
183
#define GdkEventMotion_sizeof() 0
183
#define GdkEventMotion_sizeof() 0
184
#endif
184
#endif
185
185
186
#ifndef NO_GdkEventProperty
187
void cacheGdkEventPropertyFields(JNIEnv *env, jobject lpObject);
188
GdkEventProperty *getGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct);
189
void setGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct);
190
#define GdkEventProperty_sizeof() sizeof(GdkEventProperty)
191
#else
192
#define cacheGdkEventPropertyFields(a,b)
193
#define getGdkEventPropertyFields(a,b,c) NULL
194
#define setGdkEventPropertyFields(a,b,c)
195
#define GdkEventProperty_sizeof() 0
196
#endif
197
186
#ifndef NO_GdkEventScroll
198
#ifndef NO_GdkEventScroll
187
void cacheGdkEventScrollFields(JNIEnv *env, jobject lpObject);
199
void cacheGdkEventScrollFields(JNIEnv *env, jobject lpObject);
188
GdkEventScroll *getGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventScroll *lpStruct);
200
GdkEventScroll *getGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventScroll *lpStruct);
(-)Eclipse (+29 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2009 IBM Corporation and others. All rights reserved.
3
 * The contents of this file are made available under the terms
4
 * of the GNU Lesser General Public License (LGPL) Version 2.1 that
5
 * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
6
 * available at http://www.gnu.org/licenses/lgpl.html.  If the version
7
 * of the LGPL at http://www.gnu.org is different to the version of
8
 * the LGPL accompanying this distribution and there is any conflict
9
 * between the two license versions, the terms of the LGPL accompanying
10
 * this distribution shall govern.
11
 * 
12
 * Contributors:
13
 *     IBM Corporation - initial API and implementation
14
 *******************************************************************************/
15
package org.eclipse.swt.internal.gtk;
16
17
public class GdkEventProperty extends GdkEvent {
18
	/** @field cast=(GdkWindow *) */
19
	public int /*long*/ window;
20
	/** @field cast=(gint8) */
21
	public byte send_event;
22
	/** @field cast=(GdkAtom) */
23
	public int /*long*/ atom;
24
	/** @field cast=(guint32) */
25
	public int time;
26
	/** @field cast=(guint) */
27
	public int state;
28
	public static final int sizeof = OS.GdkEventProperty_sizeof();
29
}
(-)Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java (+49 lines)
Lines 38-43 Link Here
38
	}
38
	}
39
39
40
	/** Constants */
40
	/** Constants */
41
	public static final int /*long*/ AnyPropertyType = 0;
41
	public static final int ATK_RELATION_LABELLED_BY = 4;
42
	public static final int ATK_RELATION_LABELLED_BY = 4;
42
	public static final int G_SIGNAL_MATCH_DATA = 1 << 4;
43
	public static final int G_SIGNAL_MATCH_DATA = 1 << 4;
43
	public static final int G_SIGNAL_MATCH_ID = 1 << 0;
44
	public static final int G_SIGNAL_MATCH_ID = 1 << 0;
Lines 200-205 Link Here
200
	public static final int GDK_POINTER_MOTION_HINT_MASK = 0x8;
201
	public static final int GDK_POINTER_MOTION_HINT_MASK = 0x8;
201
	public static final int GDK_POINTER_MOTION_MASK = 0x4;
202
	public static final int GDK_POINTER_MOTION_MASK = 0x4;
202
	public static final int GDK_PROPERTY_NOTIFY = 16;
203
	public static final int GDK_PROPERTY_NOTIFY = 16;
204
	public static final int GDK_PROPERTY_CHANGE_MASK = 1 << 16;
203
	public static final int GDK_Page_Down = 0xff56;
205
	public static final int GDK_Page_Down = 0xff56;
204
	public static final int GDK_Page_Up = 0xff55;
206
	public static final int GDK_Page_Up = 0xff55;
205
	public static final int GDK_Pause = 0xff13;
207
	public static final int GDK_Pause = 0xff13;
Lines 471-476 Link Here
471
	public static final byte[] popup_menu = ascii("popup-menu");
473
	public static final byte[] popup_menu = ascii("popup-menu");
472
	public static final byte[] populate_popup = ascii("populate-popup");
474
	public static final byte[] populate_popup = ascii("populate-popup");
473
	public static final byte[] preedit_changed = ascii("preedit-changed");
475
	public static final byte[] preedit_changed = ascii("preedit-changed");
476
	public static final byte[] property_notify_event = ascii("property-notify-event");
474
	public static final byte[] realize = ascii("realize");
477
	public static final byte[] realize = ascii("realize");
475
	public static final byte[] row_activated = ascii("row-activated");
478
	public static final byte[] row_activated = ascii("row-activated");
476
	public static final byte[] row_changed = ascii("row-changed");
479
	public static final byte[] row_changed = ascii("row-changed");
Lines 560-565 Link Here
560
public static final native int GdkEventFocus_sizeof();
563
public static final native int GdkEventFocus_sizeof();
561
public static final native int GdkEventKey_sizeof();
564
public static final native int GdkEventKey_sizeof();
562
public static final native int GdkEventMotion_sizeof();
565
public static final native int GdkEventMotion_sizeof();
566
public static final native int GdkEventProperty_sizeof();
563
public static final native int GdkEventScroll_sizeof();
567
public static final native int GdkEventScroll_sizeof();
564
public static final native int GdkEventVisibility_sizeof();
568
public static final native int GdkEventVisibility_sizeof();
565
public static final native int GdkEventWindowState_sizeof();
569
public static final native int GdkEventWindowState_sizeof();
Lines 838-843 Link Here
838
/**
842
/**
839
 * @param display cast=(Display *)
843
 * @param display cast=(Display *)
840
 * @param selection cast=(Atom)
844
 * @param selection cast=(Atom)
845
 * @param owner cast=(Window)
846
 * @param time cast=(Time)
847
 */
848
public static final native int /*long*/ _XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time);
849
public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time) {
850
	lock.lock();
851
	try {
852
		return _XSetSelectionOwner(display, selection, window, time);
853
	} finally {
854
		lock.unlock();
855
	}
856
}
857
/**
858
 * @param display cast=(Display *)
859
 * @param selection cast=(Atom)
841
 */
860
 */
842
public static final native int /*long*/ _XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
861
public static final native int /*long*/ _XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
843
public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection) {
862
public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection) {
Lines 848-853 Link Here
848
		lock.unlock();
867
		lock.unlock();
849
	}
868
	}
850
}
869
}
870
871
/**
872
 * @param display cast=(Display *)
873
 * @param window cast=(Window)
874
 * @param property cast=(Atom)
875
 * @param req_type cast=(Atom)
876
 * @param actual_type_return cast=(Atom*)
877
 * @param actual_format_return cast=(Atom*)
878
 * @param actual_format_return cast=(int *)
879
 * @param nitems_return cast=(unsigned long *)
880
 * @param bytes_after_return cast=(unsigned long *)
881
 * @param prop_return cast=(unsigned char **)
882
 */
883
public static final native int /*long*/ _XGetWindowProperty(int /*long*/ display, int /*long*/ window, int /*long*/ property, long offset, long length, boolean delete, int /*long*/ req_type, int /*long*/ [] actual_type_return, int /*long*/ [] actual_format_return , long[] nitems_return, long[] bytes_after_return, int /*long*/ [] prop_return);
884
public static final int /*long*/ XGetWindowProperty(
885
		int /*long*/ display, int /*long*/ window, int /*long*/ property, long offset, long length, boolean delete, int /*long*/ req_type, int /*long*/ [] actual_type_return, int /*long*/ [] actual_format_return, long[] nitems_return, long[] bytes_after_return, int /*long*/ [] prop_return) {
886
	lock.lock();
887
	try {
888
		return _XGetWindowProperty(display, window, property, offset, length, delete, req_type, actual_type_return, actual_format_return , nitems_return, bytes_after_return, prop_return);
889
	} finally {
890
		lock.unlock();
891
	}
892
}
893
894
851
/**
895
/**
852
 * @param display cast=(Display *)
896
 * @param display cast=(Display *)
853
 * @param name cast=(char *)
897
 * @param name cast=(char *)
Lines 13422-13427 Link Here
13422
/**
13466
/**
13423
 * @param dest cast=(void *),flags=no_in
13467
 * @param dest cast=(void *),flags=no_in
13424
 * @param src cast=(const void *)
13468
 * @param src cast=(const void *)
13469
 */
13470
public static final native void memmove(GdkEventProperty dest, int /*long*/ src);
13471
/**
13472
 * @param dest cast=(void *),flags=no_in
13473
 * @param src cast=(const void *)
13425
 * @param size cast=(size_t)
13474
 * @param size cast=(size_t)
13426
 */
13475
 */
13427
public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size);
13476
public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size);
(-)Eclipse SWT PI/win32/library/make_win32.mak (-1 / +1 lines)
Lines 68-74 Link Here
68
	/I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I.
68
	/I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I.
69
RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver)
69
RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver)
70
70
71
all: make_swt make_awt make_gdip make_wgl $(XULRUNNER_MAKE)
71
all: make_swt 
72
72
73
xpcom_custom.obj: xpcom_custom.cpp
73
xpcom_custom.obj: xpcom_custom.cpp
74
	cl $(MOZILLACFLAGS) xpcom_custom.cpp
74
	cl $(MOZILLACFLAGS) xpcom_custom.cpp
(-)Eclipse SWT PI/win32/library/os.c (+64 lines)
Lines 2418-2423 Link Here
2418
}
2418
}
2419
#endif
2419
#endif
2420
2420
2421
#ifndef NO_DuplicateHandle
2422
JNIEXPORT jboolean JNICALL OS_NATIVE(DuplicateHandle)
2423
	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3, jint arg4, jboolean arg5, jint arg6)
2424
{
2425
	jintLong *lparg3=NULL;
2426
	jboolean rc = 0;
2427
	OS_NATIVE_ENTER(env, that, DuplicateHandle_FUNC);
2428
	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
2429
	rc = (jboolean)DuplicateHandle((HANDLE)arg0, (HANDLE)arg1, (HANDLE)arg2, (LPHANDLE)lparg3, (DWORD)arg4, arg5, (DWORD)arg6);
2430
fail:
2431
	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
2432
	OS_NATIVE_EXIT(env, that, DuplicateHandle_FUNC);
2433
	return rc;
2434
}
2435
#endif
2436
2421
#ifndef NO_DwmEnableBlurBehindWindow
2437
#ifndef NO_DwmEnableBlurBehindWindow
2422
JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow)
2438
JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow)
2423
	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
2439
	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
Lines 3710-3715 Link Here
3710
}
3726
}
3711
#endif
3727
#endif
3712
3728
3729
#ifndef NO_GetCurrentProcess
3730
JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentProcess)
3731
	(JNIEnv *env, jclass that)
3732
{
3733
	jintLong rc = 0;
3734
	OS_NATIVE_ENTER(env, that, GetCurrentProcess_FUNC);
3735
	rc = (jintLong)GetCurrentProcess();
3736
	OS_NATIVE_EXIT(env, that, GetCurrentProcess_FUNC);
3737
	return rc;
3738
}
3739
#endif
3740
3713
#ifndef NO_GetCurrentProcessId
3741
#ifndef NO_GetCurrentProcessId
3714
JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentProcessId)
3742
JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentProcessId)
3715
	(JNIEnv *env, jclass that)
3743
	(JNIEnv *env, jclass that)
Lines 8191-8196 Link Here
8191
}
8219
}
8192
#endif
8220
#endif
8193
8221
8222
#ifndef NO_MapViewOfFile
8223
JNIEXPORT jintLong JNICALL OS_NATIVE(MapViewOfFile)
8224
	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
8225
{
8226
	jintLong rc = 0;
8227
	OS_NATIVE_ENTER(env, that, MapViewOfFile_FUNC);
8228
	rc = (jintLong)MapViewOfFile((HANDLE)arg0, (DWORD)arg1, (DWORD)arg2, (DWORD)arg3, arg4);
8229
	OS_NATIVE_EXIT(env, that, MapViewOfFile_FUNC);
8230
	return rc;
8231
}
8232
#endif
8233
8194
#ifndef NO_MapVirtualKeyA
8234
#ifndef NO_MapVirtualKeyA
8195
JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyA)
8235
JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyA)
8196
	(JNIEnv *env, jclass that, jint arg0, jint arg1)
8236
	(JNIEnv *env, jclass that, jint arg0, jint arg1)
Lines 11510-11515 Link Here
11510
}
11550
}
11511
#endif
11551
#endif
11512
11552
11553
#ifndef NO_OpenProcess
11554
JNIEXPORT jintLong JNICALL OS_NATIVE(OpenProcess)
11555
	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2)
11556
{
11557
	jintLong rc = 0;
11558
	OS_NATIVE_ENTER(env, that, OpenProcess_FUNC);
11559
	rc = (jintLong)OpenProcess((DWORD)arg0, arg1, (DWORD)arg2);
11560
	OS_NATIVE_EXIT(env, that, OpenProcess_FUNC);
11561
	return rc;
11562
}
11563
#endif
11564
11513
#ifndef NO_OpenThemeData
11565
#ifndef NO_OpenThemeData
11514
JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData)
11566
JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData)
11515
	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
11567
	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
Lines 16790-16795 Link Here
16790
}
16842
}
16791
#endif
16843
#endif
16792
16844
16845
#ifndef NO_UnmapViewOfFile
16846
JNIEXPORT jboolean JNICALL OS_NATIVE(UnmapViewOfFile)
16847
	(JNIEnv *env, jclass that, jintLong arg0)
16848
{
16849
	jboolean rc = 0;
16850
	OS_NATIVE_ENTER(env, that, UnmapViewOfFile_FUNC);
16851
	rc = (jboolean)UnmapViewOfFile((LPCVOID)arg0);
16852
	OS_NATIVE_EXIT(env, that, UnmapViewOfFile_FUNC);
16853
	return rc;
16854
}
16855
#endif
16856
16793
#ifndef NO_UnregisterClassA
16857
#ifndef NO_UnregisterClassA
16794
JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClassA)
16858
JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClassA)
16795
	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
16859
	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
(-)Eclipse SWT PI/win32/library/os_stats.c (-2 / +7 lines)
Lines 14-21 Link Here
14
14
15
#ifdef NATIVE_STATS
15
#ifdef NATIVE_STATS
16
16
17
int OS_nativeFunctionCount = 979;
17
int OS_nativeFunctionCount = 984;
18
int OS_nativeFunctionCallCount[979];
18
int OS_nativeFunctionCallCount[984];
19
char * OS_nativeFunctionNames[] = {
19
char * OS_nativeFunctionNames[] = {
20
	"ACCEL_1sizeof",
20
	"ACCEL_1sizeof",
21
	"ACTCTX_1sizeof",
21
	"ACTCTX_1sizeof",
Lines 181-186 Link Here
181
	"DrawThemeIcon",
181
	"DrawThemeIcon",
182
	"DrawThemeParentBackground",
182
	"DrawThemeParentBackground",
183
	"DrawThemeText",
183
	"DrawThemeText",
184
	"DuplicateHandle",
184
	"DwmEnableBlurBehindWindow",
185
	"DwmEnableBlurBehindWindow",
185
	"DwmExtendFrameIntoClientArea",
186
	"DwmExtendFrameIntoClientArea",
186
	"EMREXTCREATEFONTINDIRECTW_1sizeof",
187
	"EMREXTCREATEFONTINDIRECTW_1sizeof",
Lines 257-262 Link Here
257
	"GetClipboardFormatNameW",
258
	"GetClipboardFormatNameW",
258
	"GetComboBoxInfo",
259
	"GetComboBoxInfo",
259
	"GetCurrentObject",
260
	"GetCurrentObject",
261
	"GetCurrentProcess",
260
	"GetCurrentProcessId",
262
	"GetCurrentProcessId",
261
	"GetCurrentThreadId",
263
	"GetCurrentThreadId",
262
	"GetCursor",
264
	"GetCursor",
Lines 630-635 Link Here
630
	"MONITORINFO_1sizeof",
632
	"MONITORINFO_1sizeof",
631
	"MOUSEINPUT_1sizeof",
633
	"MOUSEINPUT_1sizeof",
632
	"MSG_1sizeof",
634
	"MSG_1sizeof",
635
	"MapViewOfFile",
633
	"MapVirtualKeyA",
636
	"MapVirtualKeyA",
634
	"MapVirtualKeyW",
637
	"MapVirtualKeyW",
635
#ifndef JNI64
638
#ifndef JNI64
Lines 1154-1159 Link Here
1154
	"OleInitialize",
1157
	"OleInitialize",
1155
	"OleUninitialize",
1158
	"OleUninitialize",
1156
	"OpenClipboard",
1159
	"OpenClipboard",
1160
	"OpenProcess",
1157
	"OpenThemeData",
1161
	"OpenThemeData",
1158
	"PAINTSTRUCT_1sizeof",
1162
	"PAINTSTRUCT_1sizeof",
1159
	"PANOSE_1sizeof",
1163
	"PANOSE_1sizeof",
Lines 1734-1739 Link Here
1734
	"TreeView_1GetItemRect",
1738
	"TreeView_1GetItemRect",
1735
	"UDACCEL_1sizeof",
1739
	"UDACCEL_1sizeof",
1736
	"UnhookWindowsHookEx",
1740
	"UnhookWindowsHookEx",
1741
	"UnmapViewOfFile",
1737
	"UnregisterClassA",
1742
	"UnregisterClassA",
1738
	"UnregisterClassW",
1743
	"UnregisterClassW",
1739
	"UpdateLayeredWindow",
1744
	"UpdateLayeredWindow",
(-)Eclipse SWT PI/win32/library/os_stats.h (+5 lines)
Lines 189-194 Link Here
189
	DrawThemeIcon_FUNC,
189
	DrawThemeIcon_FUNC,
190
	DrawThemeParentBackground_FUNC,
190
	DrawThemeParentBackground_FUNC,
191
	DrawThemeText_FUNC,
191
	DrawThemeText_FUNC,
192
	DuplicateHandle_FUNC,
192
	DwmEnableBlurBehindWindow_FUNC,
193
	DwmEnableBlurBehindWindow_FUNC,
193
	DwmExtendFrameIntoClientArea_FUNC,
194
	DwmExtendFrameIntoClientArea_FUNC,
194
	EMREXTCREATEFONTINDIRECTW_1sizeof_FUNC,
195
	EMREXTCREATEFONTINDIRECTW_1sizeof_FUNC,
Lines 265-270 Link Here
265
	GetClipboardFormatNameW_FUNC,
266
	GetClipboardFormatNameW_FUNC,
266
	GetComboBoxInfo_FUNC,
267
	GetComboBoxInfo_FUNC,
267
	GetCurrentObject_FUNC,
268
	GetCurrentObject_FUNC,
269
	GetCurrentProcess_FUNC,
268
	GetCurrentProcessId_FUNC,
270
	GetCurrentProcessId_FUNC,
269
	GetCurrentThreadId_FUNC,
271
	GetCurrentThreadId_FUNC,
270
	GetCursor_FUNC,
272
	GetCursor_FUNC,
Lines 638-643 Link Here
638
	MONITORINFO_1sizeof_FUNC,
640
	MONITORINFO_1sizeof_FUNC,
639
	MOUSEINPUT_1sizeof_FUNC,
641
	MOUSEINPUT_1sizeof_FUNC,
640
	MSG_1sizeof_FUNC,
642
	MSG_1sizeof_FUNC,
643
	MapViewOfFile_FUNC,
641
	MapVirtualKeyA_FUNC,
644
	MapVirtualKeyA_FUNC,
642
	MapVirtualKeyW_FUNC,
645
	MapVirtualKeyW_FUNC,
643
#ifndef JNI64
646
#ifndef JNI64
Lines 1162-1167 Link Here
1162
	OleInitialize_FUNC,
1165
	OleInitialize_FUNC,
1163
	OleUninitialize_FUNC,
1166
	OleUninitialize_FUNC,
1164
	OpenClipboard_FUNC,
1167
	OpenClipboard_FUNC,
1168
	OpenProcess_FUNC,
1165
	OpenThemeData_FUNC,
1169
	OpenThemeData_FUNC,
1166
	PAINTSTRUCT_1sizeof_FUNC,
1170
	PAINTSTRUCT_1sizeof_FUNC,
1167
	PANOSE_1sizeof_FUNC,
1171
	PANOSE_1sizeof_FUNC,
Lines 1742-1747 Link Here
1742
	TreeView_1GetItemRect_FUNC,
1746
	TreeView_1GetItemRect_FUNC,
1743
	UDACCEL_1sizeof_FUNC,
1747
	UDACCEL_1sizeof_FUNC,
1744
	UnhookWindowsHookEx_FUNC,
1748
	UnhookWindowsHookEx_FUNC,
1749
	UnmapViewOfFile_FUNC,
1745
	UnregisterClassA_FUNC,
1750
	UnregisterClassA_FUNC,
1746
	UnregisterClassW_FUNC,
1751
	UnregisterClassW_FUNC,
1747
	UpdateLayeredWindow_FUNC,
1752
	UpdateLayeredWindow_FUNC,
(-)Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java (-1 / +35 lines)
Lines 670-676 Link Here
670
	public static final int FCONTROL = 0x8;
670
	public static final int FCONTROL = 0x8;
671
	public static final int FE_FONTSMOOTHINGCLEARTYPE = 0x0002;
671
	public static final int FE_FONTSMOOTHINGCLEARTYPE = 0x0002;
672
	public static final int FEATURE_DISABLE_NAVIGATION_SOUNDS = 21;
672
	public static final int FEATURE_DISABLE_NAVIGATION_SOUNDS = 21;
673
	public static final int FILE_ATTRIBUTE_NORMAL = 0x00000080; 
673
	public static final int FILE_ATTRIBUTE_NORMAL = 0x00000080;
674
	public static final int FILE_MAP_READ = 4;
674
	public static final int FNERR_INVALIDFILENAME = 0x3002;
675
	public static final int FNERR_INVALIDFILENAME = 0x3002;
675
	public static final int FNERR_BUFFERTOOSMALL = 0x3003;
676
	public static final int FNERR_BUFFERTOOSMALL = 0x3003;
676
	public static final int FORMAT_MESSAGE_ALLOCATE_BUFFER = 0x00000100;
677
	public static final int FORMAT_MESSAGE_ALLOCATE_BUFFER = 0x00000100;
Lines 6612-6615 Link Here
6612
public static final native int /*long*/ WindowFromPoint (POINT lpPoint);
6613
public static final native int /*long*/ WindowFromPoint (POINT lpPoint);
6613
/** @param string cast=(const wchar_t *) */
6614
/** @param string cast=(const wchar_t *) */
6614
public static final native int wcslen (int /*long*/ string);
6615
public static final native int wcslen (int /*long*/ string);
6616
6617
/** @param hFileMappingObject cast=(HANDLE) 
6618
 *  @param dwDesiredAccess cast=(DWORD)
6619
 *  @param dwFileOffsetHigh cast=(DWORD)
6620
 *  @param dwFileOffsetLow cast=(DWORD)
6621
 */
6622
public static final native int /*long*/ MapViewOfFile(int /*long*/ hFileMappingObject, int dwDesiredAccess, int dwFileOffsetHigh, int dwFileOffsetLow, int dwNumberOfBytesToMap);
6623
/** @param lpBaseAddress cast=(LPCVOID) */
6624
public static final native boolean UnmapViewOfFile(int /*long*/ lpBaseAddress);
6625
6626
public static final int PROCESS_DUP_HANDLE = 0x0040;
6627
public static final int PROCESS_VM_READ = 0x0010;
6628
public static final int DUPLICATE_SAME_ACCESS = 2;
6629
6630
/**
6631
 * @param dwDesiredAccess cast=(DWORD)
6632
 * @param dwProcessId cast=(DWORD)
6633
 */
6634
public static final native int /*long*/ OpenProcess(int dwDesiredAccess, boolean bInheritHandle, int dwProcessId);
6635
6636
public static final native int /*long*/ GetCurrentProcess();
6637
6638
/**
6639
 * @param hSourceProcessHandle cast=(HANDLE) 
6640
 * @param hSourceHandle cast=(HANDLE) 
6641
 * @param hTargetProcessHandle cast=(HANDLE) 
6642
 * @param lpTargetHandle cast=(LPHANDLE)
6643
 * @param dwDesiredAccess cast=(DWORD) 
6644
 * @param dwOptions cast=(DWORD) 
6645
 */
6646
public static final native boolean DuplicateHandle(int /*long*/ hSourceProcessHandle, int /*long*/ hSourceHandle, int /*long*/ hTargetProcessHandle,
6647
		int /*long*/ [] lpTargetHandle, int dwDesiredAccess, boolean b, int dwOptions);
6648
6615
}
6649
}
(-)Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java (-20 / +92 lines)
Lines 22-27 Link Here
22
import org.eclipse.swt.internal.carbon.HICommand;
22
import org.eclipse.swt.internal.carbon.HICommand;
23
import org.eclipse.swt.internal.carbon.Rect;
23
import org.eclipse.swt.internal.carbon.Rect;
24
import org.eclipse.swt.internal.carbon.RGBColor;
24
import org.eclipse.swt.internal.carbon.RGBColor;
25
import org.eclipse.swt.internal.carbon.AEDesc;
25
import org.eclipse.swt.internal.cocoa.*;
26
import org.eclipse.swt.internal.cocoa.*;
26
27
27
import org.eclipse.swt.*;
28
import org.eclipse.swt.*;
Lines 106-121 Link Here
106
 * @noextend This class is not intended to be subclassed by clients.
107
 * @noextend This class is not intended to be subclassed by clients.
107
 */
108
 */
108
public class Display extends Device {
109
public class Display extends Device {
109
	
110
	final static int SWT_CLASS = 'S' << 24 | 'W' << 16 | 'T' << 8 | '-';
111
	final static int SWT_OPEN_FILE_KIND = 1;
112
	final static int SWT_OPEN_FILE_PARAM = 'o' << 24 | 'd' << 16 | 'o' << 8 | 'c';
113
110
	/* Windows and Events */
114
	/* Windows and Events */
111
	Event [] eventQueue;
115
	Event [] eventQueue;
112
	Callback actionCallback, appleEventCallback, clockCallback, commandCallback, controlCallback, accessibilityCallback, appearanceCallback;
116
	Callback actionCallback, appleEventCallback, clockCallback, commandCallback, controlCallback, accessibilityCallback, appearanceCallback;
113
	Callback drawItemCallback, itemDataCallback, itemNotificationCallback, itemCompareCallback, searchCallback, trayItemCallback;
117
	Callback drawItemCallback, itemDataCallback, itemNotificationCallback, itemCompareCallback, searchCallback, trayItemCallback;
114
	Callback hitTestCallback, keyboardCallback, menuCallback, mouseHoverCallback, helpCallback, observerCallback, sourceCallback;
118
	Callback hitTestCallback, keyboardCallback, menuCallback, mouseHoverCallback, helpCallback, observerCallback, sourceCallback;
115
	Callback mouseCallback, trackingCallback, windowCallback, colorCallback, textInputCallback, releaseCallback, coreEventCallback, pollingCallback;
119
	Callback mouseCallback, trackingCallback, windowCallback, colorCallback, textInputCallback, releaseCallback, coreEventCallback;
120
	Callback pollingCallback, launcherCallback;
116
	int actionProc, appleEventProc, clockProc, commandProc, controlProc, appearanceProc, accessibilityProc;
121
	int actionProc, appleEventProc, clockProc, commandProc, controlProc, appearanceProc, accessibilityProc;
117
	int drawItemProc, itemDataProc, itemNotificationProc, itemCompareProc, helpProc, searchProc, trayItemProc;
122
	int drawItemProc, itemDataProc, itemNotificationProc, itemCompareProc, helpProc, searchProc, trayItemProc;
118
	int hitTestProc, keyboardProc, menuProc, mouseHoverProc, observerProc, sourceProc;
123
	int hitTestProc, keyboardProc, menuProc, mouseHoverProc, observerProc, sourceProc, launcherProc;
119
	int mouseProc, trackingProc, windowProc, colorProc, textInputProc, releaseProc, coreEventProc, pollingProc;
124
	int mouseProc, trackingProc, windowProc, colorProc, textInputProc, releaseProc, coreEventProc, pollingProc;
120
	EventTable eventTable, filterTable;
125
	EventTable eventTable, filterTable;
121
	int queue, runLoop, runLoopSource, runLoopObserver, lastModifiers, lastState, lastX, lastY;
126
	int queue, runLoop, runLoopSource, runLoopObserver, lastModifiers, lastState, lastX, lastY;
Lines 900-920 Link Here
900
}
905
}
901
906
902
int coreEventProc (int theAppleEvent, int reply, int handlerRefcon) {
907
int coreEventProc (int theAppleEvent, int reply, int handlerRefcon) {
903
	if (!disposing) {
908
	switch(handlerRefcon) {
904
		Event event = new Event ();
909
		case OS.kAEOpenDocuments:
905
		sendEvent (SWT.Close, event);
910
			AEDesc docList = new AEDesc();
906
		if (event.doit) {
911
			int[] count = new int[1];
907
			dispose ();
912
		    OS.AEGetParamDesc(theAppleEvent, OS.keyDirectObject, OS.typeAEList, docList);
908
			/*
913
			OS.AECountItems(docList, count);
909
			* When the application is closing, no SWT program can continue
914
			for(int index = 1; index <= count[0]; index++) {
910
			* to run.  In order to avoid running code after the display has
915
				int [] theAEKeyword = new int [1];
911
			* been disposed, exit from Java.
916
				int [] typeCode = new int [1];
912
			*/
917
				int maximumSize = 80; // size of FSRef
913
			/* This code is intentionally commented */
918
				int dataPtr = OS.NewPtr (maximumSize);
914
//			System.exit (0);
919
				int [] actualSize = new int [1];
915
		} else {
920
				int status = OS.AEGetNthPtr (docList, 1, OS.typeFSRef, theAEKeyword, typeCode, dataPtr, maximumSize, actualSize);
916
			return OS.userCanceledErr;
921
				if (status == OS.noErr && typeCode [0] == OS.typeFSRef) {
917
		}
922
					byte [] fsRef = new byte [actualSize [0]];
923
					OS.memmove (fsRef, dataPtr, actualSize [0]);
924
					int dirUrl = OS.CFURLCreateFromFSRef (OS.kCFAllocatorDefault, fsRef);
925
					int dirString = OS.CFURLCopyFileSystemPath(dirUrl, OS.kCFURLPOSIXPathStyle);
926
					OS.CFRelease (dirUrl);						
927
					int length = OS.CFStringGetLength (dirString);
928
					char [] buffer= new char [length];
929
					CFRange range = new CFRange ();
930
					range.length = length;
931
					OS.CFStringGetCharacters (dirString, range, buffer);
932
					String string = new String(buffer);
933
					
934
					System.out.println("open the document: "+string);
935
					Event event = new Event();
936
					event.type = SWT.OpenDoc;
937
					event.text = string;
938
					postEvent(event);
939
				}
940
				OS.DisposePtr (dataPtr);
941
		    }
942
		    OS.AEDisposeDesc(docList);
943
			break;
944
		case OS.kAEQuitApplication:
945
			if (!disposing) {
946
				Event event = new Event ();
947
				sendEvent (SWT.Close, event);
948
				if (event.doit) {
949
					dispose ();
950
					/*
951
					* When the application is closing, no SWT program can continue
952
					* to run.  In order to avoid running code after the display has
953
					* been disposed, exit from Java.
954
					*/
955
					/* This code is intentionally commented */
956
		//			System.exit (0);
957
				} else {
958
					return OS.userCanceledErr;
959
				}
960
			}
961
			break;
918
	}
962
	}
919
	return OS.noErr;
963
	return OS.noErr;
920
}
964
}
Lines 2209-2214 Link Here
2209
	pollingCallback = new Callback (this, "pollingProc", 2);
2253
	pollingCallback = new Callback (this, "pollingProc", 2);
2210
	pollingProc = pollingCallback.getAddress ();
2254
	pollingProc = pollingCallback.getAddress ();
2211
	if (pollingProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
2255
	if (pollingProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
2256
	launcherCallback = new Callback (this, "launcherProc", 3);
2257
	launcherProc = launcherCallback.getAddress ();
2258
	if (launcherProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
2212
2259
2213
	/* Install Event Handlers */
2260
	/* Install Event Handlers */
2214
	int[] mask1 = new int[] {
2261
	int[] mask1 = new int[] {
Lines 2231-2237 Link Here
2231
		OS.kEventClassAppleEvent, OS.kEventAppleEvent,
2278
		OS.kEventClassAppleEvent, OS.kEventAppleEvent,
2232
	};
2279
	};
2233
	OS.InstallEventHandler (appTarget, appleEventProc, mask3.length / 2, mask3, 0, null);
2280
	OS.InstallEventHandler (appTarget, appleEventProc, mask3.length / 2, mask3, 0, null);
2234
	OS.AEInstallEventHandler(OS.kCoreEventClass, OS.kAEQuitApplication, coreEventProc, 0, false);
2281
	OS.AEInstallEventHandler(OS.kCoreEventClass, OS.kAEQuitApplication, coreEventProc, OS.kAEQuitApplication, false);
2235
2282
2236
	int [] mask4 = new int[] {
2283
	int [] mask4 = new int[] {
2237
		OS.kEventClassKeyboard, OS.kEventRawKeyDown,
2284
		OS.kEventClassKeyboard, OS.kEventRawKeyDown,
Lines 2253-2259 Link Here
2253
	OS.AEInstallEventHandler (OS.kAppearanceEventClass, OS.kAESmallSystemFontChanged, appearanceProc, 0, false);
2300
	OS.AEInstallEventHandler (OS.kAppearanceEventClass, OS.kAESmallSystemFontChanged, appearanceProc, 0, false);
2254
	OS.AEInstallEventHandler (OS.kAppearanceEventClass, OS.kAESystemFontChanged, appearanceProc, 0, false);
2301
	OS.AEInstallEventHandler (OS.kAppearanceEventClass, OS.kAESystemFontChanged, appearanceProc, 0, false);
2255
	OS.AEInstallEventHandler (OS.kAppearanceEventClass, OS.kAEViewsFontChanged, appearanceProc, 0, false);
2302
	OS.AEInstallEventHandler (OS.kAppearanceEventClass, OS.kAEViewsFontChanged, appearanceProc, 0, false);
2256
2303
	
2304
	int[] mask6 = new int[] {
2305
			SWT_CLASS, SWT_OPEN_FILE_KIND,
2306
		};
2307
	OS.InstallEventHandler (appTarget, launcherProc, mask6.length / 2, mask6, 0, null);
2308
	OS.AEInstallEventHandler(OS.kCoreEventClass, OS.kAEOpenDocuments, coreEventProc, OS.kAEOpenDocuments, false);
2309
	
2257
	int mode = OS.kCFRunLoopCommonModes ();
2310
	int mode = OS.kCFRunLoopCommonModes ();
2258
	int activities = OS.kCFRunLoopBeforeWaiting;
2311
	int activities = OS.kCFRunLoopBeforeWaiting;
2259
	runLoopObserver = OS.CFRunLoopObserverCreate (OS.kCFAllocatorDefault, activities, true, 0, observerProc, 0);
2312
	runLoopObserver = OS.CFRunLoopObserverCreate (OS.kCFAllocatorDefault, activities, true, 0, observerProc, 0);
Lines 2477-2482 Link Here
2477
	return 0;
2530
	return 0;
2478
}
2531
}
2479
2532
2533
int launcherProc (int nextHandler, int theEvent, int userData) {
2534
	int [] stringRef = new int [1];
2535
	OS.GetEventParameter (theEvent, SWT_OPEN_FILE_PARAM, OS.typeCFStringRef, null, 4, null, stringRef);
2536
	int length = 0;
2537
	if (stringRef [0] != 0) length = OS.CFStringGetLength (stringRef [0]);
2538
	char [] buffer= new char [length];
2539
	CFRange range = new CFRange ();
2540
	range.length = length;
2541
	OS.CFStringGetCharacters (stringRef [0], range, buffer);
2542
	String filePath = new String(buffer);
2543
	
2544
	System.out.println("Posting OpenDoc event for " + filePath);
2545
	Event event = new Event();
2546
	event.type = SWT.OpenDoc;
2547
	event.text = filePath;
2548
	postEvent(event);
2549
	
2550
	return OS.noErr;
2551
}
2480
/**
2552
/**
2481
 * Generate a low level system event.
2553
 * Generate a low level system event.
2482
 * 
2554
 * 
(-)Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java (-3 / +60 lines)
Lines 165-171 Link Here
165
	// the following Callbacks are never freed
165
	// the following Callbacks are never freed
166
	static Callback windowCallback2, windowCallback3, windowCallback4, windowCallback5, windowCallback6;
166
	static Callback windowCallback2, windowCallback3, windowCallback4, windowCallback5, windowCallback6;
167
	static Callback dialogCallback3, dialogCallback4, dialogCallback5;
167
	static Callback dialogCallback3, dialogCallback4, dialogCallback5;
168
	static Callback applicationCallback2, applicationCallback3, applicationCallback6;
168
	static Callback applicationCallback2, applicationCallback3, applicationCallback4, applicationCallback6;
169
	
169
	
170
	/* Display Shutdown */
170
	/* Display Shutdown */
171
	Runnable [] disposeList;
171
	Runnable [] disposeList;
Lines 840-845 Link Here
840
		applicationCallback3 = new Callback(clazz, "applicationProc", 3);
840
		applicationCallback3 = new Callback(clazz, "applicationProc", 3);
841
		int /*long*/ proc3 = applicationCallback3.getAddress();
841
		int /*long*/ proc3 = applicationCallback3.getAddress();
842
		if (proc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
842
		if (proc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
843
		applicationCallback4 = new Callback(clazz, "applicationProc", 4);
844
		int /*long*/ proc4 = applicationCallback4.getAddress();
845
		if (proc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
843
		applicationCallback6 = new Callback(clazz, "applicationProc", 6);
846
		applicationCallback6 = new Callback(clazz, "applicationProc", 6);
844
		int /*long*/ proc6 = applicationCallback6.getAddress();
847
		int /*long*/ proc6 = applicationCallback6.getAddress();
845
		if (proc6 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
848
		if (proc6 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
Lines 857-862 Link Here
857
		int /*long*/ appProc3 = applicationCallback3.getAddress();
860
		int /*long*/ appProc3 = applicationCallback3.getAddress();
858
		if (appProc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
861
		if (appProc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
859
		cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
862
		cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
863
		int /*long*/ appProc4 = applicationCallback4.getAddress();
864
		if (appProc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
865
		cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
860
		OS.class_addMethod(cls, OS.sel_applicationWillFinishLaunching_, appProc3, "@:@");
866
		OS.class_addMethod(cls, OS.sel_applicationWillFinishLaunching_, appProc3, "@:@");
861
		OS.class_addMethod(cls, OS.sel_terminate_, appProc3, "@:@");
867
		OS.class_addMethod(cls, OS.sel_terminate_, appProc3, "@:@");
862
		OS.class_addMethod(cls, OS.sel_quitRequested_, appProc3, "@:@");
868
		OS.class_addMethod(cls, OS.sel_quitRequested_, appProc3, "@:@");
Lines 866-876 Link Here
866
		OS.class_addMethod(cls, OS.sel_unhideAllApplications_, appProc3, "@:@");
872
		OS.class_addMethod(cls, OS.sel_unhideAllApplications_, appProc3, "@:@");
867
		OS.class_addMethod(cls, OS.sel_applicationDidBecomeActive_, appProc3, "@:@");
873
		OS.class_addMethod(cls, OS.sel_applicationDidBecomeActive_, appProc3, "@:@");
868
		OS.class_addMethod(cls, OS.sel_applicationDidResignActive_, appProc3, "@:@");
874
		OS.class_addMethod(cls, OS.sel_applicationDidResignActive_, appProc3, "@:@");
875
		OS.class_addMethod(cls, OS.sel_application_openFile_, appProc4, "@:@B");
876
		OS.class_addMethod(cls, OS.sel_application_openFiles_, appProc4, "@:@@");
877
		OS.class_addMethod(cls, OS.sel_applicationShouldHandleReopen_hasVisibleWindows_, appProc4, "@:@B");
869
		OS.objc_registerClassPair(cls);
878
		OS.objc_registerClassPair(cls);
870
	}
879
	}
871
	if (!isEmbedded) {
880
	if (!isEmbedded) {
872
		if (applicationDelegate == null) {
881
		if (applicationDelegate == null) {
873
			applicationDelegate = (SWTApplicationDelegate)new SWTApplicationDelegate().alloc().init();
882
			applicationDelegate = (SWTApplicationDelegate)new SWTApplicationDelegate().alloc().init();
883
			System.out.println("delegate set");
874
			application.setDelegate(applicationDelegate);
884
			application.setDelegate(applicationDelegate);
875
		}
885
		}
876
	}
886
	}
Lines 878-885 Link Here
878
	int[] bufferMode = new int[1], bufferOptions = new int[1];
888
	int[] bufferMode = new int[1], bufferOptions = new int[1];
879
	OS.GetSystemUIMode(bufferMode, bufferOptions);
889
	OS.GetSystemUIMode(bufferMode, bufferOptions);
880
	systemUIMode = bufferMode[0];
890
	systemUIMode = bufferMode[0];
881
	systemUIOptions = bufferOptions[0];	
891
	systemUIOptions = bufferOptions[0];
882
}
892
	
893
894
//	Callback openDocCallback = new Callback (this, "handleOpenDocument", 4); //$NON-NLS-1$
895
//	int /*long*/ openDocProc = openDocCallback.getAddress ();
896
//	if (openDocProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
897
//	int /*long*/ sel_openDocuments = OS.sel_registerName("handleOpenDocuments:withReplyEvent:");
898
//	
899
//	className = "AppleEventDelegate";
900
//	if (OS.objc_lookUpClass (className) == 0) {
901
//		cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
902
//		OS.class_addMethod(cls, sel_openDocuments, openDocProc, "@:@@");
903
//	
904
//	}
905
//
906
//	NSObject appleEventDelegate = new AppleEventDelegate().alloc().init().autorelease();
907
//	NSAppleEventManager manager = NSAppleEventManager.sharedAppleEventManager();
908
//	int kCoreEventClass = ('a'<<24) + ('e'<<16) + ('v'<<8) + 't';
909
//	int kAEOpenDocuments = ('o'<<24) + ('d'<<16) + ('o'<<8) + 'c';
910
//	manager.setEventHandler(appleEventDelegate, sel_openDocuments, kCoreEventClass, kAEOpenDocuments);
911
}
912
//
913
//int handleOpenDocument(int /*long*/ id, int /*long*/ sel, int /*long*/ event, int /*long*/ replyEvent) {
914
//	System.out.println("ODOCODOCODOCODOCODOCODOCODOCODOCODOCODOCODOCODOCODOC!!!!!");
915
//	return 0;
916
//}
883
917
884
void createMainMenu () {
918
void createMainMenu () {
885
	NSString appName = getAppName();
919
	NSString appName = getAppName();
Lines 4458-4463 Link Here
4458
}
4492
}
4459
4493
4460
void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
4494
void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
4495
	System.out.println("application will finish launching");
4461
	boolean loaded = false;
4496
	boolean loaded = false;
4462
	NSBundle bundle = NSBundle.bundleWithIdentifier(NSString.stringWith("com.apple.JavaVM"));
4497
	NSBundle bundle = NSBundle.bundleWithIdentifier(NSString.stringWith("com.apple.JavaVM"));
4463
	NSDictionary dict = NSDictionary.dictionaryWithObject(applicationDelegate, NSString.stringWith("NSOwner"));
4498
	NSDictionary dict = NSDictionary.dictionaryWithObject(applicationDelegate, NSString.stringWith("NSOwner"));
Lines 4558-4563 Link Here
4558
	return 0;
4593
	return 0;
4559
}
4594
}
4560
4595
4596
static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
4597
	if (sel == OS.sel_application_openFile_) {
4598
		System.out.println("open file: " + new NSString(arg1).getString());
4599
		return 1;
4600
	}
4601
	else if (sel == OS.sel_application_openFiles_) {
4602
		System.out.println("open files:");
4603
		NSArray files = new NSArray(arg1);
4604
		int /*long*/ count = files.count();
4605
		for (int i=0; i<count; i++) {
4606
			NSString file = new NSString(files.objectAtIndex(i));
4607
			System.out.println("\t"+file.getString());
4608
		}
4609
		new NSApplication(arg0).replyToOpenOrPrint(OS.NSApplicationDelegateReplySuccess);
4610
	} 
4611
	else if (sel == OS.sel_applicationShouldHandleReopen_hasVisibleWindows_) {
4612
		System.out.println("should reopen");
4613
		return 1;
4614
	}
4615
	return 0;
4616
}
4617
4561
static int /*long*/ applicationProc(int /*long*/ id, int /*long*/sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
4618
static int /*long*/ applicationProc(int /*long*/ id, int /*long*/sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
4562
	//TODO optimize getting the display
4619
	//TODO optimize getting the display
4563
	Display display = getCurrent ();
4620
	Display display = getCurrent ();
(-)Eclipse SWT/common/org/eclipse/swt/SWT.java (+10 lines)
Lines 700-705 Link Here
700
	 */
700
	 */
701
	public static final int Skin = 45;
701
	public static final int Skin = 45;
702
	
702
	
703
	/**
704
	 * The open file event type (value is 46).
705
	 * 
706
	 * <p>
707
	 * This event is sent when SWT receives notification that a file 
708
	 * should be opened.
709
	 * </p>
710
	 */
711
	public static final int OpenDoc = 46;
712
	
703
	/* Event Details */
713
	/* Event Details */
704
	
714
	
705
	/**
715
	/**
(-)Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java (-10 / +65 lines)
Lines 235-244 Link Here
235
	Callback allChildrenCallback;
235
	Callback allChildrenCallback;
236
236
237
	/* Settings callbacks */
237
	/* Settings callbacks */
238
	int /*long*/ styleSetProc;
238
	int /*long*/ signalProc;
239
	Callback styleSetCallback;
239
	Callback signalCallback;
240
	int /*long*/ shellHandle;
240
	int /*long*/ shellHandle;
241
	boolean settingsChanged, runSettings;
241
	boolean settingsChanged, runSettings;
242
	static final int STYLE_SET = 1;
243
	static final int PROPERTY_NOTIFY = 2;
242
	
244
	
243
	/* Entry focus behaviour */
245
	/* Entry focus behaviour */
244
	boolean entrySelectOnFocus;
246
	boolean entrySelectOnFocus;
Lines 988-993 Link Here
988
	if (shellHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
990
	if (shellHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
989
	OS.gtk_widget_realize (shellHandle);
991
	OS.gtk_widget_realize (shellHandle);
990
992
993
	
991
	/* Initialize the filter and event callback */
994
	/* Initialize the filter and event callback */
992
	eventCallback = new Callback (this, "eventProc", 2); //$NON-NLS-1$
995
	eventCallback = new Callback (this, "eventProc", 2); //$NON-NLS-1$
993
	eventProc = eventCallback.getAddress ();
996
	eventProc = eventCallback.getAddress ();
Lines 997-1002 Link Here
997
	filterProc = filterCallback.getAddress ();
1000
	filterProc = filterCallback.getAddress ();
998
	if (filterProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
1001
	if (filterProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
999
	OS.gdk_window_add_filter  (0, filterProc, 0);
1002
	OS.gdk_window_add_filter  (0, filterProc, 0);
1003
1004
	System.out.println("Creating atom: " + "SWT_Window_"+APP_NAME);
1005
	int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(shellHandle));
1006
	byte[] atomName = Converter.wcsToMbcs(null, "SWT_Window_" + APP_NAME, true); //$NON-NLS-1$
1007
	int /*long*/ atom = OS.XInternAtom(OS.GDK_DISPLAY(), atomName, false);
1008
	OS.XSetSelectionOwner(OS.GDK_DISPLAY(), atom, xWindow, OS.CurrentTime);
1009
	OS.XGetSelectionOwner(OS.GDK_DISPLAY(), atom);
1010
1011
	signalCallback = new Callback (this, "signalProc", 3); //$NON-NLS-1$
1012
	signalProc = signalCallback.getAddress ();
1013
	if (signalProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
1014
	OS.gtk_widget_add_events (shellHandle, OS.GDK_PROPERTY_CHANGE_MASK);
1015
	OS.g_signal_connect (shellHandle, OS.property_notify_event, signalProc, PROPERTY_NOTIFY);
1000
}
1016
}
1001
1017
1002
Image createImage (String name) {
1018
Image createImage (String name) {
Lines 2566-2575 Link Here
2566
}
2582
}
2567
2583
2568
void initializeSystemSettings () {
2584
void initializeSystemSettings () {
2569
	styleSetCallback = new Callback (this, "styleSetProc", 3); //$NON-NLS-1$
2585
	OS.g_signal_connect (shellHandle, OS.style_set, signalProc, STYLE_SET);
2570
	styleSetProc = styleSetCallback.getAddress ();
2571
	if (styleSetProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
2572
	OS.g_signal_connect (shellHandle, OS.style_set, styleSetProc, 0);
2573
	
2586
	
2574
	/*
2587
	/*
2575
	* Feature in GTK.  Despite the fact that the
2588
	* Feature in GTK.  Despite the fact that the
Lines 3332-3339 Link Here
3332
	shellHandle = 0;
3345
	shellHandle = 0;
3333
	
3346
	
3334
	/* Dispose the settings callback */
3347
	/* Dispose the settings callback */
3335
	styleSetCallback.dispose(); styleSetCallback = null;
3348
	signalCallback.dispose(); signalCallback = null;
3336
	styleSetProc = 0;
3349
	signalProc = 0;
3337
3350
3338
	/* Dispose subclass */
3351
	/* Dispose subclass */
3339
	if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
3352
	if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
Lines 4128-4135 Link Here
4128
	return widget.shellMapProc (handle, arg0, user_data);
4141
	return widget.shellMapProc (handle, arg0, user_data);
4129
}
4142
}
4130
4143
4131
int /*long*/ styleSetProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ user_data) {
4144
int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ user_data) {
4132
	settingsChanged = true;
4145
	switch(user_data) {
4146
	case STYLE_SET:
4147
		settingsChanged = true;
4148
		break;
4149
	case PROPERTY_NOTIFY:
4150
		GdkEventProperty gdkEvent = new GdkEventProperty();
4151
		OS.memmove(gdkEvent, arg1);
4152
		if (gdkEvent.type == OS.GDK_PROPERTY_NOTIFY) {
4153
			byte[] name = Converter.wcsToMbcs (null, "org.eclipse.swt.filePath.message", true); //$NON-NLS-1$
4154
			int /*long*/ atom = OS.gdk_x11_atom_to_xatom(OS.gdk_atom_intern (name, true));
4155
			if (atom == OS.gdk_x11_atom_to_xatom(gdkEvent.atom)) {
4156
				int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(shellHandle));
4157
				int /*long*/ [] type = new int /*long*/ [1];
4158
				int /*long*/ [] format = new int /*long*/ [1];
4159
				long [] nitems = new long [1];
4160
				long [] bytes_after = new long [1];
4161
				int /*long*/ [] data = new int /*long*/ [1];
4162
				OS.XGetWindowProperty(OS.GDK_DISPLAY(), xWindow, atom, 0l, -1l, true, OS.AnyPropertyType,
4163
						type, format, nitems, bytes_after, data);
4164
				
4165
				if (nitems[0] > 0) {
4166
					byte[] buffer = new byte[(int)/*64*/nitems[0]];
4167
					OS.memmove(buffer, data[0], buffer.length);
4168
					OS.XFree(data[0]);
4169
					char[] chars = Converter.mbcsToWcs(null, buffer);
4170
					String string = new String(chars);
4171
					int lastIndex = 0;
4172
					int index = string.indexOf(':');
4173
					while (index != -1) {
4174
						String file = string.substring(lastIndex, index);
4175
						Event event = new Event();
4176
						event.type = SWT.OpenFile;
4177
						event.text = file;
4178
						postEvent(event);
4179
						lastIndex = index+1;
4180
						index = string.indexOf(':', lastIndex);
4181
					}
4182
				}
4183
			}
4184
			
4185
		}
4186
		break;
4187
	}
4133
	return 0;
4188
	return 0;
4134
}
4189
}
4135
4190
(-)Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java (-3 / +43 lines)
Lines 109-121 Link Here
109
	 */
109
	 */
110
	public MSG msg = new MSG ();
110
	public MSG msg = new MSG ();
111
	
111
	
112
	static String APP_NAME;
113
	
112
	/* Windows and Events */
114
	/* Windows and Events */
113
	Event [] eventQueue;
115
	Event [] eventQueue;
114
	Callback windowCallback;
116
	Callback windowCallback;
115
	int /*long*/ windowProc;
117
	int /*long*/ windowProc;
116
	int threadId;
118
	int threadId;
117
	TCHAR windowClass, windowShadowClass, windowOwnDCClass;
119
	TCHAR windowClass, windowShadowClass, windowOwnDCClass;
118
	static int WindowClassCount;
120
	static int WindowClassCount = 1000;
119
	static final String WindowName = "SWT_Window"; //$NON-NLS-1$
121
	static final String WindowName = "SWT_Window"; //$NON-NLS-1$
120
	static final String WindowShadowName = "SWT_WindowShadow"; //$NON-NLS-1$
122
	static final String WindowShadowName = "SWT_WindowShadow"; //$NON-NLS-1$
121
	static final String WindowOwnDCName = "SWT_WindowOwnDC"; //$NON-NLS-1$
123
	static final String WindowOwnDCName = "SWT_WindowOwnDC"; //$NON-NLS-1$
Lines 389-394 Link Here
389
	static int SWT_TASKBARCREATED;
391
	static int SWT_TASKBARCREATED;
390
	static int SWT_RESTORECARET;
392
	static int SWT_RESTORECARET;
391
	static int DI_GETDRAGIMAGE;
393
	static int DI_GETDRAGIMAGE;
394
	static int SWT_FILEOPEN;
392
	
395
	
393
	/* Workaround for Adobe Reader 7.0 */
396
	/* Workaround for Adobe Reader 7.0 */
394
	int hitCount;
397
	int hitCount;
Lines 2569-2575 Link Here
2569
	windowShadowClass = new TCHAR (0, WindowShadowName + WindowClassCount, true);
2572
	windowShadowClass = new TCHAR (0, WindowShadowName + WindowClassCount, true);
2570
	windowOwnDCClass = new TCHAR (0, WindowOwnDCName + WindowClassCount, true);
2573
	windowOwnDCClass = new TCHAR (0, WindowOwnDCName + WindowClassCount, true);
2571
	WindowClassCount++;
2574
	WindowClassCount++;
2572
2575
	
2573
	/* Register the SWT window class */
2576
	/* Register the SWT window class */
2574
	int /*long*/ hHeap = OS.GetProcessHeap ();
2577
	int /*long*/ hHeap = OS.GetProcessHeap ();
2575
	int /*long*/ hInstance = OS.GetModuleHandle (null);
2578
	int /*long*/ hInstance = OS.GetModuleHandle (null);
Lines 2632-2637 Link Here
2632
		0,
2635
		0,
2633
		hInstance,
2636
		hInstance,
2634
		null);
2637
		null);
2638
	String title = "SWT_Window_"+APP_NAME;
2639
	OS.SetWindowText(hwndMessage, new TCHAR(0, title, true));
2635
	messageCallback = new Callback (this, "messageProc", 4); //$NON-NLS-1$
2640
	messageCallback = new Callback (this, "messageProc", 4); //$NON-NLS-1$
2636
	messageProc = messageCallback.getAddress ();
2641
	messageProc = messageCallback.getAddress ();
2637
	if (messageProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
2642
	if (messageProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
Lines 2657-2662 Link Here
2657
	SWT_TASKBARCREATED = OS.RegisterWindowMessage (new TCHAR (0, "TaskbarCreated", true)); //$NON-NLS-1$
2662
	SWT_TASKBARCREATED = OS.RegisterWindowMessage (new TCHAR (0, "TaskbarCreated", true)); //$NON-NLS-1$
2658
	SWT_RESTORECARET = OS.RegisterWindowMessage (new TCHAR (0, "SWT_RESTORECARET", true)); //$NON-NLS-1$
2663
	SWT_RESTORECARET = OS.RegisterWindowMessage (new TCHAR (0, "SWT_RESTORECARET", true)); //$NON-NLS-1$
2659
	DI_GETDRAGIMAGE = OS.RegisterWindowMessage (new TCHAR (0, "ShellGetDragImage", true)); //$NON-NLS-1$
2664
	DI_GETDRAGIMAGE = OS.RegisterWindowMessage (new TCHAR (0, "ShellGetDragImage", true)); //$NON-NLS-1$
2665
	SWT_FILEOPEN = OS.RegisterWindowMessage(new TCHAR (0, "SWT_FILEOPEN", true)); //$NON-NLS-1$
2660
2666
2661
	/* Initialize OLE */
2667
	/* Initialize OLE */
2662
	if (!OS.IsWinCE) OS.OleInitialize (0);
2668
	if (!OS.IsWinCE) OS.OleInitialize (0);
Lines 3195-3205 Link Here
3195
					}
3201
					}
3196
				}
3202
				}
3197
			}
3203
			}
3204
			if ((int)/*64*/msg == SWT_FILEOPEN) {
3205
				String filename = getSharedData((int)/*64*/wParam, (int)/*64*/lParam);
3206
				Event event = new Event();
3207
				event.type = SWT.OpenDoc;
3208
				event.text = filename;
3209
				postEvent(event);
3210
			}
3198
		}
3211
		}
3199
	}
3212
	}
3200
	return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam);
3213
	return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam);
3201
}
3214
}
3202
3215
3216
String getSharedData(int pid, int  handle) {
3217
	String id = Integer.toHexString(pid)+"_"+Integer.toHexString(handle);
3218
	System.out.println(id);
3219
	int /*long*/ [] mapHandle = new int /*long*/ [1];
3220
	if (pid == OS.GetCurrentProcessId()) {
3221
		mapHandle[0] = handle;
3222
	} else {
3223
		int /*long*/ processHandle = OS.OpenProcess(OS.PROCESS_VM_READ|OS.PROCESS_DUP_HANDLE, false, pid);
3224
		if (processHandle == 0) return null;
3225
		OS.DuplicateHandle(processHandle, handle, OS.GetCurrentProcess(), mapHandle, OS.DUPLICATE_SAME_ACCESS, false, OS.DUPLICATE_SAME_ACCESS);
3226
		OS.CloseHandle(processHandle);
3227
	}
3228
	
3229
	int /*long*/ sharedData = OS.MapViewOfFile(mapHandle[0], OS.FILE_MAP_READ, 0, 0, 0);
3230
	if (sharedData == 0) return null;
3231
	int length = OS.IsUnicode ? OS.wcslen (sharedData) : OS.strlen (sharedData);
3232
	TCHAR buffer = new TCHAR (0, length);
3233
	int byteCount = buffer.length () * TCHAR.sizeof;
3234
	OS.MoveMemory (buffer, sharedData, byteCount);
3235
	String result = buffer.toString (0, length);
3236
	OS.UnmapViewOfFile(sharedData);
3237
	if (handle != mapHandle[0]) {
3238
		OS.CloseHandle(mapHandle[0]);
3239
	}
3240
	return result;
3241
}
3242
3203
int /*long*/ monitorEnumProc (int /*long*/ hmonitor, int /*long*/ hdc, int /*long*/ lprcMonitor, int /*long*/ dwData) {
3243
int /*long*/ monitorEnumProc (int /*long*/ hmonitor, int /*long*/ hdc, int /*long*/ lprcMonitor, int /*long*/ dwData) {
3204
	if (monitorCount >= monitors.length) {
3244
	if (monitorCount >= monitors.length) {
3205
		Monitor[] newMonitors = new Monitor [monitors.length + 4];
3245
		Monitor[] newMonitors = new Monitor [monitors.length + 4];
Lines 4272-4278 Link Here
4272
 * @param name the new app name or <code>null</code>
4312
 * @param name the new app name or <code>null</code>
4273
 */
4313
 */
4274
public static void setAppName (String name) {
4314
public static void setAppName (String name) {
4275
	/* Do nothing */
4315
	APP_NAME = name;
4276
}
4316
}
4277
4317
4278
void setModalDialog (Dialog modalDailog) {
4318
void setModalDialog (Dialog modalDailog) {

Return to bug 201154