diff options
| author | Silenio Quarti | 2012-03-02 20:52:07 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-03-02 20:52:48 +0000 |
| commit | 54dc5876ac83acf5f902b4972f50eff3cc204b9a (patch) | |
| tree | ad2c3ccfc391f55409601e1c765189e51cfb1d98 | |
| parent | 82e34fcb485647da9f29a70265a4c5982c8c83e6 (diff) | |
| download | eclipse.platform.swt-54dc5876ac83acf5f902b4972f50eff3cc204b9a.tar.gz eclipse.platform.swt-54dc5876ac83acf5f902b4972f50eff3cc204b9a.tar.xz eclipse.platform.swt-54dc5876ac83acf5f902b4972f50eff3cc204b9a.zip | |
generating PI on 10.7
20 files changed, 429 insertions, 186 deletions
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java index 8e28e84345..f670c8fe64 100644 --- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java +++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java @@ -162,8 +162,19 @@ String fixDelimiter(String str) { String getParamName(Node param) { NamedNodeMap paramAttributes = param.getAttributes(); Node swtName = paramAttributes.getNamedItem("swt_param_name"); - String paramName = swtName != null ? swtName.getNodeValue() : paramAttributes.getNamedItem("name").getNodeValue(); - if (paramName.length() == 0) paramName = "arg" + paramAttributes.getNamedItem("index").getNodeValue(); + String paramName = ""; + if (swtName != null) { + paramName = swtName.getNodeValue(); + } else { + Node node = paramAttributes.getNamedItem("name"); + if (node != null) paramName = node.getNodeValue(); + } + if (paramName.length() == 0) { + Node node = paramAttributes.getNamedItem("index"); + String index = "0"; + if (node != null) index = node.getNodeValue(); + paramName = "arg" + index; + } if (paramName.equals("boolean")) paramName = "b"; return paramName; } @@ -875,12 +886,17 @@ void generateEnums() { if (value.indexOf('.') != -1) { out("double "); } else { - try { - Integer.parseInt(value); + if (value.equals("4294967295")) { out("int "); - } catch (NumberFormatException e) { - isLong = true; - out("long "); + value = "-1"; + } else { + try { + Integer.parseInt(value); + out("int "); + } catch (NumberFormatException e) { + isLong = true; + out("long "); + } } } out(attributes.getNamedItem("name").getNodeValue()); @@ -925,25 +941,33 @@ boolean isStatic(Node node) { boolean isStruct(Node node) { NamedNodeMap attributes = node.getAttributes(); - String code = attributes.getNamedItem("type").getNodeValue(); + Node type = attributes.getNamedItem("type"); + if (type == null) return false; + String code = type.getNodeValue(); return code.startsWith("{"); } boolean isFloatingPoint(Node node) { NamedNodeMap attributes = node.getAttributes(); - String code = attributes.getNamedItem("type").getNodeValue(); + Node type = attributes.getNamedItem("type"); + if (type == null) return false; + String code = type.getNodeValue(); return code.equals("f") || code.equals("d"); } boolean isObject(Node node) { NamedNodeMap attributes = node.getAttributes(); - String code = attributes.getNamedItem("type").getNodeValue(); + Node type = attributes.getNamedItem("type"); + if (type == null) return false; + String code = type.getNodeValue(); return code.equals("@"); } boolean isBoolean(Node node) { NamedNodeMap attributes = node.getAttributes(); - String code = attributes.getNamedItem("type").getNodeValue(); + Node type = attributes.getNamedItem("type"); + if (type == null) return false; + String code = type.getNodeValue(); return code.equals("B"); } @@ -1446,7 +1470,9 @@ String getType(Node node) { NamedNodeMap attributes = node.getAttributes(); Node javaType = attributes.getNamedItem("swt_java_type"); if (javaType != null) return javaType.getNodeValue(); - String code = attributes.getNamedItem("type").getNodeValue(); + Node type = attributes.getNamedItem("type"); + if (type == null) return "notype"; + String code = type.getNodeValue(); return getType(code, attributes, false); } @@ -1458,6 +1484,7 @@ String getType64(Node node) { return javaType64 != null ? javaType64.getNodeValue() : javaType.getNodeValue(); } Node attrib = attributes.getNamedItem("type"); + if (attrib == null) return "notype"; String code = attrib.getNodeValue(); Node attrib64 = attributes.getNamedItem("type64"); if (attrib64 != null) code = attrib64.getNodeValue(); @@ -1524,7 +1551,9 @@ String getJavaType(Node node) { NamedNodeMap attributes = node.getAttributes(); Node javaType = attributes.getNamedItem("swt_java_type"); if (javaType != null) return javaType.getNodeValue().trim(); - String code = attributes.getNamedItem("type").getNodeValue(); + Node type = attributes.getNamedItem("type"); + if (type == null) return "notype"; + String code = type.getNodeValue(); return getJavaType(code, attributes, false); } @@ -1536,6 +1565,7 @@ String getJavaType64(Node node) { return javaType64 != null ? javaType64.getNodeValue() : javaType.getNodeValue(); } Node attrib = attributes.getNamedItem("type"); + if (attrib == null) return "notype"; String code = attrib.getNodeValue(); Node attrib64 = attributes.getNamedItem("type64"); if (attrib64 != null) code = attrib64.getNodeValue(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c index f3fc72488d..f6594b5d75 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -1617,7 +1617,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBaseAddress) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, CGDisplayBaseAddress_FUNC); +/* rc = (jintLong)CGDisplayBaseAddress((CGDirectDisplayID)arg0); +*/ + { + OS_LOAD_FUNCTION(fp, CGDisplayBaseAddress) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); + } + } OS_NATIVE_EXIT(env, that, CGDisplayBaseAddress_FUNC); return rc; } @@ -1629,7 +1637,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBitsPerPixel) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, CGDisplayBitsPerPixel_FUNC); +/* rc = (jintLong)CGDisplayBitsPerPixel((CGDirectDisplayID)arg0); +*/ + { + OS_LOAD_FUNCTION(fp, CGDisplayBitsPerPixel) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); + } + } OS_NATIVE_EXIT(env, that, CGDisplayBitsPerPixel_FUNC); return rc; } @@ -1641,7 +1657,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBitsPerSample) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, CGDisplayBitsPerSample_FUNC); +/* rc = (jintLong)CGDisplayBitsPerSample((CGDirectDisplayID)arg0); +*/ + { + OS_LOAD_FUNCTION(fp, CGDisplayBitsPerSample) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); + } + } OS_NATIVE_EXIT(env, that, CGDisplayBitsPerSample_FUNC); return rc; } @@ -1653,7 +1677,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBytesPerRow) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, CGDisplayBytesPerRow_FUNC); +/* rc = (jintLong)CGDisplayBytesPerRow((CGDirectDisplayID)arg0); +*/ + { + OS_LOAD_FUNCTION(fp, CGDisplayBytesPerRow) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); + } + } OS_NATIVE_EXIT(env, that, CGDisplayBytesPerRow_FUNC); return rc; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.h index 19f5112bed..0fc3306115 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.h @@ -66,3 +66,7 @@ #define PMSetDuplex_LIB "com.apple.ApplicationServices" #define HIWindowFindAtLocation_LIB "com.apple.Carbon" #define HIWindowGetCGWindowID_LIB "com.apple.Carbon" +#define CGDisplayBaseAddress_LIB "com.apple.ApplicationServices" +#define CGDisplayBitsPerPixel_LIB "com.apple.ApplicationServices" +#define CGDisplayBitsPerSample_LIB "com.apple.ApplicationServices" +#define CGDisplayBytesPerRow_LIB "com.apple.ApplicationServices" diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras index 9ad591e3c8..91bea9339a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras @@ -22,52 +22,9 @@ <method selector="concat" swt_gen="true"> <retval swt_gen="true"></retval> </method> - <method selector="initWithTransform:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true" swt_java_type="NSAffineTransform"></retval> - </method> - <method selector="invert" swt_gen="true"> - <retval swt_gen="true"></retval> - </method> - <method selector="prependTransform:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> - <method selector="rotateByDegrees:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> - <method selector="scaleXBy:yBy:" swt_gen="true"> - <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> <method selector="set" swt_gen="true"> <retval swt_gen="true"></retval> </method> - <method selector="setTransformStruct:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> - <method class_method="true" selector="transform" swt_gen="true"> - <retval swt_gen="true"></retval> - </method> - <method selector="transformPoint:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> - <method selector="transformSize:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> - <method selector="transformStruct" swt_gen="true"> - <retval swt_gen="true"></retval> - </method> - <method selector="translateXBy:yBy:" swt_gen="true"> - <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> </class> <class name="NSAlert" swt_gen="mixed"> <method selector="addButtonWithTitle:" swt_gen="true"> @@ -239,12 +196,6 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> - <method selector="attributesAtIndex:longestEffectiveRange:inRange:" swt_gen="true"> - <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> <method selector="boundingRectWithSize:options:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> @@ -262,11 +213,6 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> - <method selector="initWithString:attributes:" swt_gen="true"> - <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> - <retval swt_gen="true" swt_java_type="NSAttributedString"></retval> - </method> <method selector="nextWordFromIndex:forward:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> @@ -1473,18 +1419,18 @@ <method selector="isFlipped" swt_gen="true"> <retval swt_gen="true"></retval> </method> - <method selector="restoreGraphicsState" swt_gen="true"> - <retval swt_gen="true"></retval> - </method> <method class_method="true" selector="restoreGraphicsState" swt_gen="true"> <retval swt_gen="true"></retval> </method> - <method selector="saveGraphicsState" swt_gen="true"> + <method selector="restoreGraphicsState" swt_gen="true"> <retval swt_gen="true"></retval> </method> <method class_method="true" selector="saveGraphicsState" swt_gen="true"> <retval swt_gen="true"></retval> </method> + <method selector="saveGraphicsState" swt_gen="true"> + <retval swt_gen="true"></retval> + </method> <method selector="setCompositingOperation:" swt_gen="true"> <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> @@ -1964,18 +1910,6 @@ <class name="NSMenuItemCell" swt_superclass="NSButtonCell"> </class> <class name="NSMutableAttributedString" swt_gen="mixed" swt_superclass="NSAttributedString"> - <method selector="appendAttributedString:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> - <method selector="mutableString" swt_gen="true"> - <retval swt_gen="true"></retval> - </method> - <method selector="replaceCharactersInRange:withString:" swt_gen="true"> - <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> <method selector="setBaseWritingDirection:range:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> @@ -3392,7 +3326,7 @@ <retval swt_gen="true"></retval> </method> <method selector="setGridStyleMask:" swt_gen="true"> - <arg swt_gen="true"></arg> + <arg swt_gen="true" swt_param_name="gridStyle"></arg> <retval swt_gen="true"></retval> </method> <method selector="setHeaderView:" swt_gen="true"> @@ -4929,11 +4863,13 @@ <function name="NSAccessibilityPostNotification" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="NSAccessibilityRaiseBadArgumentException" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="NSAccessibilityRoleDescription" swt_gen="true"> <arg swt_gen="true"></arg> @@ -4960,7 +4896,9 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </function> - <function name="NSBeep" swt_gen="true"></function> + <function name="NSBeep" swt_gen="true"> + <retval></retval> + </function> <function name="NSBitsPerPixelFromDepth" swt_gen="true"> <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> @@ -4969,9 +4907,11 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="NSCountWindows" swt_gen="true"> <arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg> + <retval></retval> </function> <function name="NSNumberOfColorComponents" swt_gen="true"> <arg swt_gen="true"></arg> @@ -4980,65 +4920,90 @@ <function name="NSRectFillUsingOperation" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="NSWindowList" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg> + <retval></retval> </function> <informal_protocol name="NSAccessibility" swt_gen="true"> <method selector="accessibilityActionDescription:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="accessibilityActionNames" swt_gen="true"> + <retval></retval> + </method> + <method selector="accessibilityAttributeNames" swt_gen="true"> + <retval></retval> </method> - <method selector="accessibilityActionNames" swt_gen="true"></method> - <method selector="accessibilityAttributeNames" swt_gen="true"></method> <method selector="accessibilityAttributeValue:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="accessibilityAttributeValue:forParameter:" swt_gen="true" swt_gen_super_msgSend="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="accessibilityFocusedUIElement" swt_gen="true"> + <retval></retval> </method> - <method selector="accessibilityFocusedUIElement" swt_gen="true"></method> <method selector="accessibilityHitTest:" swt_gen="true" swt_gen_custom_callback="true" swt_gen_super_msgSend="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="accessibilityIsAttributeSettable:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="accessibilityIsIgnored" swt_gen="true"> + <retval></retval> + </method> + <method selector="accessibilityParameterizedAttributeNames" swt_gen="true"> + <retval></retval> </method> - <method selector="accessibilityIsIgnored" swt_gen="true"></method> - <method selector="accessibilityParameterizedAttributeNames" swt_gen="true"></method> <method selector="accessibilityPerformAction:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="accessibilitySetValue:forAttribute:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSAccessibilityAdditions" swt_gen="true"> <method selector="accessibilitySetOverrideValue:forAttribute:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSApplicationDelegate" swt_gen="mixed"> <method selector="application:openFile:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="application:openFiles:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="applicationDockMenu:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="applicationShouldHandleReopen:hasVisibleWindows:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="applicationShouldTerminate:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSApplicationNotifications" swt_gen="mixed"> @@ -5061,6 +5026,7 @@ <informal_protocol name="NSColorPanelResponderMethod" swt_gen="true"> <method selector="changeColor:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSComboBoxNotifications" swt_gen="mixed"> @@ -5077,20 +5043,27 @@ <informal_protocol name="NSDraggingDestination" swt_gen="mixed"> <method selector="draggingEnded:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="draggingEntered:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="draggingExited:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="draggingUpdated:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="performDragOperation:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="wantsPeriodicDraggingUpdates" swt_gen="true"> + <retval></retval> </method> - <method selector="wantsPeriodicDraggingUpdates" swt_gen="true"></method> </informal_protocol> <informal_protocol name="NSDraggingSource" swt_gen="mixed"> <method selector="draggedImage:beganAt:" swt_gen="true" swt_gen_custom_callback="true"> @@ -5110,31 +5083,38 @@ <informal_protocol name="NSFontManagerResponderMethod" swt_gen="true"> <method selector="changeFont:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSFontPanelValidationAdditions" swt_gen="true"> <method selector="validModesForFontPanel:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSMenuDelegate" swt_gen="mixed"> <method selector="menu:willHighlightItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="menuDidClose:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="menuNeedsUpdate:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="menuWillOpen:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSMenuValidation" swt_gen="true"> <method selector="validateMenuItem:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSOutlineViewDataSource" swt_gen="mixed"> @@ -5143,61 +5123,73 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:child:ofItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:isItemExpandable:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:numberOfChildrenOfItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:objectValueForTableColumn:byItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:setObjectValue:forTableColumn:byItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:validateDrop:proposedItem:proposedChildIndex:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:writeItems:toPasteboard:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSOutlineViewDelegate" swt_gen="mixed"> <method selector="outlineView:didClickTableColumn:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:shouldCollapseItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:shouldExpandItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="outlineView:willDisplayCell:forTableColumn:item:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSOutlineViewNotifications" swt_gen="mixed"> @@ -5221,6 +5213,7 @@ <method selector="pasteboard:provideDataForType:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSSavePanelDelegate" swt_gen="mixed"> @@ -5233,14 +5226,17 @@ <method selector="tabView:didSelectTabViewItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="tabView:shouldSelectTabViewItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="tabView:willSelectTabViewItem:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSTableDataSource" swt_gen="mixed"> @@ -5280,17 +5276,20 @@ <method selector="tableView:didClickTableColumn:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="tableView:shouldEditTableColumn:row:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="tableView:willDisplayCell:forTableColumn:row:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSTableViewNotifications" swt_gen="true"> @@ -5310,47 +5309,67 @@ <informal_protocol name="NSTextDelegate" swt_gen="mixed"> <method selector="textDidChange:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="textDidEndEditing:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSTextInput" swt_gen="true"> <method selector="attributedSubstringFromRange:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="characterIndexForPoint:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="firstRectForCharacterRange:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="hasMarkedText" swt_gen="true"> + <retval></retval> </method> - <method selector="hasMarkedText" swt_gen="true"></method> <method selector="insertText:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="markedRange" swt_gen="true" swt_gen_custom_callback="true"> + <retval></retval> + </method> + <method selector="selectedRange" swt_gen="true" swt_gen_custom_callback="true"> + <retval></retval> </method> - <method selector="markedRange" swt_gen="true" swt_gen_custom_callback="true"></method> - <method selector="selectedRange" swt_gen="true" swt_gen_custom_callback="true"></method> <method selector="setMarkedText:selectedRange:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> + </method> + <method selector="unmarkText" swt_gen="true"> + <retval></retval> + </method> + <method selector="validAttributesForMarkedText" swt_gen="true"> + <retval></retval> </method> - <method selector="unmarkText" swt_gen="true"></method> - <method selector="validAttributesForMarkedText" swt_gen="true"></method> </informal_protocol> <informal_protocol name="NSTextViewDelegate" swt_gen="mixed"> <method selector="textView:clickedOnLink:atIndex:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="textView:willChangeSelectionFromCharacterRange:toCharacterRange:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="textViewDidChangeSelection:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSToolTipOwner" swt_gen="true"> @@ -5359,6 +5378,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSToolbarDelegate" swt_gen="true"> @@ -5366,15 +5386,19 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="toolbarAllowedItemIdentifiers:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="toolbarDefaultItemIdentifiers:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="toolbarSelectableItemIdentifiers:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSToolbarNotifications" swt_gen="true"> @@ -5388,6 +5412,7 @@ <informal_protocol name="NSWindowDelegate" swt_gen="mixed"> <method selector="windowShouldClose:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="NSWindowNotifications" swt_gen="mixed"> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreFoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreFoundationFull.bridgesupport.extras index 9688a203e6..f0f07d87d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreFoundationFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreFoundationFull.bridgesupport.extras @@ -22,6 +22,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CFDictionaryCreateMutable" swt_gen="true"> <arg swt_gen="true"></arg> @@ -32,11 +33,13 @@ </function> <function name="CFRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CFRunLoopAddObserver" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CFRunLoopGetCurrent" swt_gen="true"> <retval swt_gen="true"></retval> @@ -57,6 +60,7 @@ </function> <function name="CFRunLoopObserverInvalidate" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CFRunLoopRunInMode" swt_gen="true"> <arg swt_gen="true"></arg> @@ -66,6 +70,7 @@ </function> <function name="CFRunLoopStop" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CFStringCreateWithCharacters" swt_gen="true"> <arg swt_gen="true"></arg> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras index 843c42fe1b..967ee85523 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras @@ -18,6 +18,7 @@ <enum name="kCGEventSourceStateHIDSystemState" swt_gen="true"></enum> <enum name="kCGEventSuppressionStateRemoteMouseDrag" swt_gen="true"></enum> <enum name="kCGEventSuppressionStateSuppressionInterval" swt_gen="true"></enum> + <enum name="kCGHIDEventTap" swt_gen="true"></enum> <enum name="kCGImageAlphaFirst" swt_gen="true"></enum> <enum name="kCGImageAlphaLast" swt_gen="true"></enum> <enum name="kCGImageAlphaNoneSkipFirst" swt_gen="true"></enum> @@ -38,7 +39,6 @@ <enum name="kCGPathStroke" swt_gen="true"></enum> <enum name="kCGScrollEventUnitLine" swt_gen="true"></enum> <enum name="kCGScrollEventUnitPixel" swt_gen="true"></enum> - <enum name="kCGSessionEventTap" swt_gen="true"></enum> <enum name="kCGTextFillStroke" swt_gen="true"></enum> <function name="CGBitmapContextCreate" swt_gen="true"> <arg swt_gen="true"></arg> @@ -65,109 +65,135 @@ </function> <function name="CGColorRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGColorSpaceCreateDeviceRGB" swt_gen="true"> <retval swt_gen="true"></retval> </function> <function name="CGColorSpaceRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextAddPath" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextBeginTransparencyLayerWithRect" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextDrawImage" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextEndTransparencyLayer" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextFillRect" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextReplacePathWithStrokedPath" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextRestoreGState" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSaveGState" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextScaleCTM" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetBlendMode" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetFillColor" swt_gen="true"> <arg swt_gen="true" swt_param_name="c"></arg> <arg swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg> + <retval></retval> </function> <function name="CGContextSetFillColorSpace" swt_gen="true"> <arg swt_gen="true" swt_param_name="c"></arg> <arg swt_gen="true" swt_param_name="colorspace"></arg> + <retval></retval> </function> <function name="CGContextSetLineCap" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetLineDash" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true" swt_java_type="float[]" swt_java_type64="float[]"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetLineJoin" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetLineWidth" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetMiterLimit" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetShouldAntialias" swt_gen="true"> <arg swt_gen="true" swt_param_name="c"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetTextDrawingMode" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetTextMatrix" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextSetTextPosition" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextStrokePath" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGContextTranslateCTM" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGDataProviderCreateWithData" swt_gen="true"> <arg swt_gen="true"></arg> @@ -183,6 +209,7 @@ </function> <function name="CGDataProviderRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGDisplayBaseAddress" swt_gen="true"> <arg swt_gen="true"></arg> @@ -236,6 +263,7 @@ <function name="CGEventPost" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGEventSourceCreate" swt_gen="true"> <arg swt_gen="true" swt_param_name="sourceState"></arg> @@ -272,6 +300,7 @@ </function> <function name="CGImageRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPathAddCurveToPoint" swt_gen="true"> <arg swt_gen="true"></arg> @@ -282,17 +311,20 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPathAddLineToPoint" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPathAddRect" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPathApply" swt_gen="true"> <arg swt_gen="true"></arg> @@ -302,9 +334,11 @@ <arg></arg> <retval swt_gen="true"></retval> </arg> + <retval></retval> </function> <function name="CGPathCloseSubpath" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPathCreateCopy" swt_gen="true"> <arg swt_gen="true"></arg> @@ -318,9 +352,11 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPathRelease" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CGPostKeyboardEvent" swt_gen="true"> <arg swt_gen="true"></arg> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreTextFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreTextFull.bridgesupport.extras index 6ce5f6da45..bd180d9230 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreTextFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreTextFull.bridgesupport.extras @@ -26,6 +26,7 @@ <function name="CTLineDraw" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </function> <function name="CTLineGetTypographicBounds" swt_gen="true"> <arg swt_gen="true"></arg> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras index 8947ccd70a..e3d0991aa2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras @@ -1,5 +1,50 @@ <?xml version="1.0" encoding="UTF8"?> <signatures swt_gen="mixed"> + <class name="NSAffineTransform" swt_gen="mixed"> + <method selector="initWithTransform:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true" swt_java_type="NSAffineTransform"></retval> + </method> + <method selector="invert" swt_gen="true"> + <retval swt_gen="true"></retval> + </method> + <method selector="prependTransform:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + <method selector="rotateByDegrees:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + <method selector="scaleXBy:yBy:" swt_gen="true"> + <arg swt_gen="true"></arg> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + <method selector="setTransformStruct:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + <method class_method="true" selector="transform" swt_gen="true"> + <retval swt_gen="true"></retval> + </method> + <method selector="transformPoint:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + <method selector="transformSize:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + <method selector="transformStruct" swt_gen="true"> + <retval swt_gen="true"></retval> + </method> + <method selector="translateXBy:yBy:" swt_gen="true"> + <arg swt_gen="true"></arg> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> + </class> <class name="NSAppleEventDescriptor" swt_gen="mixed"> <method selector="initListDescriptor" swt_gen="true"> <retval swt_gen="true" swt_java_type="NSAppleEventDescriptor"></retval> @@ -37,7 +82,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> + <arg swt_gen="true" swt_param_name="format"></arg> <retval swt_gen="true"></retval> </method> <method selector="handleFailureInMethod:object:file:lineNumber:description:" swt_gen="true"> @@ -45,7 +90,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> - <arg swt_gen="true"></arg> + <arg swt_gen="true" swt_param_name="format"></arg> <retval swt_gen="true"></retval> </method> </class> @@ -60,10 +105,21 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> + <method selector="attributesAtIndex:longestEffectiveRange:inRange:" swt_gen="true"> + <arg swt_gen="true"></arg> + <arg swt_gen="true"></arg> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> <method selector="initWithString:" swt_gen="true"> <arg swt_gen="true"></arg> <retval swt_gen="true" swt_java_type="NSAttributedString"></retval> </method> + <method selector="initWithString:attributes:" swt_gen="true"> + <arg swt_gen="true"></arg> + <arg swt_gen="true"></arg> + <retval swt_gen="true" swt_java_type="NSAttributedString"></retval> + </method> <method selector="length" swt_gen="true"> <retval swt_gen="true"></retval> </method> @@ -72,10 +128,6 @@ </method> </class> <class name="NSAutoreleasePool" swt_gen="mixed"> - <method class_method="true" selector="enableFreedObjectCheck:" swt_gen="true"> - <arg swt_gen="true"></arg> - <retval swt_gen="true"></retval> - </method> </class> <class name="NSBundle" swt_gen="mixed"> <method selector="bundleIdentifier" swt_gen="true"> @@ -461,17 +513,29 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> + <method selector="appendAttributedString:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> <method selector="beginEditing" swt_gen="true"> <retval swt_gen="true"></retval> </method> <method selector="endEditing" swt_gen="true"> <retval swt_gen="true"></retval> </method> + <method selector="mutableString" swt_gen="true"> + <retval swt_gen="true"></retval> + </method> <method selector="removeAttribute:range:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> + <method selector="replaceCharactersInRange:withString:" swt_gen="true"> + <arg swt_gen="true"></arg> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> <method selector="setAttributedString:" swt_gen="true"> <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> @@ -1129,6 +1193,7 @@ <method selector="download:decideDestinationWithSuggestedFilename:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <struct name="NSAffineTransformStruct" swt_gen="true"> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java index 51eeee37d1..88369a7794 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,6 +28,10 @@ public void concat() { OS.objc_msgSend(this.id, OS.sel_concat); } +public void set() { + OS.objc_msgSend(this.id, OS.sel_set); +} + public NSAffineTransform initWithTransform(NSAffineTransform transform) { int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0); return result == this.id ? this : (result != 0 ? new NSAffineTransform(result) : null); @@ -49,10 +53,6 @@ public void scaleXBy(float /*double*/ scaleX, float /*double*/ scaleY) { OS.objc_msgSend(this.id, OS.sel_scaleXBy_yBy_, scaleX, scaleY); } -public void set() { - OS.objc_msgSend(this.id, OS.sel_set); -} - public void setTransformStruct(NSAffineTransformStruct transformStruct) { OS.objc_msgSend(this.id, OS.sel_setTransformStruct_, transformStruct); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java index dbab4beed3..33e74b8ffd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,12 +29,12 @@ public static NSAssertionHandler currentHandler() { return result != 0 ? new NSAssertionHandler(result) : null; } -public void handleFailureInFunction(NSString functionName, NSString fileName, int /*long*/ line, NSString description) { - OS.objc_msgSend(this.id, OS.sel_handleFailureInFunction_file_lineNumber_description_, functionName != null ? functionName.id : 0, fileName != null ? fileName.id : 0, line, description != null ? description.id : 0); +public void handleFailureInFunction(NSString functionName, NSString fileName, int /*long*/ line, NSString format) { + OS.objc_msgSend(this.id, OS.sel_handleFailureInFunction_file_lineNumber_description_, functionName != null ? functionName.id : 0, fileName != null ? fileName.id : 0, line, format != null ? format.id : 0); } -public void handleFailureInMethod(int /*long*/ selector, id object, NSString fileName, int /*long*/ line, NSString description) { - OS.objc_msgSend(this.id, OS.sel_handleFailureInMethod_object_file_lineNumber_description_, selector, object != null ? object.id : 0, fileName != null ? fileName.id : 0, line, description != null ? description.id : 0); +public void handleFailureInMethod(int /*long*/ selector, id object, NSString fileName, int /*long*/ line, NSString format) { + OS.objc_msgSend(this.id, OS.sel_handleFailureInMethod_object_file_lineNumber_description_, selector, object != null ? object.id : 0, fileName != null ? fileName.id : 0, line, format != null ? format.id : 0); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java index 336244f429..cc8066ea78 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java @@ -29,11 +29,6 @@ public static NSAttributedString attributedStringWithAttachment(NSTextAttachment return result != 0 ? new NSAttributedString(result) : null; } -public NSDictionary attributesAtIndex(int /*long*/ location, int /*long*/ range, NSRange rangeLimit) { - int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit); - return result != 0 ? new NSDictionary(result) : null; -} - public NSRect boundingRectWithSize(NSSize size, int /*long*/ options) { NSRect result = new NSRect(); OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectWithSize_options_, size, options); @@ -54,11 +49,6 @@ public void drawInRect(NSRect rect) { OS.objc_msgSend(this.id, OS.sel_drawInRect_, rect); } -public NSAttributedString initWithString(NSString str, NSDictionary attrs) { - int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0); - return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); -} - public int /*long*/ nextWordFromIndex(int /*long*/ location, boolean isForward) { return OS.objc_msgSend(this.id, OS.sel_nextWordFromIndex_forward_, location, isForward); } @@ -79,11 +69,21 @@ public NSAttributedString attributedSubstringFromRange(NSRange range) { return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); } +public NSDictionary attributesAtIndex(int /*long*/ location, int /*long*/ range, NSRange rangeLimit) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit); + return result != 0 ? new NSDictionary(result) : null; +} + public NSAttributedString initWithString(NSString str) { int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0); return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); } +public NSAttributedString initWithString(NSString str, NSDictionary attrs) { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0); + return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null); +} + public int /*long*/ length() { return OS.objc_msgSend(this.id, OS.sel_length); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java index 05eb429890..37ff895293 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,8 +24,4 @@ public NSAutoreleasePool(id id) { super(id); } -public static void enableFreedObjectCheck(boolean enable) { - OS.objc_msgSend(OS.class_NSAutoreleasePool, OS.sel_enableFreedObjectCheck_, enable); -} - } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java index f00df864e8..33f0b1fc2f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -64,22 +64,22 @@ public boolean isFlipped() { return OS.objc_msgSend_bool(this.id, OS.sel_isFlipped); } -public void restoreGraphicsState() { - OS.objc_msgSend(this.id, OS.sel_restoreGraphicsState); -} - public static void static_restoreGraphicsState() { OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_restoreGraphicsState); } -public void saveGraphicsState() { - OS.objc_msgSend(this.id, OS.sel_saveGraphicsState); +public void restoreGraphicsState() { + OS.objc_msgSend(this.id, OS.sel_restoreGraphicsState); } public static void static_saveGraphicsState() { OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_saveGraphicsState); } +public void saveGraphicsState() { + OS.objc_msgSend(this.id, OS.sel_saveGraphicsState); +} + public void setCompositingOperation(int /*long*/ operation) { OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, operation); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java index c0d66961da..fd4b025678 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,19 +24,6 @@ public NSMutableAttributedString(id id) { super(id); } -public void appendAttributedString(NSAttributedString attrString) { - OS.objc_msgSend(this.id, OS.sel_appendAttributedString_, attrString != null ? attrString.id : 0); -} - -public NSMutableString mutableString() { - int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mutableString); - return result != 0 ? new NSMutableString(result) : null; -} - -public void replaceCharactersInRange(NSRange range, NSString str) { - OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_withString_, range, str != null ? str.id : 0); -} - public void setBaseWritingDirection(int /*long*/ writingDirection, NSRange range) { OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_range_, writingDirection, range); } @@ -45,6 +32,10 @@ public void addAttribute(NSString name, id value, NSRange range) { OS.objc_msgSend(this.id, OS.sel_addAttribute_value_range_, name != null ? name.id : 0, value != null ? value.id : 0, range); } +public void appendAttributedString(NSAttributedString attrString) { + OS.objc_msgSend(this.id, OS.sel_appendAttributedString_, attrString != null ? attrString.id : 0); +} + public void beginEditing() { OS.objc_msgSend(this.id, OS.sel_beginEditing); } @@ -53,10 +44,19 @@ public void endEditing() { OS.objc_msgSend(this.id, OS.sel_endEditing); } +public NSMutableString mutableString() { + int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mutableString); + return result != 0 ? new NSMutableString(result) : null; +} + public void removeAttribute(NSString name, NSRange range) { OS.objc_msgSend(this.id, OS.sel_removeAttribute_range_, name != null ? name.id : 0, range); } +public void replaceCharactersInRange(NSRange range, NSString str) { + OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_withString_, range, str != null ? str.id : 0); +} + public void setAttributedString(NSAttributedString attrString) { OS.objc_msgSend(this.id, OS.sel_setAttributedString_, attrString != null ? attrString.id : 0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java index cee8f87348..3201b59287 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -46,8 +46,8 @@ public static NSString stringWithCharacters(char[] characters, int /*long*/ leng return result != 0 ? new NSMutableString(result) : null; } -public static NSString stringWithFormat(NSString stringWithFormat) { - int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithFormat_, stringWithFormat != null ? stringWithFormat.id : 0); +public static NSString stringWithFormat(NSString format) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithFormat_, format != null ? format.id : 0); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java index c950f90f38..4cd074f24e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -139,8 +139,8 @@ public static NSString stringWithCharacters(char[] characters, int /*long*/ leng return result != 0 ? new NSString(result) : null; } -public static NSString stringWithFormat(NSString stringWithFormat) { - int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithFormat_, stringWithFormat != null ? stringWithFormat.id : 0); +public static NSString stringWithFormat(NSString format) { + int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithFormat_, format != null ? format.id : 0); return result != 0 ? new NSString(result) : null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java index 78298fad27..42f92ebafc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public NSTableHeaderCell headerCell() { return result != 0 ? new NSTableHeaderCell(result) : null; } -public NSTableColumn initWithIdentifier(id identifier) { +public NSTableColumn initWithIdentifier(NSString identifier) { int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0); return result == this.id ? this : (result != 0 ? new NSTableColumn(result) : null); } @@ -55,7 +55,7 @@ public void setHeaderCell(NSCell cell) { OS.objc_msgSend(this.id, OS.sel_setHeaderCell_, cell != null ? cell.id : 0); } -public void setIdentifier(id identifier) { +public void setIdentifier(NSString identifier) { OS.objc_msgSend(this.id, OS.sel_setIdentifier_, identifier != null ? identifier.id : 0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java index 5bbd597dc5..0f1de0b7d3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -53,7 +53,7 @@ public NSIndexSet columnIndexesInRect(NSRect rect) { return result != 0 ? new NSIndexSet(result) : null; } -public int /*long*/ columnWithIdentifier(id identifier) { +public int /*long*/ columnWithIdentifier(NSString identifier) { return OS.objc_msgSend(this.id, OS.sel_columnWithIdentifier_, identifier != null ? identifier.id : 0); } @@ -215,8 +215,8 @@ public void setDropRow(int /*long*/ row, int /*long*/ op) { OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, op); } -public void setGridStyleMask(int /*long*/ gridType) { - OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_, gridType); +public void setGridStyleMask(int /*long*/ gridStyle) { + OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_, gridStyle); } public void setHeaderView(NSTableHeaderView headerView) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java index 010fe3c766..99529e2293 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java @@ -349,6 +349,28 @@ public static final native int /*long*/ PMPrinterGetIndexedPrinterResolution(int */ public static final native int /*long*/ FindWindow (int /*long*/ h, int /*long*/ v, int /*long*/ [] wHandle); +/** + * @method flags=dynamic + * @param display cast=(CGDirectDisplayID) + */ +public static final native int /*long*/ CGDisplayBaseAddress(int display); +/** + * @method flags=dynamic + * @param display cast=(CGDirectDisplayID) + */ +public static final native int /*long*/ CGDisplayBitsPerPixel(int display); +/** + * @method flags=dynamic + * @param display cast=(CGDirectDisplayID) + */ +public static final native int /*long*/ CGDisplayBitsPerSample(int display); +/** + * @method flags=dynamic + * @param display cast=(CGDirectDisplayID) + */ +public static final native int /*long*/ CGDisplayBytesPerRow(int display); + + /** C calls */ public static final native int getpid(); @@ -1226,7 +1248,6 @@ public static final int /*long*/ sel_elementAtIndex_associatedPoints_ = sel_regi public static final int /*long*/ sel_elementCount = sel_registerName("elementCount"); public static final int /*long*/ sel_enableCursorRects = sel_registerName("enableCursorRects"); public static final int /*long*/ sel_enableFlushWindow = sel_registerName("enableFlushWindow"); -public static final int /*long*/ sel_enableFreedObjectCheck_ = sel_registerName("enableFreedObjectCheck:"); public static final int /*long*/ sel_endDocument = sel_registerName("endDocument"); public static final int /*long*/ sel_endEditing = sel_registerName("endEditing"); public static final int /*long*/ sel_endEditingFor_ = sel_registerName("endEditingFor:"); @@ -2266,7 +2287,7 @@ public static final int NSControlKeyMask = 262144; public static final int NSCriticalAlertStyle = 2; public static final int NSCurveToBezierPathElement = 2; public static final int NSDeleteCharacter = 127; -public static final int NSDeviceIndependentModifierFlagsMask = -65536; +public static final long NSDeviceIndependentModifierFlagsMask = 4294901760L; public static final int NSDocModalWindowMask = 64; public static final int NSDragOperationCopy = 1; public static final int NSDragOperationDelete = 32; @@ -2468,6 +2489,7 @@ public static final int kCGEventRightMouseUp = 4; public static final int kCGEventSourceStateHIDSystemState = 1; public static final int kCGEventSuppressionStateRemoteMouseDrag = 1; public static final int kCGEventSuppressionStateSuppressionInterval = 0; +public static final int kCGHIDEventTap = 0; public static final int kCGImageAlphaFirst = 4; public static final int kCGImageAlphaLast = 3; public static final int kCGImageAlphaNoneSkipFirst = 6; @@ -2488,7 +2510,6 @@ public static final int kCGPathElementMoveToPoint = 0; public static final int kCGPathStroke = 2; public static final int kCGScrollEventUnitLine = 1; public static final int kCGScrollEventUnitPixel = 0; -public static final int kCGHIDEventTap = 0; public static final int kCGTextFillStroke = 2; public static final int kCTParagraphStyleSpecifierBaseWritingDirection = 13; public static final int kCTWritingDirectionLeftToRight = 0; @@ -3417,22 +3438,6 @@ public static final native void CGDataProviderRelease(int /*long*/ provider); /** * @param display cast=(CGDirectDisplayID) */ -public static final native int /*long*/ CGDisplayBaseAddress(int display); -/** - * @param display cast=(CGDirectDisplayID) - */ -public static final native int /*long*/ CGDisplayBitsPerPixel(int display); -/** - * @param display cast=(CGDirectDisplayID) - */ -public static final native int /*long*/ CGDisplayBitsPerSample(int display); -/** - * @param display cast=(CGDirectDisplayID) - */ -public static final native int /*long*/ CGDisplayBytesPerRow(int display); -/** - * @param display cast=(CGDirectDisplayID) - */ public static final native int /*long*/ CGDisplayPixelsHigh(int display); /** * @param display cast=(CGDirectDisplayID) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras index 5ae0bbc3f6..5c2f3a6dc9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras @@ -243,49 +243,65 @@ </method> </class> <informal_protocol name="WebDocumentRepresentation" swt_gen="true"> - <method selector="documentSource" swt_gen="true"></method> + <method selector="documentSource" swt_gen="true"> + <retval></retval> + </method> </informal_protocol> <informal_protocol name="WebFrameLoadDelegate" swt_gen="mixed"> <method selector="webView:didChangeLocationWithinPageForFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:didCommitLoadForFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:didFailProvisionalLoadWithError:forFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:didFinishLoadForFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:didReceiveTitle:forFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:didStartProvisionalLoadForFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:windowScriptObjectAvailable:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="WebOpenPanelResultListener" swt_gen="true"> <method selector="chooseFilename:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="WebPolicyDecisionListener" swt_gen="true"> - <method selector="download" swt_gen="true"></method> - <method selector="ignore" swt_gen="true"></method> - <method selector="use" swt_gen="true"></method> + <method selector="download" swt_gen="true"> + <retval></retval> + </method> + <method selector="ignore" swt_gen="true"> + <retval></retval> + </method> + <method selector="use" swt_gen="true"> + <retval></retval> + </method> </informal_protocol> <informal_protocol name="WebPolicyDelegate" swt_gen="true"> <method selector="webView:decidePolicyForMIMEType:request:frame:decisionListener:" swt_gen="true"> @@ -294,6 +310,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:decidePolicyForNavigationAction:request:frame:decisionListener:" swt_gen="true"> <arg swt_gen="true"></arg> @@ -301,6 +318,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:" swt_gen="true"> <arg swt_gen="true"></arg> @@ -308,11 +326,13 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:unableToImplementPolicyWithError:frame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="WebResourceLoadDelegate" swt_gen="mixed"> @@ -320,23 +340,27 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:resource:didFailLoadingWithError:fromDataSource:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:resource:didFinishLoadingFromDataSource:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:resource:didReceiveAuthenticationChallenge:fromDataSource:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:resource:willSendRequest:redirectResponse:fromDataSource:" swt_gen="true"> <arg swt_gen="true"></arg> @@ -344,6 +368,7 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> <informal_protocol name="WebUIDelegate" swt_gen="mixed"> @@ -351,78 +376,97 @@ <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:createWebViewWithRequest:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:mouseDidMoveOverElement:modifierFlags:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:printFrameView:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:runJavaScriptAlertPanelWithMessage:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:runJavaScriptConfirmPanelWithMessage:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:runOpenPanelForFileButtonWithResultListener:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:setFrame:" swt_gen="true" swt_gen_custom_callback="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:setResizable:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:setStatusBarVisible:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:setStatusText:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webView:setToolbarsVisible:" swt_gen="true"> <arg swt_gen="true"></arg> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webViewClose:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webViewFocus:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webViewShow:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> <method selector="webViewUnfocus:" swt_gen="true"> <arg swt_gen="true"></arg> + <retval></retval> </method> </informal_protocol> </signatures> |