diff options
658 files changed, 3513 insertions, 1340 deletions
diff --git a/.gitignore b/.gitignore index e660fd93d3..d7d5d82903 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bin/ +*.log diff --git a/bundles/org.eclipse.swt.opengl/.classpath_carbon b/bundles/org.eclipse.swt.opengl/.classpath_carbon index 027aa0d963..027aa0d963 100755..100644 --- a/bundles/org.eclipse.swt.opengl/.classpath_carbon +++ b/bundles/org.eclipse.swt.opengl/.classpath_carbon diff --git a/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/opengl/GLCanvas.java index ebfc775bf3..ebfc775bf3 100755..100644 --- a/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/opengl/GLCanvas.java +++ b/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/opengl/GLCanvas.java diff --git a/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GL.java b/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GL.java index 01a4fca4c3..01a4fca4c3 100755..100644 --- a/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GL.java +++ b/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GL.java diff --git a/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GLU.java b/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GLU.java index 4c1e333d45..4c1e333d45 100755..100644 --- a/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GLU.java +++ b/bundles/org.eclipse.swt.opengl/common/org/eclipse/opengl/GLU.java diff --git a/bundles/org.eclipse.swt.opengl/gtk/library/build.sh b/bundles/org.eclipse.swt.opengl/gtk/library/build.sh index dc26d12412..dc26d12412 100644..100755 --- a/bundles/org.eclipse.swt.opengl/gtk/library/build.sh +++ b/bundles/org.eclipse.swt.opengl/gtk/library/build.sh diff --git a/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/GLX.java b/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/GLX.java index 3507933b1c..3507933b1c 100755..100644 --- a/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/GLX.java +++ b/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/GLX.java diff --git a/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/XVisualInfo.java b/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/XVisualInfo.java index 8f396967d4..8f396967d4 100755..100644 --- a/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/XVisualInfo.java +++ b/bundles/org.eclipse.swt.opengl/gtk/org/eclipse/swt/internal/opengl/gtk/XVisualInfo.java diff --git a/bundles/org.eclipse.swt.opengl/motif/library/build.sh b/bundles/org.eclipse.swt.opengl/motif/library/build.sh index afec19dd74..afec19dd74 100644..100755 --- a/bundles/org.eclipse.swt.opengl/motif/library/build.sh +++ b/bundles/org.eclipse.swt.opengl/motif/library/build.sh diff --git a/bundles/org.eclipse.swt.opengl/win32/library/build.bat b/bundles/org.eclipse.swt.opengl/win32/library/build.bat index e3cd949c2e..e3cd949c2e 100644..100755 --- a/bundles/org.eclipse.swt.opengl/win32/library/build.bat +++ b/bundles/org.eclipse.swt.opengl/win32/library/build.bat diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java index 127718c611..7791aa4a1c 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java @@ -572,7 +572,9 @@ void generateDynamicFunctionCall(JNIMethod method, JNIParameter[] params, JNITyp String name = method.getName(); if (name.startsWith("_")) name = name.substring(1); - output("\t\tLOAD_FUNCTION(fp, "); + output("\t\t"); + output(method.getDeclaringClass().getSimpleName()); + output("_LOAD_FUNCTION(fp, "); output(name); outputln(")"); outputln("\t\tif (fp) {"); diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.webkit.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.webkit.properties index c1cb9a41ff..c1cb9a41ff 100755..100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.webkit.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.webkit.properties diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa index dc8d373a7f..dc8d373a7f 100755..100644 --- a/bundles/org.eclipse.swt/.classpath_cocoa +++ b/bundles/org.eclipse.swt/.classpath_cocoa diff --git a/bundles/org.eclipse.swt/.classpath_motif b/bundles/org.eclipse.swt/.classpath_motif index 7c18c5c6d0..7c18c5c6d0 100755..100644 --- a/bundles/org.eclipse.swt/.classpath_motif +++ b/bundles/org.eclipse.swt/.classpath_motif diff --git a/bundles/org.eclipse.swt/.classpath_photon b/bundles/org.eclipse.swt/.classpath_photon index 3c7f8847ab..3c7f8847ab 100755..100644 --- a/bundles/org.eclipse.swt/.classpath_photon +++ b/bundles/org.eclipse.swt/.classpath_photon diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32 index 376d93086d..376d93086d 100755..100644 --- a/bundles/org.eclipse.swt/.classpath_win32 +++ b/bundles/org.eclipse.swt/.classpath_win32 diff --git a/bundles/org.eclipse.swt/.gitignore b/bundles/org.eclipse.swt/.gitignore index 8623d47ef5..8623d47ef5 100755..100644 --- a/bundles/org.eclipse.swt/.gitignore +++ b/bundles/org.eclipse.swt/.gitignore diff --git a/bundles/org.eclipse.swt/.project_classpath_builder b/bundles/org.eclipse.swt/.project_classpath_builder index 85158dbdb7..85158dbdb7 100755..100644 --- a/bundles/org.eclipse.swt/.project_classpath_builder +++ b/bundles/org.eclipse.swt/.project_classpath_builder diff --git a/bundles/org.eclipse.swt/.project_normal b/bundles/org.eclipse.swt/.project_normal index 4993d71ff8..4993d71ff8 100755..100644 --- a/bundles/org.eclipse.swt/.project_normal +++ b/bundles/org.eclipse.swt/.project_normal diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java index 00ba391ca8..00ba391ca8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/carbon/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/carbon/org/eclipse/swt/accessibility/Accessible.java index 41b55ede69..3f1ee9351d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/carbon/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/carbon/org/eclipse/swt/accessibility/Accessible.java @@ -1662,6 +1662,39 @@ public class Accessible { } /** + * Sends a message with event-specific data and a childID + * to accessible clients, indicating that something has changed + * within a custom control. + * + * NOTE: This API is intended for applications that are still using childIDs. + * Moving forward, applications should use accessible objects instead of childIDs. + * + * @param event an <code>ACC</code> constant beginning with EVENT_* indicating the message to send + * @param eventData an object containing event-specific data, or null if there is no event-specific data + * (eventData is specified in the documentation for individual ACC.EVENT_* constants) + * @param childID an identifier specifying a child of the control + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li> + * </ul> + * + * @see ACC#EVENT_DESCRIPTION_CHANGED + * @see ACC#EVENT_LOCATION_CHANGED + * @see ACC#EVENT_NAME_CHANGED + * @see ACC#EVENT_SELECTION_CHANGED + * @see ACC#EVENT_STATE_CHANGED + * @see ACC#EVENT_TEXT_SELECTION_CHANGED + * @see ACC#EVENT_VALUE_CHANGED + * + * @since 3.8 + */ + public void sendEvent(int event, Object eventData, int childID) { + checkWidget(); + // TODO + } + + /** * Sends a message to accessible clients that the child selection * within a custom container control has changed. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java index 07f67ab5bd..b44bf9d1c2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java @@ -3150,6 +3150,55 @@ public class Accessible { } /** + * Sends a message with event-specific data and a childID + * to accessible clients, indicating that something has changed + * within a custom control. + * + * NOTE: This API is intended for applications that are still using childIDs. + * Moving forward, applications should use accessible objects instead of childIDs. + * + * @param event an <code>ACC</code> constant beginning with EVENT_* indicating the message to send + * @param eventData an object containing event-specific data, or null if there is no event-specific data + * (eventData is specified in the documentation for individual ACC.EVENT_* constants) + * @param childID an identifier specifying a child of the control + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li> + * </ul> + * + * @see ACC#EVENT_DESCRIPTION_CHANGED + * @see ACC#EVENT_LOCATION_CHANGED + * @see ACC#EVENT_NAME_CHANGED + * @see ACC#EVENT_SELECTION_CHANGED + * @see ACC#EVENT_STATE_CHANGED + * @see ACC#EVENT_TEXT_SELECTION_CHANGED + * @see ACC#EVENT_VALUE_CHANGED + * + * @since 3.8 + */ + public void sendEvent(int event, Object eventData, int childID) { + checkWidget(); + + id eventSource = childIDToOs(childID); + if (DEBUG) System.out.println("sendEvent: 0x" + Integer.toHexString(event) + ", data = " + eventData + ", source = " + eventSource); + + switch (event) { + case ACC.EVENT_VALUE_CHANGED: + case ACC.EVENT_STATE_CHANGED: + case ACC.EVENT_SELECTION_CHANGED: + OS.NSAccessibilityPostNotification(eventSource.id, OS.NSAccessibilitySelectedChildrenChangedNotification.id); break; + case ACC.EVENT_TEXT_SELECTION_CHANGED: + OS.NSAccessibilityPostNotification(eventSource.id, OS.NSAccessibilitySelectedTextChangedNotification.id); break; + case ACC.EVENT_LOCATION_CHANGED: + OS.NSAccessibilityPostNotification(eventSource.id, OS.NSAccessibilityMovedNotification.id); break; + case ACC.EVENT_NAME_CHANGED: + case ACC.EVENT_DESCRIPTION_CHANGED: + OS.NSAccessibilityPostNotification(eventSource.id, OS.NSAccessibilityTitleChangedNotification.id); break; + } + } + + /** * Sends a message to accessible clients that the child selection * within a custom container control has changed. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/emulated/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/emulated/org/eclipse/swt/accessibility/Accessible.java index 4b2952043a..8eb1c22f81 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/emulated/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/emulated/org/eclipse/swt/accessibility/Accessible.java @@ -672,6 +672,37 @@ public class Accessible { } /** + * Sends a message with event-specific data and a childID + * to accessible clients, indicating that something has changed + * within a custom control. + * + * NOTE: This API is intended for applications that are still using childIDs. + * Moving forward, applications should use accessible objects instead of childIDs. + * + * @param event an <code>ACC</code> constant beginning with EVENT_* indicating the message to send + * @param eventData an object containing event-specific data, or null if there is no event-specific data + * (eventData is specified in the documentation for individual ACC.EVENT_* constants) + * @param childID an identifier specifying a child of the control + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li> + * </ul> + * + * @see ACC#EVENT_DESCRIPTION_CHANGED + * @see ACC#EVENT_LOCATION_CHANGED + * @see ACC#EVENT_NAME_CHANGED + * @see ACC#EVENT_SELECTION_CHANGED + * @see ACC#EVENT_STATE_CHANGED + * @see ACC#EVENT_TEXT_SELECTION_CHANGED + * @see ACC#EVENT_VALUE_CHANGED + * + * @since 3.8 + */ + public void sendEvent(int event, Object eventData, int childID) { + } + + /** * Sends a message to accessible clients that the child selection * within a custom container control has changed. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java index 73c155fbc9..0f49642983 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java @@ -877,6 +877,50 @@ public class Accessible { } /** + * Sends a message with event-specific data and a childID + * to accessible clients, indicating that something has changed + * within a custom control. + * + * NOTE: This API is intended for applications that are still using childIDs. + * Moving forward, applications should use accessible objects instead of childIDs. + * + * @param event an <code>ACC</code> constant beginning with EVENT_* indicating the message to send + * @param eventData an object containing event-specific data, or null if there is no event-specific data + * (eventData is specified in the documentation for individual ACC.EVENT_* constants) + * @param childID an identifier specifying a child of the control + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li> + * </ul> + * + * @see ACC#EVENT_DESCRIPTION_CHANGED + * @see ACC#EVENT_LOCATION_CHANGED + * @see ACC#EVENT_NAME_CHANGED + * @see ACC#EVENT_SELECTION_CHANGED + * @see ACC#EVENT_STATE_CHANGED + * @see ACC#EVENT_TEXT_SELECTION_CHANGED + * @see ACC#EVENT_VALUE_CHANGED + * + * @since 3.8 + */ + public void sendEvent(int event, Object eventData, int childID) { + checkWidget(); + if (accessibleObject != null) { + switch (event) { + case ACC.EVENT_STATE_CHANGED: + case ACC.EVENT_NAME_CHANGED: + case ACC.EVENT_VALUE_CHANGED: + case ACC.EVENT_LOCATION_CHANGED: + case ACC.EVENT_SELECTION_CHANGED: + case ACC.EVENT_TEXT_SELECTION_CHANGED: + case ACC.EVENT_DESCRIPTION_CHANGED: + accessibleObject.sendEvent(event, eventData, childID); + } + } + } + + /** * Sends a message to accessible clients that the child selection * within a custom container control has changed. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java index 80896bd377..29f6491c2b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java @@ -3736,6 +3736,14 @@ class AccessibleObject { } } + void sendEvent(int event, Object eventData, int childID) { + updateChildren (); + AccessibleObject accObject = getChildByID (childID); + if (accObject != null) { + accObject.sendEvent(event, eventData); + } + } + void setFocus (int childID) { updateChildren (); AccessibleObject accObject = getChildByID (childID); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java index 24698a6de3..0cf345d1a9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java @@ -1352,6 +1352,58 @@ public class Accessible { } /** + * Sends a message with event-specific data and a childID + * to accessible clients, indicating that something has changed + * within a custom control. + * + * NOTE: This API is intended for applications that are still using childIDs. + * Moving forward, applications should use accessible objects instead of childIDs. + * + * @param event an <code>ACC</code> constant beginning with EVENT_* indicating the message to send + * @param eventData an object containing event-specific data, or null if there is no event-specific data + * (eventData is specified in the documentation for individual ACC.EVENT_* constants) + * @param childID an identifier specifying a child of the control + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li> + * </ul> + * + * @see ACC#EVENT_DESCRIPTION_CHANGED + * @see ACC#EVENT_LOCATION_CHANGED + * @see ACC#EVENT_NAME_CHANGED + * @see ACC#EVENT_SELECTION_CHANGED + * @see ACC#EVENT_STATE_CHANGED + * @see ACC#EVENT_TEXT_SELECTION_CHANGED + * @see ACC#EVENT_VALUE_CHANGED + * + * @since 3.8 + */ + public void sendEvent(int event, Object eventData, int childID) { + checkWidget(); + if (!UseIA2) return; + int osChildID = childID == ACC.CHILDID_SELF ? eventChildID() : childIDToOs(childID); + if (DEBUG) print(this + ".NotifyWinEvent " + getEventString(event) + " hwnd=" + control.handle + " childID=" + osChildID); + switch (event) { + case ACC.EVENT_STATE_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_STATECHANGE, control.handle, COM.OBJID_CLIENT, osChildID); break; + case ACC.EVENT_NAME_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_NAMECHANGE, control.handle, COM.OBJID_CLIENT, osChildID); break; + case ACC.EVENT_VALUE_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_VALUECHANGE, control.handle, COM.OBJID_CLIENT, osChildID); break; + case ACC.EVENT_LOCATION_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_LOCATIONCHANGE, control.handle, COM.OBJID_CLIENT, osChildID); break; + case ACC.EVENT_SELECTION_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_SELECTIONWITHIN, control.handle, COM.OBJID_CLIENT, osChildID); break; + case ACC.EVENT_TEXT_SELECTION_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_TEXTSELECTIONCHANGED, control.handle, COM.OBJID_CLIENT, osChildID); break; + case ACC.EVENT_DESCRIPTION_CHANGED: + COM.NotifyWinEvent (COM.EVENT_OBJECT_DESCRIPTIONCHANGE, control.handle, COM.OBJID_CLIENT, osChildID); break; + } + } + + + /** * Sends a message to accessible clients that the child selection * within a custom container control has changed. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java index 37a332ac53..12e627641a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java @@ -17,7 +17,7 @@ class BrowserFactory { static boolean mozillaLibsLoaded; WebBrowser createWebBrowser (int style) { - boolean webkitInstalled = WebKit.isInstalled (); + boolean webkitInstalled = WebKit.IsInstalled (); if ((style & SWT.MOZILLA) != 0 || (!webkitInstalled && (style & SWT.WEBKIT) == 0)) { mozillaLibsLoaded = true; return new Mozilla (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Voyager.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Voyager.java index 543e1d7f49..543e1d7f49 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Voyager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Voyager.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java index ed5703ea07..c86e21076b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java @@ -335,6 +335,16 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm * if it will be within IE or out to another Control. */ break; + case OS.VK_UP: + case OS.VK_DOWN: + case OS.VK_LEFT: + case OS.VK_RIGHT: + case OS.VK_HOME: + case OS.VK_END: + case OS.VK_PRIOR: + case OS.VK_NEXT: + /* Do not translate/consume IE's keys for scrolling content. */ + break; case OS.VK_BACK: case OS.VK_RETURN: /* diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java index 41b34f7907..41b34f7907 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java index 7f2f39deeb..7f2f39deeb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java index 49cae17511..49cae17511 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java index b45797e02b..b45797e02b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java index f9f31b7a0c..f9f31b7a0c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderAdapter.java index 85f210a938..85f210a938 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderEvent.java index 99394bf37a..99394bf37a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java index 4fdeab51fe..4fdeab51fe 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java index 1d1185d875..1d1185d875 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java index 9e7de3ee9e..9e7de3ee9e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java index cd00023a27..d95bb65698 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java @@ -769,7 +769,7 @@ public void replaceTextRange(int start, int replaceLength, String newText){ // inform listeners StyledTextEvent event = new StyledTextEvent(this); - event.type = StyledText.TextChanging; + event.type = ST.TextChanging; event.start = start; event.replaceLineCount = lineCount(start, replaceLength); event.text = newText; @@ -784,7 +784,7 @@ public void replaceTextRange(int start, int replaceLength, String newText){ insert(start, newText); // inform listeners event = new StyledTextEvent(this); - event.type = StyledText.TextChanged; + event.type = ST.TextChanged; sendTextEvent(event); } /** @@ -809,7 +809,7 @@ public void setText (String text){ expandExp = 1; indexLines(); StyledTextEvent event = new StyledTextEvent(this); - event.type = StyledText.TextSet; + event.type = ST.TextSet; event.text = ""; sendTextEvent(event); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyEvent.java index 3d429291df..3d429291df 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java index 86ca395bc2..86ca395bc2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundEvent.java index 2337737299..2337737299 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java index ebfac4dd41..ebfac4dd41 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleEvent.java index bfa853ed60..bfa853ed60 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java index a6acfda978..a6acfda978 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PopupList.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PopupList.java index 4db6100dfc..4db6100dfc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PopupList.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PopupList.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ST.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ST.java index 77276975cc..771fcf8017 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ST.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ST.java @@ -136,5 +136,89 @@ public class ST { * @since 3.2 */ public static final int BULLET_CUSTOM = 1 << 5; + + /** + * The ExtendedModify event type (value is 3000). + * + * @since 3.8 + */ + public static final int ExtendedModify = 3000; + + /** + * The LineGetBackground event type (value is 3001). + * + * @since 3.8 + */ + public static final int LineGetBackground = 3001; + + /** + * The LineGetStyle event type (value is 3002). + * + * @since 3.8 + */ + public static final int LineGetStyle = 3002; + + /** + * The TextChanging event type (value is 3003). + * + * @since 3.8 + */ + public static final int TextChanging = 3003; + + /** + * The TextSet event type (value is 3004). + * + * @since 3.8 + */ + public static final int TextSet = 3004; + + /** + * The VerifyKey event type (value is 3005). + * + * @since 3.8 + */ + public static final int VerifyKey = 3005; + + /** + * The TextChanged event type (value is 3006). + * + * @since 3.8 + */ + public static final int TextChanged = 3006; + + /** + * The LineGetSegments event type (value is 3007). + * + * @since 3.8 + */ + public static final int LineGetSegments = 3007; + + /** + * The PaintObject event type (value is 3008). + * + * @since 3.8 + */ + public static final int PaintObject = 3008; + + /** + * The WordNext event type (value is 3009). + * + * @since 3.8 + */ + public static final int WordNext = 3009; + + /** + * The WordPrevious event type (value is 3010). + * + * @since 3.8 + */ + public static final int WordPrevious = 3010; + + /** + * The CaretMoved event type (value is 3011). + * + * @since 3.8 + */ + public static final int CaretMoved = 3011; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java index c944b71b52..c944b71b52 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java index f115784c4b..f115784c4b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java index afa0ad5b05..afa0ad5b05 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java index 76469db5f9..76469db5f9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java index 250f2d7284..852816035f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java @@ -87,20 +87,6 @@ public class StyledText extends Canvas { static final int DEFAULT_HEIGHT = 64; static final int V_SCROLL_RATE = 50; static final int H_SCROLL_RATE = 10; - - static final int ExtendedModify = 3000; - static final int LineGetBackground = 3001; - static final int LineGetStyle = 3002; - static final int TextChanging = 3003; - static final int TextSet = 3004; - static final int VerifyKey = 3005; - static final int TextChanged = 3006; - static final int LineGetSegments = 3007; - static final int PaintObject = 3008; - static final int WordNext = 3009; - static final int WordPrevious = 3010; - static final int CaretMoved = 3011; - static final int PREVIOUS_OFFSET_TRAILING = 0; static final int OFFSET_LEADING = 1; @@ -112,6 +98,8 @@ public class StyledText extends Canvas { TextChangeListener textChangeListener; // listener for TextChanging, TextChanged and TextSet events from StyledTextContent int verticalScrollOffset = 0; // pixel based int horizontalScrollOffset = 0; // pixel based + boolean alwaysShowScroll = true; + int ignoreResize = 0; int topIndex = 0; // top visible line int topIndexY; int clientAreaHeight = 0; // the client area height. Needed to calculate content width for new visible lines during Resize callback @@ -259,7 +247,7 @@ public class StyledText extends Canvas { fontData = styledText.getFont().getFontData()[0]; tabLength = styledText.tabLength; int lineCount = printerRenderer.lineCount; - if (styledText.isListening(LineGetBackground) || (styledText.isBidi() && styledText.isListening(LineGetSegments)) || styledText.isListening(LineGetStyle)) { + if (styledText.isListening(ST.LineGetBackground) || (styledText.isBidi() && styledText.isListening(ST.LineGetSegments)) || styledText.isListening(ST.LineGetStyle)) { StyledTextContent content = printerRenderer.content; for (int i = 0; i < lineCount; i++) { String line = content.getLine(i); @@ -1295,7 +1283,7 @@ public void addExtendedModifyListener(ExtendedModifyListener extendedModifyListe checkWidget(); if (extendedModifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); StyledTextListener typedListener = new StyledTextListener(extendedModifyListener); - addListener(ExtendedModify, typedListener); + addListener(ST.ExtendedModify, typedListener); } /** * Adds a bidirectional segment listener. @@ -1325,7 +1313,7 @@ public void addExtendedModifyListener(ExtendedModifyListener extendedModifyListe public void addBidiSegmentListener(BidiSegmentListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(LineGetSegments, new StyledTextListener(listener)); + addListener(ST.LineGetSegments, new StyledTextListener(listener)); } /** * Adds a caret listener. CaretEvent is sent when the caret offset changes. @@ -1344,7 +1332,7 @@ public void addBidiSegmentListener(BidiSegmentListener listener) { public void addCaretListener(CaretListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(CaretMoved, new StyledTextListener(listener)); + addListener(ST.CaretMoved, new StyledTextListener(listener)); } /** * Adds a line background listener. A LineGetBackground event is sent by the @@ -1362,10 +1350,10 @@ public void addCaretListener(CaretListener listener) { public void addLineBackgroundListener(LineBackgroundListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (!isListening(LineGetBackground)) { + if (!isListening(ST.LineGetBackground)) { renderer.clearLineBackground(0, content.getLineCount()); } - addListener(LineGetBackground, new StyledTextListener(listener)); + addListener(ST.LineGetBackground, new StyledTextListener(listener)); } /** * Adds a line style listener. A LineGetStyle event is sent by the widget to @@ -1383,11 +1371,11 @@ public void addLineBackgroundListener(LineBackgroundListener listener) { public void addLineStyleListener(LineStyleListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (!isListening(LineGetStyle)) { + if (!isListening(ST.LineGetStyle)) { setStyleRanges(0, 0, null, null, true); renderer.clearLineStyle(0, content.getLineCount()); } - addListener(LineGetStyle, new StyledTextListener(listener)); + addListener(ST.LineGetStyle, new StyledTextListener(listener)); setCaretLocation(); } /** @@ -1429,7 +1417,7 @@ public void addModifyListener(ModifyListener modifyListener) { public void addPaintObjectListener(PaintObjectListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(PaintObject, new StyledTextListener(listener)); + addListener(ST.PaintObject, new StyledTextListener(listener)); } /** * Adds a selection listener. A Selection event is sent by the widget when the @@ -1476,7 +1464,7 @@ public void addSelectionListener(SelectionListener listener) { public void addVerifyKeyListener(VerifyKeyListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(VerifyKey, new StyledTextListener(listener)); + addListener(ST.VerifyKey, new StyledTextListener(listener)); } /** * Adds a verify listener. A Verify event is sent by the widget when the widget text @@ -1521,8 +1509,8 @@ public void addVerifyListener(VerifyListener verifyListener) { public void addWordMovementListener(MovementListener movementListener) { checkWidget(); if (movementListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(WordNext, new StyledTextListener(movementListener)); - addListener(WordPrevious, new StyledTextListener(movementListener)); + addListener(ST.WordNext, new StyledTextListener(movementListener)); + addListener(ST.WordPrevious, new StyledTextListener(movementListener)); } /** * Appends a string to the text at the end of the widget. @@ -1627,8 +1615,11 @@ void calculateTopIndex(int delta) { } } if (topIndex != oldTopIndex || oldTopIndexY != topIndexY) { + int width = renderer.getWidth(); renderer.calculateClientArea(); - setScrollBars(false); + if (width != renderer.getWidth()) { + setScrollBars(false); + } } } /** @@ -1835,6 +1826,26 @@ public int getAlignment() { checkWidget(); return alignment; } +/** + * Returns the Always Show Scrollbars flag. True if the scrollbars are + * always shown even if they are not required. False if the scrollbars are only + * visible when some part of the content needs to be scrolled to be seen. + * The H_SCROLL and V_SCROLL style bits are also required to enable scrollbars in the + * horizontal and vertical directions. + * + * @return the Always Show Scrollbars flag value + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> + * </ul> + * + * @since 3.8 + */ +public boolean getAlwaysShowScrollBars() { + checkWidget(); + return alwaysShowScroll; +} int getAvailableHeightAbove(int height) { int maxHeight = verticalScrollOffset; if (maxHeight == -1) { @@ -3936,7 +3947,7 @@ public Color getLineBackground(int index) { if (index < 0 || index > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - return isListening(LineGetBackground) ? null : renderer.getLineBackground(index, null); + return isListening(ST.LineGetBackground) ? null : renderer.getLineBackground(index, null); } /** * Returns the bullet of the line at the given index. @@ -3960,7 +3971,7 @@ public Bullet getLineBullet(int index) { if (index < 0 || index > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - return isListening(LineGetStyle) ? null : renderer.getLineBullet(index, null); + return isListening(ST.LineGetStyle) ? null : renderer.getLineBullet(index, null); } /** * Returns the line background data for the given line or null if @@ -3972,7 +3983,7 @@ public Bullet getLineBullet(int index) { * @return line background data for the given line. */ StyledTextEvent getLineBackgroundData(int lineOffset, String line) { - return sendLineEvent(LineGetBackground, lineOffset, line); + return sendLineEvent(ST.LineGetBackground, lineOffset, line); } /** * Gets the number of text lines. @@ -4091,7 +4102,7 @@ public int getLineIndent(int index) { if (index < 0 || index > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - return isListening(LineGetStyle) ? 0 : renderer.getLineIndent(index, indent); + return isListening(ST.LineGetStyle) ? 0 : renderer.getLineIndent(index, indent); } /** * Returns whether the line at the given index is justified. @@ -4117,7 +4128,7 @@ public boolean getLineJustify(int index) { if (index < 0 || index > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - return isListening(LineGetStyle) ? false : renderer.getLineJustify(index, justify); + return isListening(ST.LineGetStyle) ? false : renderer.getLineJustify(index, justify); } /** * Returns the line spacing of the widget. @@ -4151,7 +4162,7 @@ public int getLineSpacing() { * line start and end after line end */ StyledTextEvent getLineStyleData(int lineOffset, String line) { - return sendLineEvent(LineGetStyle, lineOffset, line); + return sendLineEvent(ST.LineGetStyle, lineOffset, line); } /** * Returns the top pixel, relative to the client area, of a given line. @@ -4246,7 +4257,7 @@ public int[] getLineTabStops(int index) { if (index < 0 || index > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - if (isListening(LineGetStyle)) return null; + if (isListening(ST.LineGetStyle)) return null; int[] tabs = renderer.getLineTabStops(index, null); if (tabs == null) tabs = this.tabs; if (tabs == null) return new int [] {renderer.tabWidth}; @@ -4278,7 +4289,7 @@ public int getLineWrapIndent(int index) { if (index < 0 || index > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - return isListening(LineGetStyle) ? 0 : renderer.getLineWrapIndent(index, wrapIndent); + return isListening(ST.LineGetStyle) ? 0 : renderer.getLineWrapIndent(index, wrapIndent); } /** * Returns the left margin. @@ -4539,7 +4550,7 @@ String getPlatformDelimitedText(TextWriter writer) { */ public int[] getRanges() { checkWidget(); - if (!isListening(LineGetStyle)) { + if (!isListening(ST.LineGetStyle)) { int[] ranges = renderer.getRanges(0, content.getCharCount()); if (ranges != null) return ranges; } @@ -4581,7 +4592,7 @@ public int[] getRanges(int start, int length) { if (start > end || start < 0 || end > contentLength) { SWT.error(SWT.ERROR_INVALID_RANGE); } - if (!isListening(LineGetStyle)) { + if (!isListening(ST.LineGetStyle)) { int[] ranges = renderer.getRanges(start, length); if (ranges != null) return ranges; } @@ -4756,12 +4767,12 @@ public String getSelectionText() { } StyledTextEvent getBidiSegments(int lineOffset, String line) { if (!isBidi()) return null; - if (!isListening(LineGetSegments)) { + if (!isListening(ST.LineGetSegments)) { StyledTextEvent event = new StyledTextEvent(content); event.segments = getBidiSegmentsCompatibility(line, lineOffset); return event; } - StyledTextEvent event = sendLineEvent(LineGetSegments, lineOffset, line); + StyledTextEvent event = sendLineEvent(ST.LineGetSegments, lineOffset, line); if (event == null || event.segments == null || event.segments.length == 0) return null; int lineLength = line.length(); int[] segments = event.segments; @@ -4875,7 +4886,7 @@ public StyleRange getStyleRangeAtOffset(int offset) { if (offset < 0 || offset >= getCharCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - if (!isListening(LineGetStyle)) { + if (!isListening(ST.LineGetStyle)) { StyleRange[] ranges = renderer.getStyleRanges(offset, 1, true); if (ranges != null) return ranges[0]; } @@ -5022,7 +5033,7 @@ public StyleRange[] getStyleRanges(int start, int length, boolean includeRanges) if (start > end || start < 0 || end > contentLength) { SWT.error(SWT.ERROR_INVALID_RANGE); } - if (!isListening(LineGetStyle)) { + if (!isListening(ST.LineGetStyle)) { StyleRange[] ranges = renderer.getStyleRanges(start, length, includeRanges); if (ranges != null) return ranges; } @@ -5336,7 +5347,7 @@ int getWordNext (int offset, int movement, boolean ignoreListener) { } } if (ignoreListener) return newOffset; - return sendWordBoundaryEvent(WordNext, movement, offset, newOffset, lineText, lineOffset); + return sendWordBoundaryEvent(ST.WordNext, movement, offset, newOffset, lineText, lineOffset); } int getWordPrevious(int offset, int movement) { return getWordPrevious(offset, movement, false); @@ -5365,7 +5376,7 @@ int getWordPrevious(int offset, int movement, boolean ignoreListener) { } } if (ignoreListener) return newOffset; - return sendWordBoundaryEvent(WordPrevious, movement, offset, newOffset, lineText, lineOffset); + return sendWordBoundaryEvent(ST.WordPrevious, movement, offset, newOffset, lineText, lineOffset); } /** * Returns whether the widget wraps lines. @@ -5933,7 +5944,7 @@ void handleKeyDown(Event event) { verifyEvent.keyLocation = event.keyLocation; verifyEvent.stateMask = event.stateMask; verifyEvent.doit = true; - notifyListeners(VerifyKey, verifyEvent); + notifyListeners(ST.VerifyKey, verifyEvent); if (verifyEvent.doit) { if ((event.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL && event.keyCode == SWT.SHIFT && isBidiCaret()) { newOrientation = event.keyLocation == SWT.LEFT ? SWT.LEFT_TO_RIGHT : SWT.RIGHT_TO_LEFT; @@ -6119,6 +6130,8 @@ void handleResize(Event event) { Rectangle clientArea = getClientArea(); clientAreaHeight = clientArea.height; clientAreaWidth = clientArea.width; + if (!alwaysShowScroll && ignoreResize != 0) return; + /* Redraw the old or new right/bottom margin if needed */ if (oldWidth != clientAreaWidth) { if (rightMargin > 0) { @@ -6708,7 +6721,7 @@ void initializeAccessible() { public void getTextAttributes(AccessibleTextAttributeEvent e) { StyledText st = StyledText.this; int contentLength = st.getCharCount(); - if (!isListening(LineGetStyle) && st.renderer.styleCount == 0) { + if (!isListening(ST.LineGetStyle) && st.renderer.styleCount == 0) { e.start = 0; e.end = contentLength; e.textStyle = new TextStyle(st.getFont(), st.foreground, st.background); @@ -7149,7 +7162,7 @@ void modifyContent(Event event, boolean updateCaret) { if (event.doit) { StyledTextEvent styledTextEvent = null; int replacedLength = event.end - event.start; - if (isListening(ExtendedModify)) { + if (isListening(ST.ExtendedModify)) { styledTextEvent = new StyledTextEvent(content); styledTextEvent.start = event.start; styledTextEvent.end = event.start + event.text.length(); @@ -7186,13 +7199,13 @@ void modifyContent(Event event, boolean updateCaret) { showCaret(); } notifyListeners(SWT.Modify, event); - if (isListening(ExtendedModify)) { - notifyListeners(ExtendedModify, styledTextEvent); + if (isListening(ST.ExtendedModify)) { + notifyListeners(ST.ExtendedModify, styledTextEvent); } } } void paintObject(GC gc, int x, int y, int ascent, int descent, StyleRange style, Bullet bullet, int bulletIndex) { - if (isListening(PaintObject)) { + if (isListening(ST.PaintObject)) { StyledTextEvent event = new StyledTextEvent (content) ; event.gc = gc; event.x = x; @@ -7202,7 +7215,7 @@ void paintObject(GC gc, int x, int y, int ascent, int descent, StyleRange style, event.style = style; event.bullet = bullet; event.bulletIndex = bulletIndex; - notifyListeners(PaintObject, event); + notifyListeners(ST.PaintObject, event); } } /** @@ -7475,7 +7488,7 @@ public void redrawRange(int start, int length, boolean clearBackground) { public void removeBidiSegmentListener(BidiSegmentListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(LineGetSegments, listener); + removeListener(ST.LineGetSegments, listener); } /** * Removes the specified caret listener. @@ -7495,7 +7508,7 @@ public void removeBidiSegmentListener(BidiSegmentListener listener) { public void removeCaretListener(CaretListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(CaretMoved, listener); + removeListener(ST.CaretMoved, listener); } /** * Removes the specified extended modify listener. @@ -7513,7 +7526,7 @@ public void removeCaretListener(CaretListener listener) { public void removeExtendedModifyListener(ExtendedModifyListener extendedModifyListener) { checkWidget(); if (extendedModifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ExtendedModify, extendedModifyListener); + removeListener(ST.ExtendedModify, extendedModifyListener); } /** * Removes the specified line background listener. @@ -7531,7 +7544,7 @@ public void removeExtendedModifyListener(ExtendedModifyListener extendedModifyLi public void removeLineBackgroundListener(LineBackgroundListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(LineGetBackground, listener); + removeListener(ST.LineGetBackground, listener); } /** * Removes the specified line style listener. @@ -7549,7 +7562,7 @@ public void removeLineBackgroundListener(LineBackgroundListener listener) { public void removeLineStyleListener(LineStyleListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(LineGetStyle, listener); + removeListener(ST.LineGetStyle, listener); setCaretLocation(); } /** @@ -7587,7 +7600,7 @@ public void removeModifyListener(ModifyListener modifyListener) { public void removePaintObjectListener(PaintObjectListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(PaintObject, listener); + removeListener(ST.PaintObject, listener); } /** * Removes the listener from the collection of listeners who will @@ -7644,7 +7657,7 @@ public void removeVerifyListener(VerifyListener verifyListener) { */ public void removeVerifyKeyListener(VerifyKeyListener listener) { if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(VerifyKey, listener); + removeListener(ST.VerifyKey, listener); } /** * Removes the specified word movement listener. @@ -7669,8 +7682,8 @@ public void removeVerifyKeyListener(VerifyKeyListener listener) { public void removeWordMovementListener(MovementListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(WordNext, listener); - removeListener(WordPrevious, listener); + removeListener(ST.WordNext, listener); + removeListener(ST.WordPrevious, listener); } /** * Replaces the styles in the given range with new styles. This method @@ -7708,7 +7721,7 @@ public void removeWordMovementListener(MovementListener listener) { */ public void replaceStyleRanges(int start, int length, StyleRange[] ranges) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (ranges == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); setStyleRanges(start, length, null, ranges, false); } @@ -8154,6 +8167,28 @@ public void setAlignment(int alignment) { super.redraw(); } /** + * Set the Always Show Scrollbars flag. True if the scrollbars are + * always shown even if they are not required. False if the scrollbars are only + * visible when some part of the content needs to be scrolled to be seen. + * The H_SCROLL and V_SCROLL style bits are also required to enable scrollbars in the + * horizontal and vertical directions. + * + * @param show true to show the scrollbars even when not required, false to show scrollbars only when required + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> + * </ul> + * + * @ since 3.8 + */ +public void setAlwaysShowScrollBars(boolean show) { + checkWidget(); + if (show == alwaysShowScroll) return; + alwaysShowScroll = show; + setScrollBars(true); +} +/** * @see Control#setBackground(Color) */ public void setBackground(Color color) { @@ -8448,10 +8483,10 @@ public void setCaretOffset(int offset) { void setCaretOffset(int offset, int alignment) { if (caretOffset != offset) { caretOffset = offset; - if (isListening(CaretMoved)) { + if (isListening(ST.CaretMoved)) { StyledTextEvent event = new StyledTextEvent(content); event.end = caretOffset; - notifyListeners(CaretMoved, event); + notifyListeners(ST.CaretMoved, event); } } if (alignment != SWT.DEFAULT) { @@ -8834,7 +8869,7 @@ public void setLeftMargin (int leftMargin) { */ public void setLineAlignment(int startLine, int lineCount, int alignment) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -8885,7 +8920,7 @@ public void setLineAlignment(int startLine, int lineCount, int alignment) { */ public void setLineBackground(int startLine, int lineCount, Color background) { checkWidget(); - if (isListening(LineGetBackground)) return; + if (isListening(ST.LineGetBackground)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -8930,7 +8965,7 @@ public void setLineBackground(int startLine, int lineCount, Color background) { */ public void setLineBullet(int startLine, int lineCount, Bullet bullet) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -8984,7 +9019,7 @@ void setVariableLineHeight () { */ public void setLineIndent(int startLine, int lineCount, int indent) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -9033,7 +9068,7 @@ public void setLineIndent(int startLine, int lineCount, int indent) { */ public void setLineJustify(int startLine, int lineCount, boolean justify) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -9100,7 +9135,7 @@ public void setLineSpacing(int lineSpacing) { */ public void setLineTabStops(int startLine, int lineCount, int[] tabStops) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -9157,7 +9192,7 @@ public void setLineTabStops(int startLine, int lineCount, int[] tabStops) { */ public void setLineWrapIndent(int startLine, int lineCount, int wrapIndent) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (startLine < 0 || startLine + lineCount > content.getLineCount()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } @@ -9271,6 +9306,17 @@ public void setRightMargin (int rightMargin) { checkWidget(); setMargins(leftMargin, topMargin, rightMargin, bottomMargin); } +void setScrollBar(ScrollBar bar, int clientArea, int maximum, int margin) { + int inactive = 1; + if (clientArea < maximum) { + bar.setMaximum(maximum - margin); + bar.setThumb(clientArea - margin); + bar.setPageIncrement(clientArea - margin); + if (!alwaysShowScroll) bar.setVisible(true); + } else if (bar.getThumb() != inactive || bar.getMaximum() != inactive) { + bar.setValues(bar.getSelection(), bar.getMinimum(), inactive, inactive, bar.getIncrement(), inactive); + } +} /** * Adjusts the maximum and the page size of the scroll bars to * reflect content width/length changes. @@ -9278,49 +9324,24 @@ public void setRightMargin (int rightMargin) { * @param vertical indicates if the vertical scrollbar also needs to be set */ void setScrollBars(boolean vertical) { - int inactive = 1; - if (vertical || !isFixedLineHeight()) { - ScrollBar verticalBar = getVerticalBar(); - if (verticalBar != null) { - int maximum = renderer.getHeight(); - // only set the real values if the scroll bar can be used - // (ie. because the thumb size is less than the scroll maximum) - // avoids flashing on Motif, fixes 1G7RE1J and 1G5SE92 - if (clientAreaHeight < maximum) { - verticalBar.setMaximum(maximum - topMargin - bottomMargin); - verticalBar.setThumb(clientAreaHeight - topMargin - bottomMargin); - verticalBar.setPageIncrement(clientAreaHeight - topMargin - bottomMargin); - } else if (verticalBar.getThumb() != inactive || verticalBar.getMaximum() != inactive) { - verticalBar.setValues( - verticalBar.getSelection(), - verticalBar.getMinimum(), - inactive, - inactive, - verticalBar.getIncrement(), - inactive); - } - } - } + ignoreResize++; + if (!isFixedLineHeight() || !alwaysShowScroll) vertical = true; + ScrollBar verticalBar = vertical ? getVerticalBar() : null; ScrollBar horizontalBar = getHorizontalBar(); - if (horizontalBar != null && horizontalBar.getVisible()) { - int maximum = renderer.getWidth(); - // only set the real values if the scroll bar can be used - // (ie. because the thumb size is less than the scroll maximum) - // avoids flashing on Motif, fixes 1G7RE1J and 1G5SE92 - if (clientAreaWidth < maximum) { - horizontalBar.setMaximum(maximum - leftMargin - rightMargin); - horizontalBar.setThumb(clientAreaWidth - leftMargin - rightMargin); - horizontalBar.setPageIncrement(clientAreaWidth - leftMargin - rightMargin); - } else if (horizontalBar.getThumb() != inactive || horizontalBar.getMaximum() != inactive) { - horizontalBar.setValues( - horizontalBar.getSelection(), - horizontalBar.getMinimum(), - inactive, - inactive, - horizontalBar.getIncrement(), - inactive); + if (!alwaysShowScroll) { + if (verticalBar != null) verticalBar.setVisible(false); + if (horizontalBar != null) horizontalBar.setVisible(false); + } + if (verticalBar != null) { + setScrollBar(verticalBar, clientAreaHeight, renderer.getHeight(), topMargin + bottomMargin); + } + if (horizontalBar != null) { + setScrollBar(horizontalBar, clientAreaWidth, renderer.getWidth(), leftMargin + rightMargin); + if (!alwaysShowScroll && horizontalBar.getVisible() && verticalBar != null) { + setScrollBar(verticalBar, clientAreaHeight, renderer.getHeight(), topMargin + bottomMargin); } } + ignoreResize--; } /** * Sets the selection to the given position and scrolls it into view. Equivalent to setSelection(start,start). @@ -9553,7 +9574,7 @@ public void setSelectionRange(int start, int length) { */ public void setStyleRange(StyleRange range) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (range != null) { if (range.isUnstyled()) { setStyleRanges(range.start, range.length, null, null, false); @@ -9601,7 +9622,7 @@ public void setStyleRange(StyleRange range) { */ public void setStyleRanges(int start, int length, int[] ranges, StyleRange[] styles) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (ranges == null || styles == null) { setStyleRanges(start, length, null, null, false); } else { @@ -9643,7 +9664,7 @@ public void setStyleRanges(int start, int length, int[] ranges, StyleRange[] sty */ public void setStyleRanges(int[] ranges, StyleRange[] styles) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (ranges == null || styles == null) { setStyleRanges(0, 0, null, null, true); } else { @@ -9769,7 +9790,7 @@ void setStyleRanges(int start, int length, int[] ranges, StyleRange[] styles, bo */ public void setStyleRanges(StyleRange[] ranges) { checkWidget(); - if (isListening(LineGetStyle)) return; + if (isListening(ST.LineGetStyle)) return; if (ranges == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); setStyleRanges(0, 0, null, ranges, true); } @@ -9865,7 +9886,7 @@ public void setText(String text) { notifyListeners(SWT.Verify, event); if (event.doit) { StyledTextEvent styledTextEvent = null; - if (isListening(ExtendedModify)) { + if (isListening(ST.ExtendedModify)) { styledTextEvent = new StyledTextEvent(content); styledTextEvent.start = event.start; styledTextEvent.end = event.start + event.text.length(); @@ -9874,7 +9895,7 @@ public void setText(String text) { content.setText(event.text); notifyListeners(SWT.Modify, event); if (styledTextEvent != null) { - notifyListeners(ExtendedModify, styledTextEvent); + notifyListeners(ST.ExtendedModify, styledTextEvent); } } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextContent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextContent.java index 0e6728cf34..0e6728cf34 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextContent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextContent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java index 98ee4ef27e..98ee4ef27e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java index d9f026b5dd..3403000c55 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java @@ -28,22 +28,22 @@ StyledTextListener(SWTEventListener listener) { public void handleEvent(Event e) { switch (e.type) { - case StyledText.ExtendedModify: + case ST.ExtendedModify: ExtendedModifyEvent extendedModifyEvent = new ExtendedModifyEvent((StyledTextEvent) e); ((ExtendedModifyListener) eventListener).modifyText(extendedModifyEvent); break; - case StyledText.LineGetBackground: + case ST.LineGetBackground: LineBackgroundEvent lineBgEvent = new LineBackgroundEvent((StyledTextEvent) e); ((LineBackgroundListener) eventListener).lineGetBackground(lineBgEvent); ((StyledTextEvent) e).lineBackground = lineBgEvent.lineBackground; break; - case StyledText.LineGetSegments: + case ST.LineGetSegments: BidiSegmentEvent segmentEvent = new BidiSegmentEvent((StyledTextEvent) e); ((BidiSegmentListener) eventListener).lineGetSegments(segmentEvent); ((StyledTextEvent) e).segments = segmentEvent.segments; ((StyledTextEvent) e).segmentsChars = segmentEvent.segmentsChars; break; - case StyledText.LineGetStyle: + case ST.LineGetStyle: LineStyleEvent lineStyleEvent = new LineStyleEvent((StyledTextEvent) e); ((LineStyleListener) eventListener).lineGetStyle(lineStyleEvent); ((StyledTextEvent) e).ranges = lineStyleEvent.ranges; @@ -56,42 +56,42 @@ public void handleEvent(Event e) { ((StyledTextEvent) e).bulletIndex = lineStyleEvent.bulletIndex; ((StyledTextEvent) e).tabStops = lineStyleEvent.tabStops; break; - case StyledText.PaintObject: + case ST.PaintObject: PaintObjectEvent paintObjectEvent = new PaintObjectEvent((StyledTextEvent) e); ((PaintObjectListener) eventListener).paintObject(paintObjectEvent); break; - case StyledText.VerifyKey: + case ST.VerifyKey: VerifyEvent verifyEvent = new VerifyEvent(e); ((VerifyKeyListener) eventListener).verifyKey(verifyEvent); e.doit = verifyEvent.doit; break; - case StyledText.TextChanged: { + case ST.TextChanged: { TextChangedEvent textChangedEvent = new TextChangedEvent((StyledTextContent) e.data); ((TextChangeListener) eventListener).textChanged(textChangedEvent); break; } - case StyledText.TextChanging: + case ST.TextChanging: TextChangingEvent textChangingEvent = new TextChangingEvent((StyledTextContent) e.data, (StyledTextEvent) e); ((TextChangeListener) eventListener).textChanging(textChangingEvent); break; - case StyledText.TextSet: { + case ST.TextSet: { TextChangedEvent textChangedEvent = new TextChangedEvent((StyledTextContent) e.data); ((TextChangeListener) eventListener).textSet(textChangedEvent); break; } - case StyledText.WordNext: { + case ST.WordNext: { MovementEvent wordBoundaryEvent = new MovementEvent((StyledTextEvent) e); ((MovementListener) eventListener).getNextOffset(wordBoundaryEvent); ((StyledTextEvent) e).end = wordBoundaryEvent.newOffset; break; } - case StyledText.WordPrevious: { + case ST.WordPrevious: { MovementEvent wordBoundaryEvent = new MovementEvent((StyledTextEvent) e); ((MovementListener) eventListener).getPreviousOffset(wordBoundaryEvent); ((StyledTextEvent) e).end = wordBoundaryEvent.newOffset; break; } - case StyledText.CaretMoved: { + case ST.CaretMoved: { CaretEvent caretEvent = new CaretEvent((StyledTextEvent) e); ((CaretListener) eventListener).caretMoved(caretEvent); ((StyledTextEvent) e).end = caretEvent.caretOffset; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java index 05278af291..05278af291 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTree.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTree.java index 4ac4da4a09..4ac4da4a09 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTree.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeEditor.java index 792527b1cf..792527b1cf 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeEditor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeItem.java index 83c2fc8422..83c2fc8422 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java index a7c53a855c..a7c53a855c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangedEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangedEvent.java index 0cacf8a6f7..0cacf8a6f7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangedEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangedEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangingEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangingEvent.java index cf109a27dc..cf109a27dc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangingEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangingEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java index de4f7b2f4f..de4f7b2f4f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java index 6d308aecf0..6d308aecf0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java index 55c1915ff3..55c1915ff3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/package.html b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/package.html index 3011a3feef..3011a3feef 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DND.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DND.java index 0cfec0aa24..0cfec0aa24 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DND.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DND.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDEvent.java index b74fd2746c..b74fd2746c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java index 9c5717314c..9c5717314c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceAdapter.java index 662b9572c2..662b9572c2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceEvent.java index 93367686f9..93367686f9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java index 0ce0aa71b2..0ce0aa71b2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetAdapter.java index ec57ad9f9f..ec57ad9f9f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java index 3b38964723..3b38964723 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java index 9f30c84888..9f30c84888 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/package.html b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/package.html index 6773fd54f5..6773fd54f5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/ByteArrayTransfer.java index 000bf58658..000bf58658 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/ByteArrayTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Clipboard.java index 7c0068a0f2..7c0068a0f2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Clipboard.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DragSource.java index ccdc81e613..ccdc81e613 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DragSource.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DropTarget.java index 6076d943f1..6076d943f1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DropTarget.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/FileTransfer.java index c9a62703bd..c9a62703bd 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/FileTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/RTFTransfer.java index 4d6b3e4204..4d6b3e4204 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/RTFTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TextTransfer.java index f61960f492..f61960f492 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TextTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Transfer.java index c1572a3449..c1572a3449 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Transfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Transfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TransferData.java index 60d6bef353..60d6bef353 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TransferData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TransferData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/ByteArrayTransfer.java index 1edd91b5bc..1edd91b5bc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/ByteArrayTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Clipboard.java index 31a2ab9015..31a2ab9015 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Clipboard.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DragSource.java index 08a78aa406..08a78aa406 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DragSource.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DropTarget.java index c21cdce158..c21cdce158 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DropTarget.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/FileTransfer.java index c6bd1e434e..c6bd1e434e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/FileTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/RTFTransfer.java index dca2bd4103..dca2bd4103 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/RTFTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TextTransfer.java index 056d74aad0..056d74aad0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TextTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Transfer.java index 592cd69149..592cd69149 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Transfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Transfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TransferData.java index 03766a918a..03766a918a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TransferData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TransferData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java index d33f8815ae..d33f8815ae 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java index 913d7d839e..913d7d839e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java index 4e83e954f1..4e83e954f1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java index fe7785ec2e..fe7785ec2e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java index 8acb6456d1..8acb6456d1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java index b4f06ff70e..b4f06ff70e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java index f8da4986c4..f8da4986c4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java index 97b3a177b8..97b3a177b8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java index 4a7f318b21..4a7f318b21 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java index aa9fbe7418..aa9fbe7418 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java index ed79dec786..ed79dec786 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h index 5e7e33d8e5..5b0554c676 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h @@ -28,6 +28,8 @@ #include "nsIScriptGlobalObject.h" #endif /* nsIScriptContext_h__ */ +#define XPCOM_LOAD_FUNCTION LOAD_FUNCTION + #ifdef _WIN32 #define STDMETHODCALLTYPE __stdcall #define NO__1NS_1InitXPCOM2 diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp index 78e2a00dc1..f61d97b078 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp @@ -55,7 +55,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals) { #ifdef _WIN32 - LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals) + XPCOM_LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals) if (fp) { rc = (jint)((jint (*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7); } @@ -99,7 +99,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1Free) { #ifdef _WIN32 - LOAD_FUNCTION(fp, NS_Free) + XPCOM_LOAD_FUNCTION(fp, NS_Free) if (fp) { ((jint (*)(void *))fp)((void *)arg0); rc = 1; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h index e80c00a021..e80c00a021 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index 150635f476..bea10f2751 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -83,7 +83,8 @@ class Mozilla extends WebBrowser { static final char SEPARATOR_OS = System.getProperty ("file.separator").charAt (0); //$NON-NLS-1$ static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$ static final String DISPOSE_LISTENER_HOOKED = "org.eclipse.swt.browser.Mozilla.disposeListenerHooked"; //$NON-NLS-1$ - static final String HEADER_CONTENTTYPE = "Content-Type"; //$NON-NLS-1 + static final String HEADER_CONTENTLENGTH = "content-length"; //$NON-NLS-1 + static final String HEADER_CONTENTTYPE = "content-type"; //$NON-NLS-1 static final String MIMETYPE_FORMURLENCODED = "application/x-www-form-urlencoded"; //$NON-NLS-1$ static final String PREFIX_JAVASCRIPT = "javascript:"; //$NON-NLS-1$ static final String PREFERENCE_CHARSET = "intl.charset.default"; //$NON-NLS-1$ @@ -2819,12 +2820,30 @@ public boolean setUrl (String url, String postData, String[] headers) { postDataStream = new nsIMIMEInputStream (result[0]); rc = postDataStream.SetData (dataStream.getAddress ()); if (rc != XPCOM.NS_OK) error (rc); - rc = postDataStream.SetAddContentLength (1); - if (rc != XPCOM.NS_OK) error (rc); - byte[] name = MozillaDelegate.wcsToMbcs (null, HEADER_CONTENTTYPE, true); - byte[] value = MozillaDelegate.wcsToMbcs (null, MIMETYPE_FORMURLENCODED, true); - rc = postDataStream.AddHeader (name, value); + + boolean foundLength = false; + boolean foundType = false; + if (headers != null) { + for (int i = 0; i < headers.length; i++) { + int index = headers[i].indexOf (':'); + if (index != -1) { + String name = headers[i].substring (0, index).trim ().toLowerCase (); + if (name.equals (HEADER_CONTENTLENGTH)) { + foundLength = true; + } else if (name.equals (HEADER_CONTENTTYPE)) { + foundType = true; + } + } + } + } + rc = postDataStream.SetAddContentLength (foundLength ? 0 : 1); if (rc != XPCOM.NS_OK) error (rc); + if (!foundType) { + byte[] name = MozillaDelegate.wcsToMbcs (null, HEADER_CONTENTTYPE, true); + byte[] value = MozillaDelegate.wcsToMbcs (null, MIMETYPE_FORMURLENCODED, true); + rc = postDataStream.AddHeader (name, value); + if (rc != XPCOM.NS_OK) error (rc); + } } result[0] = 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java index 63ed2a3d1d..63ed2a3d1d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java index ba0c32ac15..ba0c32ac15 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java index b3fc9fbc75..b3fc9fbc75 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java index 943cb3318e..943cb3318e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java index bb29d26cd3..bb29d26cd3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java index 62cf4b11c4..62cf4b11c4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index f05b576148..f05b576148 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java index b5dda3f6ca..b5dda3f6ca 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEvent.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEvent.java index 41010afc33..41010afc33 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java index ae94cf4103..ae94cf4103 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java index 1676b2f66d..1676b2f66d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java index 560d7927e5..560d7927e5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFunctionDescription.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFunctionDescription.java index 2a65fa9121..2a65fa9121 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFunctionDescription.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFunctionDescription.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleListener.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleListener.java index ef094cbe3e..ef094cbe3e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleParameterDescription.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleParameterDescription.java index 056525a53e..056525a53e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleParameterDescription.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleParameterDescription.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java index 98ca8a8a2a..98ca8a8a2a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyDescription.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyDescription.java index 5ce315ff15..5ce315ff15 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyDescription.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyDescription.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java index d7a541f2cf..d7a541f2cf 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/package.html b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/package.html index 93c5fd16a4..93c5fd16a4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/org/eclipse/swt/opengl/GLCanvas.java index 308bdfab05..308bdfab05 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/org/eclipse/swt/opengl/GLCanvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/org/eclipse/swt/opengl/GLCanvas.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java index f30a7df4a1..f30a7df4a1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/common/org/eclipse/swt/opengl/package.html b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/common/org/eclipse/swt/opengl/package.html index 3ad94aefab..3ad94aefab 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/common/org/eclipse/swt/opengl/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/common/org/eclipse/swt/opengl/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java index 4f1d979490..4f1d979490 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java index 8faa6cfca2..8faa6cfca2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java index 49d2361d76..49d2361d76 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/PIXELFORMATDESCRIPTOR.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/PIXELFORMATDESCRIPTOR.java index 29024643b1..29024643b1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/PIXELFORMATDESCRIPTOR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/PIXELFORMATDESCRIPTOR.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java index 4904161221..4904161221 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c index f12c814aa9..8f64b70eea 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c @@ -1032,7 +1032,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size) cairo_pdf_surface_set_size((cairo_surface_t *)arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, cairo_pdf_surface_set_size) + Cairo_LOAD_FUNCTION(fp, cairo_pdf_surface_set_size) if (fp) { ((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2); } @@ -1050,7 +1050,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size) cairo_ps_surface_set_size((cairo_surface_t *)arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, cairo_ps_surface_set_size) + Cairo_LOAD_FUNCTION(fp, cairo_ps_surface_set_size) if (fp) { ((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2); } @@ -1510,7 +1510,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type) rc = (jint)cairo_surface_get_type((cairo_surface_t *)arg0); */ { - LOAD_FUNCTION(fp, cairo_surface_get_type) + Cairo_LOAD_FUNCTION(fp, cairo_surface_get_type) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(cairo_surface_t *))fp)((cairo_surface_t *)arg0); } @@ -1561,7 +1561,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution) cairo_surface_set_fallback_resolution(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, cairo_surface_set_fallback_resolution) + Cairo_LOAD_FUNCTION(fp, cairo_surface_set_fallback_resolution) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jdouble))fp)(arg0, arg1, arg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h index 0500b3bca1..9b3cf2fc19 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h @@ -29,4 +29,6 @@ #include "cairo_custom.h" +#define Cairo_LOAD_FUNCTION LOAD_FUNCTION + #endif /* INC_cairo_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h index 9d08cda12d..9d08cda12d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh index 776c23adf7..776c23adf7 100644..100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c index b79006f6a8..0672bb797a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -27,7 +27,7 @@ JNIEXPORT jint JNICALL Cocoa_NATIVE(HICocoaViewCreate) rc = (jint)HICocoaViewCreate(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, HICocoaViewCreate) + Cocoa_LOAD_FUNCTION(fp, HICocoaViewCreate) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint *))fp)(arg0, arg1, lparg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h index a57d4b0a06..8811735312 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h @@ -20,6 +20,8 @@ #include "cocoa_custom.h" +#define Cocoa_LOAD_FUNCTION LOAD_FUNCTION + #ifndef __i386__ #define objc_msgSend_fpret objc_msgSend #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.c index 43c9cab090..43c9cab090 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.c diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.h index d57df2d879..d57df2d879 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.h diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c index 0e88a7fd1e..c824f03483 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c @@ -993,7 +993,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AXUIElementCreateWithDataBrowserAndItemInfo) rc = (jint)AXUIElementCreateWithDataBrowserAndItemInfo(arg0, lparg1); */ { - LOAD_FUNCTION(fp, AXUIElementCreateWithDataBrowserAndItemInfo) + OS_LOAD_FUNCTION(fp, AXUIElementCreateWithDataBrowserAndItemInfo) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, DataBrowserAccessibilityItemInfo *))fp)(arg0, lparg1); } @@ -1029,7 +1029,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AXUIElementGetDataBrowserItemInfo) rc = (jint)AXUIElementGetDataBrowserItemInfo(arg0, arg1, arg2, lparg3); */ { - LOAD_FUNCTION(fp, AXUIElementGetDataBrowserItemInfo) + OS_LOAD_FUNCTION(fp, AXUIElementGetDataBrowserItemInfo) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, DataBrowserAccessibilityItemInfo *))fp)(arg0, arg1, arg2, lparg3); } @@ -1950,7 +1950,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGBitmapContextCreateImage) rc = (jint)CGBitmapContextCreateImage(arg0); */ { - LOAD_FUNCTION(fp, CGBitmapContextCreateImage) + OS_LOAD_FUNCTION(fp, CGBitmapContextCreateImage) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -2329,7 +2329,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetBlendMode) CGContextSetBlendMode((CGContextRef)arg0, arg1); */ { - LOAD_FUNCTION(fp, CGContextSetBlendMode) + OS_LOAD_FUNCTION(fp, CGContextSetBlendMode) if (fp) { ((void (CALLING_CONVENTION*)(CGContextRef, jint))fp)((CGContextRef)arg0, arg1); } @@ -2758,7 +2758,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayCreateImage) rc = (jintLong)CGDisplayCreateImage((CGDirectDisplayID)arg0); */ { - LOAD_FUNCTION(fp, CGDisplayCreateImage) + OS_LOAD_FUNCTION(fp, CGDisplayCreateImage) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); } @@ -2922,7 +2922,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGImageCreateCopy) rc = (jint)CGImageCreateCopy(arg0); */ { - LOAD_FUNCTION(fp, CGImageCreateCopy) + OS_LOAD_FUNCTION(fp, CGImageCreateCopy) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -2944,7 +2944,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGImageCreateWithImageInRect) rc = (jint)CGImageCreateWithImageInRect(arg0, *lparg1); */ { - LOAD_FUNCTION(fp, CGImageCreateWithImageInRect) + OS_LOAD_FUNCTION(fp, CGImageCreateWithImageInRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, CGRect))fp)(arg0, *lparg1); } @@ -4384,7 +4384,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserChangeAttributes) rc = (jint)DataBrowserChangeAttributes(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, DataBrowserChangeAttributes) + OS_LOAD_FUNCTION(fp, DataBrowserChangeAttributes) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint))fp)(arg0, arg1, arg2); } @@ -4406,7 +4406,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserGetAttributes) rc = (jint)DataBrowserGetAttributes(arg0, lparg1); */ { - LOAD_FUNCTION(fp, DataBrowserGetAttributes) + OS_LOAD_FUNCTION(fp, DataBrowserGetAttributes) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint *))fp)(arg0, lparg1); } @@ -4432,7 +4432,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserGetMetric) rc = (jint)DataBrowserGetMetric(arg0, arg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, DataBrowserGetMetric) + OS_LOAD_FUNCTION(fp, DataBrowserGetMetric) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jboolean *, jfloat *))fp)(arg0, arg1, lparg2, lparg3); } @@ -4455,7 +4455,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserSetMetric) rc = (jint)DataBrowserSetMetric(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, DataBrowserSetMetric) + OS_LOAD_FUNCTION(fp, DataBrowserSetMetric) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jboolean, jfloat))fp)(arg0, arg1, arg2, arg3); } @@ -6594,7 +6594,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromIconFamilyPtr) rc = (jint)GetIconRefFromIconFamilyPtr(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, GetIconRefFromIconFamilyPtr) + OS_LOAD_FUNCTION(fp, GetIconRefFromIconFamilyPtr) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint *))fp)(arg0, arg1, lparg2); } @@ -7639,7 +7639,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HIComboBoxIsListVisible) rc = (jboolean)HIComboBoxIsListVisible((HIViewRef)arg0); */ { - LOAD_FUNCTION(fp, HIComboBoxIsListVisible) + OS_LOAD_FUNCTION(fp, HIComboBoxIsListVisible) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HIViewRef))fp)((HIViewRef)arg0); } @@ -7671,7 +7671,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIComboBoxSetListVisible) rc = (jint)HIComboBoxSetListVisible((HIViewRef)arg0, arg1); */ { - LOAD_FUNCTION(fp, HIComboBoxSetListVisible) + OS_LOAD_FUNCTION(fp, HIComboBoxSetListVisible) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HIViewRef, jboolean))fp)((HIViewRef)arg0, arg1); } @@ -7705,7 +7705,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HICreateTransformedCGImage) rc = (jint)HICreateTransformedCGImage((CGImageRef)arg0, arg1, (CGImageRef *)lparg2); */ { - LOAD_FUNCTION(fp, HICreateTransformedCGImage) + OS_LOAD_FUNCTION(fp, HICreateTransformedCGImage) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(CGImageRef, jint, CGImageRef *))fp)((CGImageRef)arg0, arg1, (CGImageRef *)lparg2); } @@ -7913,7 +7913,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeCreateWithQDRgn) rc = (jint)HIShapeCreateWithQDRgn(arg0); */ { - LOAD_FUNCTION(fp, HIShapeCreateWithQDRgn) + OS_LOAD_FUNCTION(fp, HIShapeCreateWithQDRgn) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -7933,7 +7933,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeReplacePathInCGContext) rc = (jint)HIShapeReplacePathInCGContext(arg0, arg1); */ { - LOAD_FUNCTION(fp, HIShapeReplacePathInCGContext) + OS_LOAD_FUNCTION(fp, HIShapeReplacePathInCGContext) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1); } @@ -8486,7 +8486,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeSetFill) rc = (jint)HIThemeSetFill((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3); */ { - LOAD_FUNCTION(fp, HIThemeSetFill) + OS_LOAD_FUNCTION(fp, HIThemeSetFill) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(ThemeBrush, void *, CGContextRef, HIThemeOrientation))fp)((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3); } @@ -8506,7 +8506,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeSetTextFill) rc = (jint)HIThemeSetTextFill(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, HIThemeSetTextFill) + OS_LOAD_FUNCTION(fp, HIThemeSetTextFill) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3); } @@ -9746,7 +9746,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LSCopyAllRoleHandlersForContentType) rc = (jint)LSCopyAllRoleHandlersForContentType((CFStringRef)arg0, arg1); */ { - LOAD_FUNCTION(fp, LSCopyAllRoleHandlersForContentType) + OS_LOAD_FUNCTION(fp, LSCopyAllRoleHandlersForContentType) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(CFStringRef, jint))fp)((CFStringRef)arg0, arg1); } @@ -10139,7 +10139,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(NavDialogSetFilterTypeIdentifiers) rc = (jint)NavDialogSetFilterTypeIdentifiers(arg0, arg1); */ { - LOAD_FUNCTION(fp, NavDialogSetFilterTypeIdentifiers) + OS_LOAD_FUNCTION(fp, NavDialogSetFilterTypeIdentifiers) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1); } @@ -10643,7 +10643,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PMPrinterGetOutputResolution) rc = (jint)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); */ { - LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) + OS_LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); } @@ -11059,7 +11059,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PMShowPrintDialogWithOptions) rc = (jint)PMShowPrintDialogWithOptions(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, PMShowPrintDialogWithOptions) + OS_LOAD_FUNCTION(fp, PMShowPrintDialogWithOptions) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, jint, jboolean *))fp)(arg0, arg1, arg2, arg3, lparg4); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h index f7c7b1ce28..1704ce45b1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h @@ -22,6 +22,8 @@ #include "os_custom.h" +#define OS_LOAD_FUNCTION LOAD_FUNCTION + extern jint CPSEnableForegroundOperation(jint *, jint, jint, jint, jint); extern jint CPSSetProcessName(jint *, jbyte *); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java index a1b3b9f128..a1b3b9f128 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/NSSize.java index a9b2d3150b..a9b2d3150b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/NSSize.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/NSSize.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak index 3173424d0a..3173424d0a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak 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 7b91d4e421..f3fc72488d 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 @@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ATSFontActivateFromFileReference) rc = (jint)ATSFontActivateFromFileReference((const FSRef *)lparg0, (ATSFontContext)arg1, (ATSFontFormat)arg2, (void *)arg3, (ATSOptionFlags)arg4, (ATSFontContainerRef *)lparg5); */ { - LOAD_FUNCTION(fp, ATSFontActivateFromFileReference) + OS_LOAD_FUNCTION(fp, ATSFontActivateFromFileReference) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const FSRef *, ATSFontContext, ATSFontFormat, void *, ATSOptionFlags, ATSFontContainerRef *))fp)((const FSRef *)lparg0, (ATSFontContext)arg1, (ATSFontFormat)arg2, (void *)arg3, (ATSOptionFlags)arg4, (ATSFontContainerRef *)lparg5); } @@ -52,7 +52,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(AcquireRootMenu) rc = (jintLong)AcquireRootMenu(); */ { - LOAD_FUNCTION(fp, AcquireRootMenu) + OS_LOAD_FUNCTION(fp, AcquireRootMenu) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -1314,7 +1314,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGContextCopyPath) rc = (jintLong)CGContextCopyPath(arg0); */ { - LOAD_FUNCTION(fp, CGContextCopyPath) + OS_LOAD_FUNCTION(fp, CGContextCopyPath) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -1337,7 +1337,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextCopyWindowContentsToRect) CGContextCopyWindowContentsToRect(arg0, *lparg1, arg2, arg3, *lparg4); */ { - LOAD_FUNCTION(fp, CGContextCopyWindowContentsToRect) + OS_LOAD_FUNCTION(fp, CGContextCopyWindowContentsToRect) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, CGRect, jintLong, jintLong, CGRect))fp)(arg0, *lparg1, arg2, arg3, *lparg4); } @@ -1669,7 +1669,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayCreateImage) rc = (jintLong)CGDisplayCreateImage((CGDirectDisplayID)arg0); */ { - LOAD_FUNCTION(fp, CGDisplayCreateImage) + OS_LOAD_FUNCTION(fp, CGDisplayCreateImage) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); } @@ -2207,7 +2207,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CancelMenuTracking) rc = (jint)CancelMenuTracking(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, CancelMenuTracking) + OS_LOAD_FUNCTION(fp, CancelMenuTracking) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jboolean, jint))fp)(arg0, arg1, arg2); } @@ -2226,7 +2226,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CloseRgn) CloseRgn(arg0); */ { - LOAD_FUNCTION(fp, CloseRgn) + OS_LOAD_FUNCTION(fp, CloseRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2244,7 +2244,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CopyRgn) CopyRgn(arg0, arg1); */ { - LOAD_FUNCTION(fp, CopyRgn) + OS_LOAD_FUNCTION(fp, CopyRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -2272,7 +2272,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DeleteMenuItem) DeleteMenuItem((MenuRef)arg0, (short)arg1); */ { - LOAD_FUNCTION(fp, DeleteMenuItem) + OS_LOAD_FUNCTION(fp, DeleteMenuItem) if (fp) { ((void (CALLING_CONVENTION*)(MenuRef, short))fp)((MenuRef)arg0, (short)arg1); } @@ -2290,7 +2290,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DiffRgn) DiffRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, DiffRgn) + OS_LOAD_FUNCTION(fp, DiffRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -2308,7 +2308,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn) DisposeRgn(arg0); */ { - LOAD_FUNCTION(fp, DisposeRgn) + OS_LOAD_FUNCTION(fp, DisposeRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2327,7 +2327,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn) rc = (jboolean)EmptyRgn(arg0); */ { - LOAD_FUNCTION(fp, EmptyRgn) + OS_LOAD_FUNCTION(fp, EmptyRgn) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2351,7 +2351,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(FSPathMakeRef) rc = (jint)FSPathMakeRef((const UInt8 *)arg0, (FSRef *)lparg1, (Boolean *)lparg2); */ { - LOAD_FUNCTION(fp, FSPathMakeRef) + OS_LOAD_FUNCTION(fp, FSPathMakeRef) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const UInt8 *, FSRef *, Boolean *))fp)((const UInt8 *)arg0, (FSRef *)lparg1, (Boolean *)lparg2); } @@ -2390,7 +2390,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentEventButtonState) rc = (jint)GetCurrentEventButtonState(); */ { - LOAD_FUNCTION(fp, GetCurrentEventButtonState) + OS_LOAD_FUNCTION(fp, GetCurrentEventButtonState) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -2426,7 +2426,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDblTime) rc = (jint)GetDblTime(); */ { - LOAD_FUNCTION(fp, GetDblTime) + OS_LOAD_FUNCTION(fp, GetDblTime) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -2448,7 +2448,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromTypeInfo) rc = (jint)GetIconRefFromTypeInfo((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (IconServicesUsageFlags)arg4, (IconRef *)lparg5); */ { - LOAD_FUNCTION(fp, GetIconRefFromTypeInfo) + OS_LOAD_FUNCTION(fp, GetIconRefFromTypeInfo) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(OSType, OSType, CFStringRef, CFStringRef, IconServicesUsageFlags, IconRef *))fp)((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (IconServicesUsageFlags)arg4, (IconRef *)lparg5); } @@ -2474,7 +2474,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIndMenuItemWithCommandID) rc = (jint)GetIndMenuItemWithCommandID((MenuRef)arg0, (MenuCommand)arg1, (UInt32)arg2, (MenuRef *)lparg3, (MenuItemIndex *)lparg4); */ { - LOAD_FUNCTION(fp, GetIndMenuItemWithCommandID) + OS_LOAD_FUNCTION(fp, GetIndMenuItemWithCommandID) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(MenuRef, MenuCommand, UInt32, MenuRef *, MenuItemIndex *))fp)((MenuRef)arg0, (MenuCommand)arg1, (UInt32)arg2, (MenuRef *)lparg3, (MenuItemIndex *)lparg4); } @@ -2498,7 +2498,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GetRegionBounds) GetRegionBounds(arg0, lparg1); */ { - LOAD_FUNCTION(fp, GetRegionBounds) + OS_LOAD_FUNCTION(fp, GetRegionBounds) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1); } @@ -2523,7 +2523,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSystemUIMode) rc = (jint)GetSystemUIMode((UInt32*)lparg0, (UInt32*)lparg1); */ { - LOAD_FUNCTION(fp, GetSystemUIMode) + OS_LOAD_FUNCTION(fp, GetSystemUIMode) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(UInt32*, UInt32*))fp)((UInt32*)lparg0, (UInt32*)lparg1); } @@ -2547,7 +2547,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GetThemeMetric) GetThemeMetric(arg0, (SInt32 *)lparg1); */ { - LOAD_FUNCTION(fp, GetThemeMetric) + OS_LOAD_FUNCTION(fp, GetThemeMetric) if (fp) { ((void (CALLING_CONVENTION*)(jint, SInt32 *))fp)(arg0, (SInt32 *)lparg1); } @@ -2570,7 +2570,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeDrawFocusRect) rc = (jint)HIThemeDrawFocusRect(lparg0, arg1, (CGContextRef)arg2, arg3); */ { - LOAD_FUNCTION(fp, HIThemeDrawFocusRect) + OS_LOAD_FUNCTION(fp, HIThemeDrawFocusRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(CGRect *, jboolean, CGContextRef, jint))fp)(lparg0, arg1, (CGContextRef)arg2, arg3); } @@ -2592,7 +2592,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIWindowGetCGWindowID) rc = (jint)HIWindowGetCGWindowID((WindowRef)arg0); */ { - LOAD_FUNCTION(fp, HIWindowGetCGWindowID) + OS_LOAD_FUNCTION(fp, HIWindowGetCGWindowID) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(WindowRef))fp)((WindowRef)arg0); } @@ -2654,7 +2654,7 @@ JNIEXPORT jbyte JNICALL OS_NATIVE(LMGetKbdType) rc = (jbyte)LMGetKbdType(); */ { - LOAD_FUNCTION(fp, LMGetKbdType) + OS_LOAD_FUNCTION(fp, LMGetKbdType) if (fp) { rc = (jbyte)((jbyte (CALLING_CONVENTION*)())fp)(); } @@ -2692,7 +2692,7 @@ JNIEXPORT void JNICALL OS_NATIVE(LineTo) LineTo(arg0, arg1); */ { - LOAD_FUNCTION(fp, LineTo) + OS_LOAD_FUNCTION(fp, LineTo) if (fp) { ((void (CALLING_CONVENTION*)(jshort, jshort))fp)(arg0, arg1); } @@ -2710,7 +2710,7 @@ JNIEXPORT void JNICALL OS_NATIVE(MoveTo) MoveTo(arg0, arg1); */ { - LOAD_FUNCTION(fp, MoveTo) + OS_LOAD_FUNCTION(fp, MoveTo) if (fp) { ((void (CALLING_CONVENTION*)(jshort, jshort))fp)(arg0, arg1); } @@ -5419,7 +5419,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NewRgn) rc = (jintLong)NewRgn(); */ { - LOAD_FUNCTION(fp, NewRgn) + OS_LOAD_FUNCTION(fp, NewRgn) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -5438,7 +5438,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OffsetRgn) OffsetRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, OffsetRgn) + OS_LOAD_FUNCTION(fp, OffsetRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jshort, jshort))fp)(arg0, arg1, arg2); } @@ -5456,7 +5456,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OpenRgn) OpenRgn(); */ { - LOAD_FUNCTION(fp, OpenRgn) + OS_LOAD_FUNCTION(fp, OpenRgn) if (fp) { ((void (CALLING_CONVENTION*)())fp)(); } @@ -5477,7 +5477,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMGetDuplex) rc = (jintLong)PMGetDuplex((PMPrintSettings)arg0, (PMDuplexMode *)lparg1); */ { - LOAD_FUNCTION(fp, PMGetDuplex) + OS_LOAD_FUNCTION(fp, PMGetDuplex) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode *))fp)((PMPrintSettings)arg0, (PMDuplexMode *)lparg1); } @@ -5501,7 +5501,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetIndexedPrinterResolution) rc = (jintLong)PMPrinterGetIndexedPrinterResolution((PMPrinter)arg0, arg1, (PMResolution *)lparg2); */ { - LOAD_FUNCTION(fp, PMPrinterGetIndexedPrinterResolution) + OS_LOAD_FUNCTION(fp, PMPrinterGetIndexedPrinterResolution) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, jint, PMResolution *))fp)((PMPrinter)arg0, arg1, (PMResolution *)lparg2); } @@ -5525,7 +5525,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetOutputResolution) rc = (jintLong)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); */ { - LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) + OS_LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); } @@ -5549,7 +5549,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetPrinterResolutionCount) rc = (jintLong)PMPrinterGetPrinterResolutionCount((PMPrinter)arg0, lparg1); */ { - LOAD_FUNCTION(fp, PMPrinterGetPrinterResolutionCount) + OS_LOAD_FUNCTION(fp, PMPrinterGetPrinterResolutionCount) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, jint *))fp)((PMPrinter)arg0, lparg1); } @@ -5573,7 +5573,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSessionGetCurrentPrinter) rc = (jintLong)PMSessionGetCurrentPrinter((PMPrintSession)arg0, (PMPrinter *)lparg1); */ { - LOAD_FUNCTION(fp, PMSessionGetCurrentPrinter) + OS_LOAD_FUNCTION(fp, PMSessionGetCurrentPrinter) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSession, PMPrinter *))fp)((PMPrintSession)arg0, (PMPrinter *)lparg1); } @@ -5597,7 +5597,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSessionGetDestinationType) rc = (jintLong)PMSessionGetDestinationType((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2); */ { - LOAD_FUNCTION(fp, PMSessionGetDestinationType) + OS_LOAD_FUNCTION(fp, PMSessionGetDestinationType) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSession, PMPrintSettings, jshort *))fp)((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2); } @@ -5619,7 +5619,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSetDuplex) rc = (jintLong)PMSetDuplex((PMPrintSettings)arg0, (PMDuplexMode)arg1); */ { - LOAD_FUNCTION(fp, PMSetDuplex) + OS_LOAD_FUNCTION(fp, PMSetDuplex) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode))fp)((PMPrintSettings)arg0, (PMDuplexMode)arg1); } @@ -5641,7 +5641,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRgn) rc = (jboolean)PtInRgn(*(Point *)lparg0, arg1); */ { - LOAD_FUNCTION(fp, PtInRgn) + OS_LOAD_FUNCTION(fp, PtInRgn) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(Point, jintLong))fp)(*(Point *)lparg0, arg1); } @@ -5663,7 +5663,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects) rc = (jint)QDRegionToRects(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, QDRegionToRects) + OS_LOAD_FUNCTION(fp, QDRegionToRects) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); } @@ -5685,7 +5685,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRgn) rc = (jboolean)RectInRgn(lparg0, arg1); */ { - LOAD_FUNCTION(fp, RectInRgn) + OS_LOAD_FUNCTION(fp, RectInRgn) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jshort *, jintLong))fp)(lparg0, arg1); } @@ -5708,7 +5708,7 @@ JNIEXPORT void JNICALL OS_NATIVE(RectRgn) RectRgn(arg0, lparg1); */ { - LOAD_FUNCTION(fp, RectRgn) + OS_LOAD_FUNCTION(fp, RectRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1); } @@ -5776,7 +5776,7 @@ JNIEXPORT void JNICALL OS_NATIVE(SectRgn) SectRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, SectRgn) + OS_LOAD_FUNCTION(fp, SectRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -5812,7 +5812,7 @@ JNIEXPORT void JNICALL OS_NATIVE(SetRect) SetRect(lparg0, arg1, arg2, arg3, arg4); */ { - LOAD_FUNCTION(fp, SetRect) + OS_LOAD_FUNCTION(fp, SetRect) if (fp) { ((void (CALLING_CONVENTION*)(jshort *, jshort, jshort, jshort, jshort))fp)(lparg0, arg1, arg2, arg3, arg4); } @@ -5833,7 +5833,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetSystemUIMode) rc = (jint)SetSystemUIMode((UInt32)arg0, (UInt32)arg1); */ { - LOAD_FUNCTION(fp, SetSystemUIMode) + OS_LOAD_FUNCTION(fp, SetSystemUIMode) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(UInt32, UInt32))fp)((UInt32)arg0, (UInt32)arg1); } @@ -5853,7 +5853,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetThemeCursor) rc = (jint)SetThemeCursor(arg0); */ { - LOAD_FUNCTION(fp, SetThemeCursor) + OS_LOAD_FUNCTION(fp, SetThemeCursor) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -5873,7 +5873,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(TISCopyCurrentKeyboardInputSource) rc = (jintLong)TISCopyCurrentKeyboardInputSource(); */ { - LOAD_FUNCTION(fp, TISCopyCurrentKeyboardInputSource) + OS_LOAD_FUNCTION(fp, TISCopyCurrentKeyboardInputSource) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -5893,7 +5893,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(TISGetInputSourceProperty) rc = (jintLong)TISGetInputSourceProperty(arg0, arg1); */ { - LOAD_FUNCTION(fp, TISGetInputSourceProperty) + OS_LOAD_FUNCTION(fp, TISGetInputSourceProperty) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -5935,7 +5935,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(UCKeyTranslate) rc = (jint)UCKeyTranslate((const UCKeyboardLayout *)arg0, (UInt16)arg1, (UInt16)arg2, (UInt32)arg3, (UInt32)arg4, (OptionBits)arg5, (UInt32 *)lparg6, (UniCharCount)arg7, (UniCharCount *)lparg8, (UniChar *)lparg9); */ { - LOAD_FUNCTION(fp, UCKeyTranslate) + OS_LOAD_FUNCTION(fp, UCKeyTranslate) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const UCKeyboardLayout *, UInt16, UInt16, UInt32, UInt32, OptionBits, UInt32 *, UniCharCount, UniCharCount *, UniChar *))fp)((const UCKeyboardLayout *)arg0, (UInt16)arg1, (UInt16)arg2, (UInt32)arg3, (UInt32)arg4, (OptionBits)arg5, (UInt32 *)lparg6, (UniCharCount)arg7, (UniCharCount *)lparg8, (UniChar *)lparg9); } @@ -5970,7 +5970,7 @@ JNIEXPORT void JNICALL OS_NATIVE(UnionRgn) UnionRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, UnionRgn) + OS_LOAD_FUNCTION(fp, UnionRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -6133,7 +6133,7 @@ JNIEXPORT void JNICALL OS_NATIVE(instrumentObjcMessageSends) instrumentObjcMessageSends(arg0); */ { - LOAD_FUNCTION(fp, instrumentObjcMessageSends) + OS_LOAD_FUNCTION(fp, instrumentObjcMessageSends) if (fp) { ((void (CALLING_CONVENTION*)(jboolean))fp)(arg0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h index eab0260318..78f7a93d9e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h @@ -25,6 +25,8 @@ extern jint CPSSetProcessName(void *, jintLong); +#define OS_LOAD_FUNCTION LOAD_FUNCTION + #define objc_msgSend_bool objc_msgSend #define objc_msgSendSuper_bool objc_msgSendSuper diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c index c43c4c1e68..08fac00104 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c @@ -51,7 +51,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindow) rc = (jintLong)FindWindow(arg0, arg1, (WindowRef *)lparg2); */ { - LOAD_FUNCTION(fp, FindWindow) + OS_LOAD_FUNCTION(fp, FindWindow) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(Point, WindowRef *))fp)(p, (WindowRef *)lparg2); } 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..19f5112bed 100755..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 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java index ef6bfb1040..ef6bfb1040 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java index e07dfd350a..e07dfd350a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java index 31a378b732..31a378b732 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java index 9be69e93fc..9be69e93fc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java 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 e8b26ba02b..01d3f53403 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 @@ -2281,6 +2281,17 @@ public static final int NSEventTypeSwipe = 31; public static final int NSFileHandlingPanelOKButton = 1; public static final int NSFlagsChanged = 12; public static final int NSFocusRingTypeNone = 1; +public static final int NSFontPanelFaceModeMask = 1 << 0; +public static final int NSFontPanelSizeModeMask = 1 << 1; +public static final int NSFontPanelCollectionModeMask = 1 << 2; +public static final int NSFontPanelUnderlineEffectModeMask = 1<<8; +public static final int NSFontPanelStrikethroughEffectModeMask = 1<<9; +public static final int NSFontPanelTextColorEffectModeMask = 1<< 10; +public static final int NSFontPanelDocumentColorEffectModeMask = 1<<11; +public static final int NSFontPanelShadowEffectModeMask = 1<<12; +public static final int NSFontPanelAllEffectsModeMask = 0XFFF00; +public static final int NSFontPanelStandardModesMask = 0xFFFF; +public static final int NSFontPanelAllModesMask = 0xFFFFFFFF; public static final int NSHelpFunctionKey = 63302; public static final int NSHelpKeyMask = 4194304; public static final int NSHourMinuteDatePickerElementFlag = 12; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/PMResolution.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/PMResolution.java index 98279c157e..98279c157e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/PMResolution.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/PMResolution.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java index 11da7c81b3..3ad3e491a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java @@ -22,7 +22,7 @@ public class Library { /** * SWT Minor version number (must be in the range 0..999) */ - static int MINOR_VERSION = 804; + static int MINOR_VERSION = 807; /** * SWT revision number (must be >= 0) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java index d47d5c5e6b..a7ceb2594d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java @@ -24,7 +24,7 @@ public class Library { /** * SWT Minor version number (must be in the range 0..999) */ - static int MINOR_VERSION = 804; + static int MINOR_VERSION = 807; /** * SWT revision number (must be >= 0) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh index c19f52efcc..9a23f364c4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh @@ -491,14 +491,6 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ] fi fi -if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then - echo "WebKit found, compiling webkit embedded browser support." - MAKE_WEBKIT=make_webkit -else - echo "WebKit not found:" - echo " *** WebKit embedding support will not be compiled." -fi - # Find AWT if available if [ -z "${AWT_LIB_PATH}" ]; then if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then @@ -527,5 +519,5 @@ fi if [ "x${1}" = "xclean" ]; then ${MAKE_TYPE} -f $MAKEFILE clean else - ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} + ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} fi diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak index 5dc0ca5267..5dc0ca5267 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak index 6f71c7649a..6f71c7649a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak index b6d0f307e2..b6d0f307e2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak index 8c27bffab0..3976fe4799 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak @@ -91,8 +91,7 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -DNO_nsDynamicFunctionLoad XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 -WEBKITCFLAGS = `pkg-config --cflags webkit-1.0` -WEBKITLIBS = `pkg-config --libs webkit-1.0` +WEBKITCFLAGS = `pkg-config --cflags glib-2.0` SWT_OBJECTS = swt.o c.o c_stats.o callback.o CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o @@ -279,7 +278,7 @@ xpcominit_stats.o: xpcominit_stats.cpp make_webkit: $(WEBKIT_LIB) $(WEBKIT_LIB): $(WEBKIT_OBJECTS) - $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) + $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) webkit.o: webkitgtk.c $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak index 6764c338ca..6764c338ca 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 445c429c0e..61bbdce18f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -1299,7 +1299,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile) rc = (jboolean)FcConfigAppFontAddFile(arg0, lparg1); */ { - LOAD_FUNCTION(fp, FcConfigAppFontAddFile) + OS_LOAD_FUNCTION(fp, FcConfigAppFontAddFile) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -1811,6 +1811,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME) } #endif +#ifndef NO__1G_1TYPE_1CHECK_1INSTANCE_1TYPE +JNIEXPORT jboolean JNICALL OS_NATIVE(_1G_1TYPE_1CHECK_1INSTANCE_1TYPE) + (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +{ + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC); + rc = (jboolean)G_TYPE_CHECK_INSTANCE_TYPE(arg0, arg1); + OS_NATIVE_EXIT(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC); + return rc; +} +#endif + #ifndef NO__1G_1TYPE_1STRING JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING) (JNIEnv *env, jclass that) @@ -2106,7 +2118,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite) XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); */ { - LOAD_FUNCTION(fp, XRenderComposite) + OS_LOAD_FUNCTION(fp, XRenderComposite) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); } @@ -2127,7 +2139,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture) rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, XRenderCreatePicture) + OS_LOAD_FUNCTION(fp, XRenderCreatePicture) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -2148,7 +2160,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat) rc = (jintLong)XRenderFindStandardFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindStandardFormat) + OS_LOAD_FUNCTION(fp, XRenderFindStandardFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -2168,7 +2180,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat) rc = (jintLong)XRenderFindVisualFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindVisualFormat) + OS_LOAD_FUNCTION(fp, XRenderFindVisualFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -2187,7 +2199,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture) XRenderFreePicture(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFreePicture) + OS_LOAD_FUNCTION(fp, XRenderFreePicture) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -2210,7 +2222,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension) rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryExtension) + OS_LOAD_FUNCTION(fp, XRenderQueryExtension) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -2237,7 +2249,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion) rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryVersion) + OS_LOAD_FUNCTION(fp, XRenderQueryVersion) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -2261,7 +2273,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles) XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5); */ { - LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) + OS_LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5); } @@ -2283,7 +2295,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform) XRenderSetPictureTransform(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderSetPictureTransform) + OS_LOAD_FUNCTION(fp, XRenderSetPictureTransform) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2); } @@ -2446,7 +2458,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship) rc = (jboolean)atk_object_add_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); */ { - LOAD_FUNCTION(fp, atk_object_add_relationship) + OS_LOAD_FUNCTION(fp, atk_object_add_relationship) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); } @@ -2466,7 +2478,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1remove_1relationship) rc = (jboolean)atk_object_remove_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); */ { - LOAD_FUNCTION(fp, atk_object_remove_relationship) + OS_LOAD_FUNCTION(fp, atk_object_remove_relationship) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); } @@ -2546,7 +2558,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline) rc = (jintLong)g_app_info_create_from_commandline(lparg0, lparg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, g_app_info_create_from_commandline) + OS_LOAD_FUNCTION(fp, g_app_info_create_from_commandline) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jintLong, jintLong))fp)(lparg0, lparg1, arg2, arg3); } @@ -2569,7 +2581,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all) rc = (jintLong)g_app_info_get_all(); */ { - LOAD_FUNCTION(fp, g_app_info_get_all) + OS_LOAD_FUNCTION(fp, g_app_info_get_all) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -2591,7 +2603,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type) rc = (jintLong)g_app_info_get_default_for_type(lparg0, arg1); */ { - LOAD_FUNCTION(fp, g_app_info_get_default_for_type) + OS_LOAD_FUNCTION(fp, g_app_info_get_default_for_type) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jboolean))fp)(lparg0, arg1); } @@ -2613,7 +2625,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable) rc = (jintLong)g_app_info_get_executable(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_executable) + OS_LOAD_FUNCTION(fp, g_app_info_get_executable) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2633,7 +2645,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon) rc = (jintLong)g_app_info_get_icon(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_icon) + OS_LOAD_FUNCTION(fp, g_app_info_get_icon) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2653,7 +2665,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1id) rc = (jintLong)g_app_info_get_id(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_id) + OS_LOAD_FUNCTION(fp, g_app_info_get_id) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2673,7 +2685,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name) rc = (jintLong)g_app_info_get_name(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_name) + OS_LOAD_FUNCTION(fp, g_app_info_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2693,7 +2705,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch) rc = (jboolean)g_app_info_launch(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, g_app_info_launch) + OS_LOAD_FUNCTION(fp, g_app_info_launch) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); } @@ -2713,7 +2725,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri) rc = (jboolean)g_app_info_launch_default_for_uri(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, g_app_info_launch_default_for_uri) + OS_LOAD_FUNCTION(fp, g_app_info_launch_default_for_uri) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -2733,7 +2745,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show) rc = (jboolean)g_app_info_should_show(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_should_show) + OS_LOAD_FUNCTION(fp, g_app_info_should_show) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2753,7 +2765,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris) rc = (jboolean)g_app_info_supports_uris(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_supports_uris) + OS_LOAD_FUNCTION(fp, g_app_info_supports_uris) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2809,7 +2821,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1equals) rc = (jboolean)g_content_type_equals(arg0, lparg1); */ { - LOAD_FUNCTION(fp, g_content_type_equals) + OS_LOAD_FUNCTION(fp, g_content_type_equals) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -2833,7 +2845,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1content_1type_1get_1mime_1type) rc = (jintLong)g_content_type_get_mime_type(lparg0); */ { - LOAD_FUNCTION(fp, g_content_type_get_mime_type) + OS_LOAD_FUNCTION(fp, g_content_type_get_mime_type) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -2857,7 +2869,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a) rc = (jboolean)g_content_type_is_a(arg0, lparg1); */ { - LOAD_FUNCTION(fp, g_content_type_is_a) + OS_LOAD_FUNCTION(fp, g_content_type_is_a) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -2879,7 +2891,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1content_1types_1get_1registered) rc = (jintLong)g_content_types_get_registered(); */ { - LOAD_FUNCTION(fp, g_content_types_get_registered) + OS_LOAD_FUNCTION(fp, g_content_types_get_registered) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -2899,7 +2911,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1data_1input_1stream_1new) rc = (jintLong)g_data_input_stream_new(arg0); */ { - LOAD_FUNCTION(fp, g_data_input_stream_new) + OS_LOAD_FUNCTION(fp, g_data_input_stream_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2921,7 +2933,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1data_1input_1stream_1read_1line) rc = (jintLong)g_data_input_stream_read_line(arg0, lparg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, g_data_input_stream_read_line) + OS_LOAD_FUNCTION(fp, g_data_input_stream_read_line) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint *, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3); } @@ -2945,7 +2957,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1desktop_1app_1info_1new_1from_1filenam rc = (jintLong)g_desktop_app_info_new_from_filename(lparg0); */ { - LOAD_FUNCTION(fp, g_desktop_app_info_new_from_filename) + OS_LOAD_FUNCTION(fp, g_desktop_app_info_new_from_filename) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -2967,7 +2979,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1path) rc = (jintLong)g_file_get_path(arg0); */ { - LOAD_FUNCTION(fp, g_file_get_path) + OS_LOAD_FUNCTION(fp, g_file_get_path) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2987,7 +2999,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri) rc = (jintLong)g_file_get_uri(arg0); */ { - LOAD_FUNCTION(fp, g_file_get_uri) + OS_LOAD_FUNCTION(fp, g_file_get_uri) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -3007,7 +3019,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1icon_1get_1file) rc = (jintLong)g_file_icon_get_file(arg0); */ { - LOAD_FUNCTION(fp, g_file_icon_get_file) + OS_LOAD_FUNCTION(fp, g_file_icon_get_file) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -3027,7 +3039,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type) rc = (jintLong)g_file_info_get_content_type(arg0); */ { - LOAD_FUNCTION(fp, g_file_info_get_content_type) + OS_LOAD_FUNCTION(fp, g_file_info_get_content_type) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -3048,7 +3060,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1file_1info_1get_1modification_1time) g_file_info_get_modification_time(arg0, lparg1); */ { - LOAD_FUNCTION(fp, g_file_info_get_modification_time) + OS_LOAD_FUNCTION(fp, g_file_info_get_modification_time) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong *))fp)(arg0, lparg1); } @@ -3071,7 +3083,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path) rc = (jintLong)g_file_new_for_path(lparg0); */ { - LOAD_FUNCTION(fp, g_file_new_for_path) + OS_LOAD_FUNCTION(fp, g_file_new_for_path) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -3095,7 +3107,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri) rc = (jintLong)g_file_new_for_uri(lparg0); */ { - LOAD_FUNCTION(fp, g_file_new_for_uri) + OS_LOAD_FUNCTION(fp, g_file_new_for_uri) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -3119,7 +3131,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1query_1info) rc = (jintLong)g_file_query_info(arg0, lparg1, arg2, arg3, arg4); */ { - LOAD_FUNCTION(fp, g_file_query_info) + OS_LOAD_FUNCTION(fp, g_file_query_info) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); } @@ -3141,7 +3153,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1read) rc = (jintLong)g_file_read(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, g_file_read) + OS_LOAD_FUNCTION(fp, g_file_read) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -3163,7 +3175,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1file_1test) rc = (jboolean)g_file_test(lparg0, arg1); */ { - LOAD_FUNCTION(fp, g_file_test) + OS_LOAD_FUNCTION(fp, g_file_test) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jbyte *, jint))fp)(lparg0, arg1); } @@ -3278,7 +3290,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string) rc = (jintLong)g_icon_new_for_string(lparg0, lparg1); */ { - LOAD_FUNCTION(fp, g_icon_new_for_string) + OS_LOAD_FUNCTION(fp, g_icon_new_for_string) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong *))fp)(lparg0, lparg1); } @@ -3301,7 +3313,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string) rc = (jintLong)g_icon_to_string(arg0); */ { - LOAD_FUNCTION(fp, g_icon_to_string) + OS_LOAD_FUNCTION(fp, g_icon_to_string) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -4934,7 +4946,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1create) rc = (jintLong)gdk_cairo_create(arg0); */ { - LOAD_FUNCTION(fp, gdk_cairo_create) + OS_LOAD_FUNCTION(fp, gdk_cairo_create) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -4953,7 +4965,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region) gdk_cairo_region(arg0, arg1); */ { - LOAD_FUNCTION(fp, gdk_cairo_region) + OS_LOAD_FUNCTION(fp, gdk_cairo_region) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -4971,7 +4983,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1reset_1clip) gdk_cairo_reset_clip(arg0, arg1); */ { - LOAD_FUNCTION(fp, gdk_cairo_reset_clip) + OS_LOAD_FUNCTION(fp, gdk_cairo_reset_clip) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -4991,7 +5003,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color) gdk_cairo_set_source_color(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gdk_cairo_set_source_color) + OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_color) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1); } @@ -5105,7 +5117,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf) rc = (jintLong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf) + OS_LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3); } @@ -5142,7 +5154,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default) rc = (jintLong)gdk_display_get_default(); */ { - LOAD_FUNCTION(fp, gdk_display_get_default) + OS_LOAD_FUNCTION(fp, gdk_display_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -5162,7 +5174,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color) rc = (jboolean)gdk_display_supports_cursor_color(arg0); */ { - LOAD_FUNCTION(fp, gdk_display_supports_cursor_color) + OS_LOAD_FUNCTION(fp, gdk_display_supports_cursor_color) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -5284,7 +5296,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf) gdk_draw_pixbuf((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11); */ { - LOAD_FUNCTION(fp, gdk_draw_pixbuf) + OS_LOAD_FUNCTION(fp, gdk_draw_pixbuf) if (fp) { ((void (CALLING_CONVENTION*)(GdkDrawable *, GdkGC *, GdkPixbuf *, gint, gint, gint, gint, gint, gint, GdkRgbDither, gint, gint))fp)((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11); } @@ -6173,7 +6185,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv) rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6); */ { - LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv) + OS_LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, jintLong *, jintLong *, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6); } @@ -6491,7 +6503,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default) rc = (jintLong)gdk_screen_get_default(); */ { - LOAD_FUNCTION(fp, gdk_screen_get_default) + OS_LOAD_FUNCTION(fp, gdk_screen_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -6511,7 +6523,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point) rc = (jint)gdk_screen_get_monitor_at_point((GdkScreen *)arg0, (gint)arg1, (gint)arg2); */ { - LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point) + OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint, gint))fp)((GdkScreen *)arg0, (gint)arg1, (gint)arg2); } @@ -6531,7 +6543,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window) rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1); */ { - LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window) + OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, GdkWindow *))fp)((GdkScreen *)arg0, (GdkWindow *)arg1); } @@ -6552,7 +6564,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry) gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry) + OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry) if (fp) { ((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2); } @@ -6573,7 +6585,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors) rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0); */ { - LOAD_FUNCTION(fp, gdk_screen_get_n_monitors) + OS_LOAD_FUNCTION(fp, gdk_screen_get_n_monitors) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); } @@ -6593,7 +6605,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number) rc = (jint)gdk_screen_get_number((GdkScreen *)arg0); */ { - LOAD_FUNCTION(fp, gdk_screen_get_number) + OS_LOAD_FUNCTION(fp, gdk_screen_get_number) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); } @@ -7144,7 +7156,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack) gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2); */ { - LOAD_FUNCTION(fp, gdk_window_restack) + OS_LOAD_FUNCTION(fp, gdk_window_restack) if (fp) { ((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2); } @@ -7172,7 +7184,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus) gdk_window_set_accept_focus((GdkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gdk_window_set_accept_focus) + OS_LOAD_FUNCTION(fp, gdk_window_set_accept_focus) if (fp) { ((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1); } @@ -7260,7 +7272,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above) gdk_window_set_keep_above((GdkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gdk_window_set_keep_above) + OS_LOAD_FUNCTION(fp, gdk_window_set_keep_above) if (fp) { ((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1); } @@ -7387,7 +7399,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1n rc = (jintLong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0); */ { - LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name) + OS_LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); } @@ -7407,7 +7419,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual) rc = (jintLong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1); */ { - LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual) + OS_LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *, VisualID))fp)((GdkScreen *)arg0, (VisualID)arg1); } @@ -7651,7 +7663,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1clear_1marks) gtk_calendar_clear_marks((GtkCalendar *)arg0); */ { - LOAD_FUNCTION(fp, gtk_calendar_clear_marks) + OS_LOAD_FUNCTION(fp, gtk_calendar_clear_marks) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *))fp)((GtkCalendar *)arg0); } @@ -7669,7 +7681,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options) gtk_calendar_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_display_options) + OS_LOAD_FUNCTION(fp, gtk_calendar_display_options) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); } @@ -7693,7 +7705,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date) gtk_calendar_get_date((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3); */ { - LOAD_FUNCTION(fp, gtk_calendar_get_date) + OS_LOAD_FUNCTION(fp, gtk_calendar_get_date) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, guint *, guint *, guint *))fp)((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3); } @@ -7715,7 +7727,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1mark_1day) gtk_calendar_mark_day((GtkCalendar *)arg0, (guint)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_mark_day) + OS_LOAD_FUNCTION(fp, gtk_calendar_mark_day) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, guint))fp)((GtkCalendar *)arg0, (guint)arg1); } @@ -7734,7 +7746,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1calendar_1new) rc = (jintLong)gtk_calendar_new(); */ { - LOAD_FUNCTION(fp, gtk_calendar_new) + OS_LOAD_FUNCTION(fp, gtk_calendar_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -7753,7 +7765,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day) gtk_calendar_select_day((GtkCalendar *)arg0, (guint)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_select_day) + OS_LOAD_FUNCTION(fp, gtk_calendar_select_day) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, guint))fp)((GtkCalendar *)arg0, (guint)arg1); } @@ -7772,7 +7784,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month) rc = (jboolean)gtk_calendar_select_month((GtkCalendar *)arg0, (guint)arg1, (guint)arg2); */ { - LOAD_FUNCTION(fp, gtk_calendar_select_month) + OS_LOAD_FUNCTION(fp, gtk_calendar_select_month) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkCalendar *, guint, guint))fp)((GtkCalendar *)arg0, (guint)arg1, (guint)arg2); } @@ -7791,7 +7803,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options) gtk_calendar_set_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_set_display_options) + OS_LOAD_FUNCTION(fp, gtk_calendar_set_display_options) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); } @@ -7809,7 +7821,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear) gtk_cell_layout_clear(arg0); */ { - LOAD_FUNCTION(fp, gtk_cell_layout_clear) + OS_LOAD_FUNCTION(fp, gtk_cell_layout_clear) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -7827,7 +7839,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start) gtk_cell_layout_pack_start(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_cell_layout_pack_start) + OS_LOAD_FUNCTION(fp, gtk_cell_layout_pack_start) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jboolean))fp)(arg0, arg1, arg2); } @@ -7991,7 +8003,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1can_1store) gtk_clipboard_set_can_store((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (gint)arg2); */ { - LOAD_FUNCTION(fp, gtk_clipboard_set_can_store) + OS_LOAD_FUNCTION(fp, gtk_clipboard_set_can_store) if (fp) { ((void (CALLING_CONVENTION*)(GtkClipboard *, const GtkTargetEntry *, gint))fp)((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (gint)arg2); } @@ -8033,7 +8045,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1store) gtk_clipboard_store((GtkClipboard *)arg0); */ { - LOAD_FUNCTION(fp, gtk_clipboard_store) + OS_LOAD_FUNCTION(fp, gtk_clipboard_store) if (fp) { ((void (CALLING_CONVENTION*)(GtkClipboard *))fp)((GtkClipboard *)arg0); } @@ -8117,7 +8129,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text) rc = (jintLong)gtk_combo_box_entry_new_text(); */ { - LOAD_FUNCTION(fp, gtk_combo_box_entry_new_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_entry_new_text) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -8137,7 +8149,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active) rc = (jint)gtk_combo_box_get_active(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_get_active) + OS_LOAD_FUNCTION(fp, gtk_combo_box_get_active) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8157,7 +8169,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model) rc = (jintLong)gtk_combo_box_get_model(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_get_model) + OS_LOAD_FUNCTION(fp, gtk_combo_box_get_model) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8178,7 +8190,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text) gtk_combo_box_insert_text(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, gtk_combo_box_insert_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_insert_text) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *))fp)(arg0, arg1, lparg2); } @@ -8199,7 +8211,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text) rc = (jintLong)gtk_combo_box_new_text(); */ { - LOAD_FUNCTION(fp, gtk_combo_box_new_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_new_text) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -8218,7 +8230,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown) gtk_combo_box_popdown(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_popdown) + OS_LOAD_FUNCTION(fp, gtk_combo_box_popdown) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8236,7 +8248,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup) gtk_combo_box_popup(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_popup) + OS_LOAD_FUNCTION(fp, gtk_combo_box_popup) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8254,7 +8266,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text) gtk_combo_box_remove_text(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_combo_box_remove_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_remove_text) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -8272,7 +8284,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active) gtk_combo_box_set_active(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_combo_box_set_active) + OS_LOAD_FUNCTION(fp, gtk_combo_box_set_active) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -8290,7 +8302,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click) gtk_combo_box_set_focus_on_click(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click) + OS_LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -8703,7 +8715,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1inner_1border) rc = (jintLong)gtk_entry_get_inner_border(arg0); */ { - LOAD_FUNCTION(fp, gtk_entry_get_inner_border) + OS_LOAD_FUNCTION(fp, gtk_entry_get_inner_border) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8821,7 +8833,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment) gtk_entry_set_alignment((GtkEntry *)arg0, (gfloat)arg1); */ { - LOAD_FUNCTION(fp, gtk_entry_set_alignment) + OS_LOAD_FUNCTION(fp, gtk_entry_set_alignment) if (fp) { ((void (CALLING_CONVENTION*)(GtkEntry *, gfloat))fp)((GtkEntry *)arg0, (gfloat)arg1); } @@ -8851,7 +8863,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1icon_1from_1stock) gtk_entry_set_icon_from_stock(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, gtk_entry_set_icon_from_stock) + OS_LOAD_FUNCTION(fp, gtk_entry_set_icon_from_stock) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *))fp)(arg0, arg1, lparg2); } @@ -8871,7 +8883,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1icon_1sensitive) gtk_entry_set_icon_sensitive(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_entry_set_icon_sensitive) + OS_LOAD_FUNCTION(fp, gtk_entry_set_icon_sensitive) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jboolean))fp)(arg0, arg1, arg2); } @@ -8934,7 +8946,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index) rc = (jint)gtk_entry_text_index_to_layout_index(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_entry_text_index_to_layout_index) + OS_LOAD_FUNCTION(fp, gtk_entry_text_index_to_layout_index) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -8953,7 +8965,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers) gtk_enumerate_printers(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3); */ { - LOAD_FUNCTION(fp, gtk_enumerate_printers) + OS_LOAD_FUNCTION(fp, gtk_enumerate_printers) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gpointer, GDestroyNotify, gboolean))fp)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3); } @@ -8984,7 +8996,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded) rc = (jboolean)gtk_expander_get_expanded(arg0); */ { - LOAD_FUNCTION(fp, gtk_expander_get_expanded) + OS_LOAD_FUNCTION(fp, gtk_expander_get_expanded) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9004,7 +9016,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget) rc = (jintLong)gtk_expander_get_label_widget(arg0); */ { - LOAD_FUNCTION(fp, gtk_expander_get_label_widget) + OS_LOAD_FUNCTION(fp, gtk_expander_get_label_widget) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9026,7 +9038,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1new) rc = (jintLong)gtk_expander_new((const gchar *)lparg0); */ { - LOAD_FUNCTION(fp, gtk_expander_new) + OS_LOAD_FUNCTION(fp, gtk_expander_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0); } @@ -9047,7 +9059,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded) gtk_expander_set_expanded(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_expander_set_expanded) + OS_LOAD_FUNCTION(fp, gtk_expander_set_expanded) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9067,7 +9079,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label) gtk_expander_set_label(arg0, (const gchar *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_expander_set_label) + OS_LOAD_FUNCTION(fp, gtk_expander_set_label) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1); } @@ -9087,7 +9099,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget) gtk_expander_set_label_widget(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_expander_set_label_widget) + OS_LOAD_FUNCTION(fp, gtk_expander_set_label_widget) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9105,7 +9117,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter) gtk_file_chooser_add_filter(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_add_filter) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_add_filter) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9124,7 +9136,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder) rc = (jintLong)gtk_file_chooser_get_current_folder(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9144,7 +9156,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename) rc = (jintLong)gtk_file_chooser_get_filename(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_filename) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_filename) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9164,7 +9176,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames) rc = (jintLong)gtk_file_chooser_get_filenames(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_filenames) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_filenames) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9184,7 +9196,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter) rc = (jintLong)gtk_file_chooser_get_filter(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_filter) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_filter) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9204,7 +9216,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uri) rc = (jintLong)gtk_file_chooser_get_uri(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_uri) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_uri) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9224,7 +9236,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uris) rc = (jintLong)gtk_file_chooser_get_uris(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_uris) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_uris) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9243,7 +9255,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder) gtk_file_chooser_set_current_folder(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9263,7 +9275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder_1uri gtk_file_chooser_set_current_folder_uri(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder_uri) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder_uri) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9285,7 +9297,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name) gtk_file_chooser_set_current_name(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_current_name) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_current_name) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9305,7 +9317,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confi gtk_file_chooser_set_do_overwrite_confirmation(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_do_overwrite_confirmation) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_do_overwrite_confirmation) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9323,7 +9335,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget) gtk_file_chooser_set_extra_widget(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_extra_widget) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_extra_widget) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9341,7 +9353,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename) gtk_file_chooser_set_filename(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_filename) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_filename) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9359,7 +9371,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter) gtk_file_chooser_set_filter(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_filter) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_filter) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9377,7 +9389,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1local_1only) gtk_file_chooser_set_local_only(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_local_only) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_local_only) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9395,7 +9407,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple) gtk_file_chooser_set_select_multiple(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_select_multiple) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_select_multiple) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9415,7 +9427,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1uri) gtk_file_chooser_set_uri(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_uri) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_uri) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9437,7 +9449,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern) gtk_file_filter_add_pattern(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_filter_add_pattern) + OS_LOAD_FUNCTION(fp, gtk_file_filter_add_pattern) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9458,7 +9470,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name) rc = (jintLong)gtk_file_filter_get_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_filter_get_name) + OS_LOAD_FUNCTION(fp, gtk_file_filter_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9478,7 +9490,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1new) rc = (jintLong)gtk_file_filter_new(); */ { - LOAD_FUNCTION(fp, gtk_file_filter_new) + OS_LOAD_FUNCTION(fp, gtk_file_filter_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -9499,7 +9511,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name) gtk_file_filter_set_name(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_filter_set_name) + OS_LOAD_FUNCTION(fp, gtk_file_filter_set_name) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9887,7 +9899,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1info_1free) gtk_icon_info_free(arg0); */ { - LOAD_FUNCTION(fp, gtk_icon_info_free) + OS_LOAD_FUNCTION(fp, gtk_icon_info_free) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9908,7 +9920,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1info_1load_1icon) rc = (jintLong)gtk_icon_info_load_icon(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_icon_info_load_icon) + OS_LOAD_FUNCTION(fp, gtk_icon_info_load_icon) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong *))fp)(arg0, lparg1); } @@ -9974,7 +9986,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1get_1default) rc = (jintLong)gtk_icon_theme_get_default(); */ { - LOAD_FUNCTION(fp, gtk_icon_theme_get_default) + OS_LOAD_FUNCTION(fp, gtk_icon_theme_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -9994,7 +10006,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon) rc = (jintLong)gtk_icon_theme_lookup_by_gicon(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_icon_theme_lookup_by_gicon) + OS_LOAD_FUNCTION(fp, gtk_icon_theme_lookup_by_gicon) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3); } @@ -10319,7 +10331,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode) gtk_label_set_line_wrap_mode(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_label_set_line_wrap_mode) + OS_LOAD_FUNCTION(fp, gtk_label_set_line_wrap_mode) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -10813,7 +10825,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus) gtk_menu_shell_set_take_focus((GtkMenuShell *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_menu_shell_set_take_focus) + OS_LOAD_FUNCTION(fp, gtk_menu_shell_set_take_focus) if (fp) { ((void (CALLING_CONVENTION*)(GtkMenuShell *, gboolean))fp)((GtkMenuShell *)arg0, (gboolean)arg1); } @@ -11008,7 +11020,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin) rc = (jdouble)gtk_page_setup_get_bottom_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11028,7 +11040,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin) rc = (jdouble)gtk_page_setup_get_left_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11048,7 +11060,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation) rc = (jint)gtk_page_setup_get_orientation(arg0); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_orientation) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_orientation) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11068,7 +11080,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height) rc = (jdouble)gtk_page_setup_get_page_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_page_height) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_page_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11088,7 +11100,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width) rc = (jdouble)gtk_page_setup_get_page_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_page_width) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_page_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11108,7 +11120,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height) rc = (jdouble)gtk_page_setup_get_paper_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11128,7 +11140,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size) rc = (jintLong)gtk_page_setup_get_paper_size(arg0); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11148,7 +11160,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width) rc = (jdouble)gtk_page_setup_get_paper_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11168,7 +11180,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin) rc = (jdouble)gtk_page_setup_get_right_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11188,7 +11200,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin) rc = (jdouble)gtk_page_setup_get_top_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11208,7 +11220,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1new) rc = (jintLong)gtk_page_setup_new(); */ { - LOAD_FUNCTION(fp, gtk_page_setup_new) + OS_LOAD_FUNCTION(fp, gtk_page_setup_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -11227,7 +11239,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin) gtk_page_setup_set_bottom_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11245,7 +11257,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin) gtk_page_setup_set_left_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11263,7 +11275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation) gtk_page_setup_set_orientation(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_orientation) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_orientation) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11281,7 +11293,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size) gtk_page_setup_set_paper_size(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -11299,7 +11311,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin) gtk_page_setup_set_right_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11317,7 +11329,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin) gtk_page_setup_set_top_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11622,7 +11634,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free) gtk_paper_size_free(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_free) + OS_LOAD_FUNCTION(fp, gtk_paper_size_free) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11641,7 +11653,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name) rc = (jintLong)gtk_paper_size_get_display_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_display_name) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_display_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11661,7 +11673,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height) rc = (jdouble)gtk_paper_size_get_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_height) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11681,7 +11693,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name) rc = (jintLong)gtk_paper_size_get_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_name) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11701,7 +11713,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name) rc = (jintLong)gtk_paper_size_get_ppd_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11721,7 +11733,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width) rc = (jdouble)gtk_paper_size_get_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_width) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11741,7 +11753,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom) rc = (jboolean)gtk_paper_size_is_custom(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_is_custom) + OS_LOAD_FUNCTION(fp, gtk_paper_size_is_custom) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11763,7 +11775,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new) rc = (jintLong)gtk_paper_size_new(lparg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_new) + OS_LOAD_FUNCTION(fp, gtk_paper_size_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -11789,7 +11801,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom) rc = (jintLong)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4); */ { - LOAD_FUNCTION(fp, gtk_paper_size_new_custom) + OS_LOAD_FUNCTION(fp, gtk_paper_size_new_custom) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble, jint))fp)(lparg0, lparg1, arg2, arg3, arg4); } @@ -11816,7 +11828,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd) rc = (jintLong)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd) + OS_LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble))fp)(lparg0, lparg1, arg2, arg3); } @@ -11863,7 +11875,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer) rc = (jintLong)gtk_print_job_get_printer(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_printer) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_printer) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11883,7 +11895,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings) rc = (jintLong)gtk_print_job_get_settings(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_settings) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_settings) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11903,7 +11915,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status) rc = (jint)gtk_print_job_get_status(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_status) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_status) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11925,7 +11937,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface) rc = (jintLong)gtk_print_job_get_surface(arg0, (GError **)lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_surface) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_surface) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, GError **))fp)(arg0, (GError **)lparg1); } @@ -11947,7 +11959,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title) rc = (jintLong)gtk_print_job_get_title(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_title) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_title) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11969,7 +11981,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1new) rc = (jintLong)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_print_job_new) + OS_LOAD_FUNCTION(fp, gtk_print_job_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, jintLong, jintLong, jintLong))fp)((const gchar *)lparg0, arg1, arg2, arg3); } @@ -11990,7 +12002,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send) gtk_print_job_send(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3); */ { - LOAD_FUNCTION(fp, gtk_print_job_send) + OS_LOAD_FUNCTION(fp, gtk_print_job_send) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer, GDestroyNotify))fp)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3); } @@ -12013,7 +12025,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1job_1set_1source_1file) rc = (jboolean)gtk_print_job_set_source_file(arg0, (const gchar *)lparg1, (GError **)lparg2); */ { - LOAD_FUNCTION(fp, gtk_print_job_set_source_file) + OS_LOAD_FUNCTION(fp, gtk_print_job_set_source_file) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, const gchar *, GError **))fp)(arg0, (const gchar *)lparg1, (GError **)lparg2); } @@ -12035,7 +12047,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach) gtk_print_settings_foreach(arg0, arg1, (gpointer)arg2); */ { - LOAD_FUNCTION(fp, gtk_print_settings_foreach) + OS_LOAD_FUNCTION(fp, gtk_print_settings_foreach) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer))fp)(arg0, arg1, (gpointer)arg2); } @@ -12056,7 +12068,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get) rc = (jintLong)gtk_print_settings_get(arg0, (const gchar *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1); } @@ -12078,7 +12090,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate) rc = (jboolean)gtk_print_settings_get_collate(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_collate) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_collate) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12098,7 +12110,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1duplex) rc = (jint)gtk_print_settings_get_duplex(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_duplex) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_duplex) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12118,7 +12130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies) rc = (jint)gtk_print_settings_get_n_copies(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12138,7 +12150,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation) rc = (jint)gtk_print_settings_get_orientation(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_orientation) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_orientation) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12160,7 +12172,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges) rc = (jintLong)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *))fp)(arg0, (gint *)lparg1); } @@ -12182,7 +12194,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height) rc = (jdouble)gtk_print_settings_get_paper_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_paper_height) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_paper_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12202,7 +12214,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width) rc = (jdouble)gtk_print_settings_get_paper_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_paper_width) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_paper_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12222,7 +12234,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages) rc = (jint)gtk_print_settings_get_print_pages(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12242,7 +12254,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer) rc = (jintLong)gtk_print_settings_get_printer(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_printer) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_printer) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12262,7 +12274,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution) rc = (jint)gtk_print_settings_get_resolution(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_resolution) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_resolution) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12282,7 +12294,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1new) rc = (jintLong)gtk_print_settings_new(); */ { - LOAD_FUNCTION(fp, gtk_print_settings_new) + OS_LOAD_FUNCTION(fp, gtk_print_settings_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -12305,7 +12317,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set) gtk_print_settings_set(arg0, (const gchar *)lparg1, (const gchar *)lparg2); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, const gchar *, const gchar *))fp)(arg0, (const gchar *)lparg1, (const gchar *)lparg2); } @@ -12326,7 +12338,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate) gtk_print_settings_set_collate(arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_collate) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_collate) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gboolean))fp)(arg0, (gboolean)arg1); } @@ -12344,7 +12356,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1duplex) gtk_print_settings_set_duplex(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_duplex) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_duplex) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12362,7 +12374,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies) gtk_print_settings_set_n_copies(arg0, (gint)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1); } @@ -12380,7 +12392,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation) gtk_print_settings_set_orientation(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_orientation) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_orientation) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12400,7 +12412,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges) gtk_print_settings_set_page_ranges(arg0, lparg1, (gint)arg2); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint *, gint))fp)(arg0, lparg1, (gint)arg2); } @@ -12420,7 +12432,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages) gtk_print_settings_set_print_pages(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12440,7 +12452,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer) gtk_print_settings_set_printer(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_printer) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_printer) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -12461,7 +12473,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page) rc = (jint)gtk_print_unix_dialog_get_current_page(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12481,7 +12493,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setu rc = (jintLong)gtk_print_unix_dialog_get_page_setup(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12501,7 +12513,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1 rc = (jintLong)gtk_print_unix_dialog_get_selected_printer(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12521,7 +12533,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings) rc = (jintLong)gtk_print_unix_dialog_get_settings(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12543,7 +12555,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new) rc = (jintLong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_new) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *))fp)((const gchar *)lparg0, (GtkWindow *)arg1); } @@ -12564,7 +12576,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page) gtk_print_unix_dialog_set_current_page(arg0, (gint)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1); } @@ -12582,7 +12594,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1embed_1page_1s gtk_print_unix_dialog_set_embed_page_setup(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_embed_page_setup) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_embed_page_setup) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -12600,7 +12612,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabi gtk_print_unix_dialog_set_manual_capabilities(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -12618,7 +12630,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup) gtk_print_unix_dialog_set_page_setup(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -12636,7 +12648,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings) gtk_print_unix_dialog_set_settings(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -12655,7 +12667,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend) rc = (jintLong)gtk_printer_get_backend(arg0); */ { - LOAD_FUNCTION(fp, gtk_printer_get_backend) + OS_LOAD_FUNCTION(fp, gtk_printer_get_backend) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12675,7 +12687,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1name) rc = (jintLong)gtk_printer_get_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_printer_get_name) + OS_LOAD_FUNCTION(fp, gtk_printer_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12695,7 +12707,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default) rc = (jboolean)gtk_printer_is_default(arg0); */ { - LOAD_FUNCTION(fp, gtk_printer_is_default) + OS_LOAD_FUNCTION(fp, gtk_printer_is_default) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -13283,7 +13295,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1geometry) rc = (jboolean)gtk_status_icon_get_geometry(arg0, arg1, lparg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_status_icon_get_geometry) + OS_LOAD_FUNCTION(fp, gtk_status_icon_get_geometry) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, GdkRectangle *, jintLong))fp)(arg0, arg1, lparg2, arg3); } @@ -13305,7 +13317,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1visible) rc = (jboolean)gtk_status_icon_get_visible(arg0); */ { - LOAD_FUNCTION(fp, gtk_status_icon_get_visible) + OS_LOAD_FUNCTION(fp, gtk_status_icon_get_visible) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -13325,7 +13337,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1status_1icon_1new) rc = (jintLong)gtk_status_icon_new(); */ { - LOAD_FUNCTION(fp, gtk_status_icon_new) + OS_LOAD_FUNCTION(fp, gtk_status_icon_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -13356,7 +13368,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf) gtk_status_icon_set_from_pixbuf(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_status_icon_set_from_pixbuf) + OS_LOAD_FUNCTION(fp, gtk_status_icon_set_from_pixbuf) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -13376,7 +13388,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1tooltip) gtk_status_icon_set_tooltip(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_status_icon_set_tooltip) + OS_LOAD_FUNCTION(fp, gtk_status_icon_set_tooltip) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -13396,7 +13408,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1visible) gtk_status_icon_set_visible(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_status_icon_set_visible) + OS_LOAD_FUNCTION(fp, gtk_status_icon_set_visible) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -14386,7 +14398,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query) gtk_tooltip_trigger_tooltip_query((GdkDisplay*)arg0); */ { - LOAD_FUNCTION(fp, gtk_tooltip_trigger_tooltip_query) + OS_LOAD_FUNCTION(fp, gtk_tooltip_trigger_tooltip_query) if (fp) { ((void (CALLING_CONVENTION*)(GdkDisplay*))fp)((GdkDisplay*)arg0); } @@ -14797,7 +14809,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows) rc = (jint)gtk_tree_selection_count_selected_rows((GtkTreeSelection *)arg0); */ { - LOAD_FUNCTION(fp, gtk_tree_selection_count_selected_rows) + OS_LOAD_FUNCTION(fp, gtk_tree_selection_count_selected_rows) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GtkTreeSelection *))fp)((GtkTreeSelection *)arg0); } @@ -14835,7 +14847,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows rc = (jintLong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1); */ { - LOAD_FUNCTION(fp, gtk_tree_selection_get_selected_rows) + OS_LOAD_FUNCTION(fp, gtk_tree_selection_get_selected_rows) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkTreeSelection *, GtkTreeModel **))fp)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1); } @@ -15127,7 +15139,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1posit rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3); */ { - LOAD_FUNCTION(fp, gtk_tree_view_column_cell_get_position) + OS_LOAD_FUNCTION(fp, gtk_tree_view_column_cell_get_position) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint *))fp)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3); } @@ -15779,7 +15791,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines) gtk_tree_view_set_grid_lines((GtkTreeView*)arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_tree_view_set_grid_lines) + OS_LOAD_FUNCTION(fp, gtk_tree_view_set_grid_lines) if (fp) { ((void (CALLING_CONVENTION*)(GtkTreeView*, jint))fp)((GtkTreeView*)arg0, arg1); } @@ -16241,7 +16253,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited) rc = (jboolean)gtk_widget_is_composited((GtkWidget *)arg0); */ { - LOAD_FUNCTION(fp, gtk_widget_is_composited) + OS_LOAD_FUNCTION(fp, gtk_widget_is_composited) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } @@ -16534,7 +16546,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text) gtk_widget_set_tooltip_text((GtkWidget *)arg0, (const gchar *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_widget_set_tooltip_text) + OS_LOAD_FUNCTION(fp, gtk_widget_set_tooltip_text) if (fp) { ((void (CALLING_CONVENTION*)(GtkWidget *, const gchar *))fp)((GtkWidget *)arg0, (const gchar *)lparg1); } @@ -16751,7 +16763,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1group) rc = (jintLong)gtk_window_get_group((GtkWindow *)arg0); */ { - LOAD_FUNCTION(fp, gtk_window_get_group) + OS_LOAD_FUNCTION(fp, gtk_window_get_group) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0); } @@ -16807,7 +16819,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity) rc = (jdouble)gtk_window_get_opacity((GtkWindow *)arg0); */ { - LOAD_FUNCTION(fp, gtk_window_get_opacity) + OS_LOAD_FUNCTION(fp, gtk_window_get_opacity) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0); } @@ -17031,7 +17043,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below) gtk_window_set_keep_below((GtkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_window_set_keep_below) + OS_LOAD_FUNCTION(fp, gtk_window_set_keep_below) if (fp) { ((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1); } @@ -17059,7 +17071,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity) gtk_window_set_opacity((GtkWindow *)arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_window_set_opacity) + OS_LOAD_FUNCTION(fp, gtk_window_set_opacity) if (fp) { ((void (CALLING_CONVENTION*)(GtkWindow *, jdouble))fp)((GtkWindow *)arg0, arg1); } @@ -17087,7 +17099,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint) gtk_window_set_skip_taskbar_hint((GtkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_window_set_skip_taskbar_hint) + OS_LOAD_FUNCTION(fp, gtk_window_set_skip_taskbar_hint) if (fp) { ((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1); } @@ -17342,7 +17354,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new) rc = (jintLong)pango_attr_strikethrough_color_new(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, pango_attr_strikethrough_color_new) + OS_LOAD_FUNCTION(fp, pango_attr_strikethrough_color_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2); } @@ -17374,7 +17386,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new) rc = (jintLong)pango_attr_underline_color_new(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, pango_attr_underline_color_new) + OS_LOAD_FUNCTION(fp, pango_attr_underline_color_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2); } @@ -17418,7 +17430,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options rc = (jintLong)pango_cairo_context_get_font_options((PangoContext *)arg0); */ { - LOAD_FUNCTION(fp, pango_cairo_context_get_font_options) + OS_LOAD_FUNCTION(fp, pango_cairo_context_get_font_options) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PangoContext *))fp)((PangoContext *)arg0); } @@ -17437,7 +17449,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options) pango_cairo_context_set_font_options((PangoContext *)arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_context_set_font_options) + OS_LOAD_FUNCTION(fp, pango_cairo_context_set_font_options) if (fp) { ((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1); } @@ -17456,7 +17468,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout) rc = (jintLong)pango_cairo_create_layout(arg0); */ { - LOAD_FUNCTION(fp, pango_cairo_create_layout) + OS_LOAD_FUNCTION(fp, pango_cairo_create_layout) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17476,7 +17488,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context) rc = (jintLong)pango_cairo_font_map_create_context(arg0); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_create_context) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_create_context) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17496,7 +17508,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default) rc = (jintLong)pango_cairo_font_map_get_default(); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_get_default) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -17516,7 +17528,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new) rc = (jintLong)pango_cairo_font_map_new(); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_new) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -17535,7 +17547,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution) pango_cairo_font_map_set_resolution(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_set_resolution) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_set_resolution) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1); } @@ -17553,7 +17565,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path) pango_cairo_layout_path(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_layout_path) + OS_LOAD_FUNCTION(fp, pango_cairo_layout_path) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -17571,7 +17583,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout) pango_cairo_show_layout(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_show_layout) + OS_LOAD_FUNCTION(fp, pango_cairo_show_layout) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -17978,7 +17990,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1pos rc = (jint)pango_font_metrics_get_strikethrough_position(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_position) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_position) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17998,7 +18010,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thi rc = (jint)pango_font_metrics_get_strikethrough_thickness(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_thickness) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_thickness) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -18018,7 +18030,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1positio rc = (jint)pango_font_metrics_get_underline_position(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_underline_position) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_underline_position) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -18038,7 +18050,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickne rc = (jint)pango_font_metrics_get_underline_thickness(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_underline_thickness) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_underline_thickness) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -18428,7 +18440,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir) pango_layout_set_auto_dir(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_layout_set_auto_dir) + OS_LOAD_FUNCTION(fp, pango_layout_set_auto_dir) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -18784,7 +18796,7 @@ JNIEXPORT void JNICALL OS_NATIVE(gdk_1threads_1set_1lock_1functions) gdk_threads_set_lock_functions(arg0, arg1); */ { - LOAD_FUNCTION(fp, gdk_threads_set_lock_functions) + OS_LOAD_FUNCTION(fp, gdk_threads_set_lock_functions) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h index 69485058ef..b3711bb0d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h @@ -33,6 +33,8 @@ #include <locale.h> #include <unistd.h> +#define OS_LOAD_FUNCTION LOAD_FUNCTION + #ifndef GDK_WINDOWING_X11 /* X Structures */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c index c964103bae..efdb5a24a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c @@ -75,7 +75,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new) * are passing in, otherwise it crashes. */ typedef jintLong (CALLING_CONVENTION* FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...); - LOAD_FUNCTION(fp, gtk_file_chooser_dialog_new) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_dialog_new) if (fp) { rc = (jintLong)((FPTR) fp)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); } @@ -107,7 +107,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes) * are passing in, otherwise it crashes. */ typedef void (*FPTR)(jintLong, jintLong, jbyte *, jint, jintLong, ...); - LOAD_FUNCTION(fp, gtk_cell_layout_set_attributes) + OS_LOAD_FUNCTION(fp, gtk_cell_layout_set_attributes) if (fp) { ((FPTR)fp)(arg0, arg1, lparg2, arg3, arg4); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index 68ba6cb3f4..daaf74c241 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -354,7 +354,7 @@ #define localeconv_decimal_point() localeconv()->decimal_point #define gtk_status_icon_position_menu_func() 0; \ -LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \ +OS_LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \ rc = (jintLong)fp; glong g_utf16_pointer_to_offset(const gchar*, const gchar*); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index 2fc886a3a3..2c78396ae2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1396; -int OS_nativeFunctionCallCount[1396]; +int OS_nativeFunctionCount = 1397; +int OS_nativeFunctionCallCount[1397]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -178,6 +178,7 @@ char * OS_nativeFunctionNames[] = { "_1G_1OBJECT_1GET_1CLASS", "_1G_1OBJECT_1TYPE", "_1G_1OBJECT_1TYPE_1NAME", + "_1G_1TYPE_1CHECK_1INSTANCE_1TYPE", "_1G_1TYPE_1STRING", "_1PANGO_1PIXELS", "_1PANGO_1TYPE_1FONT_1DESCRIPTION", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 420c64d982..67de14abc2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -186,6 +186,7 @@ typedef enum { _1G_1OBJECT_1GET_1CLASS_FUNC, _1G_1OBJECT_1TYPE_FUNC, _1G_1OBJECT_1TYPE_1NAME_FUNC, + _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC, _1G_1TYPE_1STRING_FUNC, _1PANGO_1PIXELS_FUNC, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java index a1858daac5..a1858daac5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 02f3383419..159dd7742f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -242,9 +242,11 @@ public class OS extends C { public static final int GDK_XOR = 0x2; public static final int GDK_XTERM = 0x98; public static final int GDK_X_CURSOR = 0x0; + public static final int GDK_VISIBILITY_NOTIFY = 29; public static final int GDK_VISIBILITY_FULLY_OBSCURED = 2; public static final int GDK_VISIBILITY_NOTIFY_MASK = 1 << 17; public static final int GDK_WINDOW_CHILD = 2; + public static final int GDK_WINDOW_STATE = 32; public static final int GDK_WINDOW_STATE_ICONIFIED = 1 << 1; public static final int GDK_WINDOW_STATE_MAXIMIZED = 1 << 2; public static final int GDK_WINDOW_STATE_FULLSCREEN = 1 << 4; @@ -1781,6 +1783,15 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) { lock.unlock(); } } +public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, int /*long*/ type); +public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, int /*long*/ type) { + lock.lock(); + try { + return _G_TYPE_CHECK_INSTANCE_TYPE(instance, type); + } finally { + lock.unlock(); + } +} /** @method flags=const */ public static final native int /*long*/ G_TYPE_BOOLEAN(); /** @method flags=const */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh index 50c5be7499..50c5be7499 100644..100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c index 9a68414652..2dfdb94f2a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -1462,7 +1462,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite) XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); */ { - LOAD_FUNCTION(fp, XRenderComposite) + OS_LOAD_FUNCTION(fp, XRenderComposite) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); } @@ -1483,7 +1483,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture) rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, XRenderCreatePicture) + OS_LOAD_FUNCTION(fp, XRenderCreatePicture) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -1505,7 +1505,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat) rc = (jintLong)XRenderFindStandardFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindStandardFormat) + OS_LOAD_FUNCTION(fp, XRenderFindStandardFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -1525,7 +1525,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat) rc = (jintLong)XRenderFindVisualFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindVisualFormat) + OS_LOAD_FUNCTION(fp, XRenderFindVisualFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -1544,7 +1544,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture) XRenderFreePicture(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFreePicture) + OS_LOAD_FUNCTION(fp, XRenderFreePicture) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -1567,7 +1567,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension) rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryExtension) + OS_LOAD_FUNCTION(fp, XRenderQueryExtension) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -1594,7 +1594,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion) rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryVersion) + OS_LOAD_FUNCTION(fp, XRenderQueryVersion) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -1618,7 +1618,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles) XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5); */ { - LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) + OS_LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5); } @@ -1638,7 +1638,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRegion) XRenderSetPictureClipRegion(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, XRenderSetPictureClipRegion) + OS_LOAD_FUNCTION(fp, XRenderSetPictureClipRegion) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -1658,7 +1658,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform) XRenderSetPictureTransform(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderSetPictureTransform) + OS_LOAD_FUNCTION(fp, XRenderSetPictureTransform) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h index 0f8a897f15..26b53f1baf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h @@ -66,6 +66,8 @@ XtAppContext _XtDefaultAppContext(); #include <sys/select.h> #endif +#define OS_LOAD_FUNCTION LOAD_FUNCTION + #ifdef NO_XPRINTING_EXTENSIONS #define NO__1XpCancelJob #define NO__1XpCreateContext diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/Lock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/Lock.java index 7254f5266a..7254f5266a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/Lock.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/Lock.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh index 837e8d6be3..837e8d6be3 100644..100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtWebClient2Data_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtWebClient2Data_t.java index 3f6aecfa03..3f6aecfa03 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtWebClient2Data_t.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtWebClient2Data_t.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat index c3abb32a53..c3abb32a53 100644..100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat index a51de39e4c..a51de39e4c 100644..100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c index 6fbda3b2cd..39de3e9706 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c @@ -27,7 +27,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(AccessibleChildren) rc = (jint)AccessibleChildren((IAccessible *)arg0, (LONG)arg1, (LONG)arg2, (VARIANT *)arg3, (LONG *)lparg4); */ { - LOAD_FUNCTION(fp, AccessibleChildren) + COM_LOAD_FUNCTION(fp, AccessibleChildren) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(IAccessible *, LONG, LONG, VARIANT *, LONG *))fp)((IAccessible *)arg0, (LONG)arg1, (LONG)arg2, (VARIANT *)arg3, (LONG *)lparg4); } @@ -53,7 +53,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow) rc = (jint)AccessibleObjectFromWindow((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3); */ { - LOAD_FUNCTION(fp, AccessibleObjectFromWindow) + COM_LOAD_FUNCTION(fp, AccessibleObjectFromWindow) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWORD, GUID *, LPVOID *))fp)((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3); } @@ -220,7 +220,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject) rc = (jint)CreateStdAccessibleObject((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3); */ { - LOAD_FUNCTION(fp, CreateStdAccessibleObject) + COM_LOAD_FUNCTION(fp, CreateStdAccessibleObject) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, jint, GUID *, LPVOID *))fp)((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3); } @@ -414,7 +414,7 @@ JNIEXPORT jintLong JNICALL COM_NATIVE(LresultFromObject) rc = (jintLong)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2); */ { - LOAD_FUNCTION(fp, LresultFromObject) + COM_LOAD_FUNCTION(fp, LresultFromObject) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GUID *, jintLong, LPUNKNOWN))fp)(lparg0, arg1, (LPUNKNOWN)arg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h index 5e98453bd5..e2c5f176ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h @@ -15,6 +15,8 @@ #include "os_structs.h" #include "com_custom.h" +#define COM_LOAD_FUNCTION LOAD_FUNCTION + #define COM_NATIVE_ENTER_TRY(env, that, func) \ COM_NATIVE_ENTER(env, that, func); \ NATIVE_TRY(env, that, func); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index 997d92013a..e5fd6e3c23 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -63,7 +63,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ActivateActCtx) rc = (jboolean)ActivateActCtx(arg0, (ULONG_PTR*)lparg1); */ { - LOAD_FUNCTION(fp, ActivateActCtx) + OS_LOAD_FUNCTION(fp, ActivateActCtx) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, ULONG_PTR*))fp)(arg0, (ULONG_PTR*)lparg1); } @@ -99,7 +99,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA) rc = (jint)AddFontResourceExA(lparg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, AddFontResourceExA) + OS_LOAD_FUNCTION(fp, AddFontResourceExA) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jintLong))fp)(lparg0, arg1, arg2); } @@ -123,7 +123,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW) rc = (jint)AddFontResourceExW(lparg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, AddFontResourceExW) + OS_LOAD_FUNCTION(fp, AddFontResourceExW) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, jint, jintLong))fp)(lparg0, arg1, arg2); } @@ -161,7 +161,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow) rc = (jboolean)AllowSetForegroundWindow(arg0); */ { - LOAD_FUNCTION(fp, AllowSetForegroundWindow) + OS_LOAD_FUNCTION(fp, AllowSetForegroundWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -183,7 +183,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend) rc = (jboolean)AlphaBlend(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10); */ { - LOAD_FUNCTION(fp, AlphaBlend) + OS_LOAD_FUNCTION(fp, AlphaBlend) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, BLENDFUNCTION))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10); } @@ -205,7 +205,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow) rc = (jboolean)AnimateWindow((HWND)arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, AnimateWindow) + OS_LOAD_FUNCTION(fp, AnimateWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jint))fp)((HWND)arg0, arg1, arg2); } @@ -245,7 +245,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringA) rc = (jint)AssocQueryStringA(arg0, arg1, lparg2, lparg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, AssocQueryStringA) + OS_LOAD_FUNCTION(fp, AssocQueryStringA) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jbyte *, jbyte *, jbyte *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5); } @@ -278,7 +278,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringW) rc = (jint)AssocQueryStringW(arg0, arg1, lparg2, lparg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, AssocQueryStringW) + OS_LOAD_FUNCTION(fp, AssocQueryStringW) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jchar *, jchar *, jchar *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5); } @@ -393,7 +393,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(BeginBufferedPaint) rc = (jintLong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4); */ { - LOAD_FUNCTION(fp, BeginBufferedPaint) + OS_LOAD_FUNCTION(fp, BeginBufferedPaint) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HDC, RECT *, jint, BP_PAINTPARAMS *, HDC*))fp)((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4); } @@ -481,7 +481,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit) rc = (jint)BufferedPaintInit(); */ { - LOAD_FUNCTION(fp, BufferedPaintInit) + OS_LOAD_FUNCTION(fp, BufferedPaintInit) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -503,7 +503,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintSetAlpha) rc = (jint)BufferedPaintSetAlpha((HPAINTBUFFER)arg0, lparg1, arg2); */ { - LOAD_FUNCTION(fp, BufferedPaintSetAlpha) + OS_LOAD_FUNCTION(fp, BufferedPaintSetAlpha) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, RECT *, jbyte))fp)((HPAINTBUFFER)arg0, lparg1, arg2); } @@ -525,7 +525,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintUnInit) rc = (jint)BufferedPaintUnInit(); */ { - LOAD_FUNCTION(fp, BufferedPaintUnInit) + OS_LOAD_FUNCTION(fp, BufferedPaintUnInit) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -1001,7 +1001,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CloseGestureInfoHandle) rc = (jintLong)CloseGestureInfoHandle((HGESTUREINFO)arg0); */ { - LOAD_FUNCTION(fp, CloseGestureInfoHandle) + OS_LOAD_FUNCTION(fp, CloseGestureInfoHandle) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HGESTUREINFO))fp)((HGESTUREINFO)arg0); } @@ -1045,7 +1045,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData) rc = (jint)CloseThemeData((HTHEME)arg0); */ { - LOAD_FUNCTION(fp, CloseThemeData) + OS_LOAD_FUNCTION(fp, CloseThemeData) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME))fp)((HTHEME)arg0); } @@ -1065,7 +1065,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseTouchInputHandle) rc = (jboolean)CloseTouchInputHandle((HTOUCHINPUT)arg0); */ { - LOAD_FUNCTION(fp, CloseTouchInputHandle) + OS_LOAD_FUNCTION(fp, CloseTouchInputHandle) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HTOUCHINPUT))fp)((HTOUCHINPUT)arg0); } @@ -1107,7 +1107,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetIsFeatureEnabled) rc = (jint)CoInternetIsFeatureEnabled(arg0, arg1); */ { - LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled) + OS_LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1); } @@ -1127,7 +1127,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled) rc = (jint)CoInternetSetFeatureEnabled(arg0, arg1, (BOOL)arg2); */ { - LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled) + OS_LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, BOOL))fp)(arg0, arg1, (BOOL)arg2); } @@ -1321,7 +1321,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxA) rc = (jintLong)CreateActCtxA(lparg0); */ { - LOAD_FUNCTION(fp, CreateActCtxA) + OS_LOAD_FUNCTION(fp, CreateActCtxA) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0); } @@ -1344,7 +1344,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxW) rc = (jintLong)CreateActCtxW(lparg0); */ { - LOAD_FUNCTION(fp, CreateActCtxW) + OS_LOAD_FUNCTION(fp, CreateActCtxW) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0); } @@ -2044,6 +2044,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(DROPFILES_1sizeof) } #endif +#ifndef NO_DTTOPTS_1sizeof +JNIEXPORT jint JNICALL OS_NATIVE(DTTOPTS_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, DTTOPTS_1sizeof_FUNC); + rc = (jint)DTTOPTS_sizeof(); + OS_NATIVE_EXIT(env, that, DTTOPTS_1sizeof_FUNC); + return rc; +} +#endif + #ifndef NO_DWM_1BLURBEHIND_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(DWM_1BLURBEHIND_1sizeof) (JNIEnv *env, jclass that) @@ -2577,7 +2589,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground) rc = (jint)DrawThemeBackground((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5); */ { - LOAD_FUNCTION(fp, DrawThemeBackground) + OS_LOAD_FUNCTION(fp, DrawThemeBackground) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME, HDC, jint, jint, const RECT *, const RECT *))fp)((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5); } @@ -2604,7 +2616,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeEdge) rc = (jint)DrawThemeEdge(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7); */ { - LOAD_FUNCTION(fp, DrawThemeEdge) + OS_LOAD_FUNCTION(fp, DrawThemeEdge) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7); } @@ -2629,7 +2641,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeIcon) rc = (jint)DrawThemeIcon(arg0, arg1, arg2, arg3, lparg4, arg5, arg6); */ { - LOAD_FUNCTION(fp, DrawThemeIcon) + OS_LOAD_FUNCTION(fp, DrawThemeIcon) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jintLong, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6); } @@ -2653,7 +2665,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground) rc = (jint)DrawThemeParentBackground(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, DrawThemeParentBackground) + OS_LOAD_FUNCTION(fp, DrawThemeParentBackground) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, RECT *))fp)(arg0, arg1, lparg2); } @@ -2679,7 +2691,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText) rc = (jint)DrawThemeText(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8); */ { - LOAD_FUNCTION(fp, DrawThemeText) + OS_LOAD_FUNCTION(fp, DrawThemeText) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8); } @@ -2692,6 +2704,36 @@ fail: } #endif +#ifndef NO_DrawThemeTextEx +JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeTextEx) + (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8) +{ + jchar *lparg4=NULL; + RECT _arg7, *lparg7=NULL; + DTTOPTS _arg8, *lparg8=NULL; + jint rc = 0; + OS_NATIVE_ENTER(env, that, DrawThemeTextEx_FUNC); + if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg7) if ((lparg7 = getRECTFields(env, arg7, &_arg7)) == NULL) goto fail; + if (arg8) if ((lparg8 = getDTTOPTSFields(env, arg8, &_arg8)) == NULL) goto fail; +/* + rc = (jint)DrawThemeTextEx(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8); +*/ + { + OS_LOAD_FUNCTION(fp, DrawThemeTextEx) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, RECT *, DTTOPTS *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8); + } + } +fail: + if (arg8 && lparg8) setDTTOPTSFields(env, arg8, lparg8); + if (arg7 && lparg7) setRECTFields(env, arg7, lparg7); + if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0); + OS_NATIVE_EXIT(env, that, DrawThemeTextEx_FUNC); + return rc; +} +#endif + #ifndef NO_DuplicateHandle JNIEXPORT jboolean JNICALL OS_NATIVE(DuplicateHandle) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3, jint arg4, jboolean arg5, jint arg6) @@ -2720,7 +2762,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow) rc = (jint)DwmEnableBlurBehindWindow((HWND)arg0, lparg1); */ { - LOAD_FUNCTION(fp, DwmEnableBlurBehindWindow) + OS_LOAD_FUNCTION(fp, DwmEnableBlurBehindWindow) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWM_BLURBEHIND *))fp)((HWND)arg0, lparg1); } @@ -2744,7 +2786,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmExtendFrameIntoClientArea) rc = (jint)DwmExtendFrameIntoClientArea((HWND)arg0, lparg1); */ { - LOAD_FUNCTION(fp, DwmExtendFrameIntoClientArea) + OS_LOAD_FUNCTION(fp, DwmExtendFrameIntoClientArea) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, MARGINS *))fp)((HWND)arg0, lparg1); } @@ -2756,6 +2798,30 @@ fail: } #endif +#ifndef NO_DwmIsCompositionEnabled +JNIEXPORT jint JNICALL OS_NATIVE(DwmIsCompositionEnabled) + (JNIEnv *env, jclass that, jbooleanArray arg0) +{ + jboolean *lparg0=NULL; + jint rc = 0; + OS_NATIVE_ENTER(env, that, DwmIsCompositionEnabled_FUNC); + if (arg0) if ((lparg0 = (*env)->GetBooleanArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* + rc = (jint)DwmIsCompositionEnabled(lparg0); +*/ + { + OS_LOAD_FUNCTION(fp, DwmIsCompositionEnabled) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jboolean *))fp)(lparg0); + } + } +fail: + if (arg0 && lparg0) (*env)->ReleaseBooleanArrayElements(env, arg0, lparg0, 0); + OS_NATIVE_EXIT(env, that, DwmIsCompositionEnabled_FUNC); + return rc; +} +#endif + #ifndef NO_EMREXTCREATEFONTINDIRECTW_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(EMREXTCREATEFONTINDIRECTW_1sizeof) (JNIEnv *env, jclass that) @@ -2862,7 +2928,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint) rc = (jint)EndBufferedPaint((HPAINTBUFFER)arg0, arg1); */ { - LOAD_FUNCTION(fp, EndBufferedPaint) + OS_LOAD_FUNCTION(fp, EndBufferedPaint) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, jboolean))fp)((HPAINTBUFFER)arg0, arg1); } @@ -2948,7 +3014,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors) rc = (jboolean)EnumDisplayMonitors((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3); */ { - LOAD_FUNCTION(fp, EnumDisplayMonitors) + OS_LOAD_FUNCTION(fp, EnumDisplayMonitors) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, LPCRECT, MONITORENUMPROC, LPARAM))fp)((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3); } @@ -3050,7 +3116,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA) rc = (jboolean)EnumSystemLanguageGroupsA((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2); */ { - LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA) + OS_LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCA, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2); } @@ -3070,7 +3136,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW) rc = (jboolean)EnumSystemLanguageGroupsW((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2); */ { - LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW) + OS_LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCW, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2); } @@ -4055,7 +4121,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo) rc = (jboolean)GetComboBoxInfo((HWND)arg0, lparg1); */ { - LOAD_FUNCTION(fp, GetComboBoxInfo) + OS_LOAD_FUNCTION(fp, GetComboBoxInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, COMBOBOXINFO *))fp)((HWND)arg0, lparg1); } @@ -4395,7 +4461,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetGestureInfo) rc = (jboolean)GetGestureInfo((HGESTUREINFO)arg0, (PGESTUREINFO)lparg1); */ { - LOAD_FUNCTION(fp, GetGestureInfo) + OS_LOAD_FUNCTION(fp, GetGestureInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HGESTUREINFO, PGESTUREINFO))fp)((HGESTUREINFO)arg0, (PGESTUREINFO)lparg1); } @@ -4582,7 +4648,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes) rc = (jboolean)GetLayeredWindowAttributes((HWND)arg0, lparg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, GetLayeredWindowAttributes) + OS_LOAD_FUNCTION(fp, GetLayeredWindowAttributes) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint *, jbyte *, jint *))fp)((HWND)arg0, lparg1, lparg2, lparg3); } @@ -4606,7 +4672,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLayout) rc = (jint)GetLayout((HDC)arg0); */ { - LOAD_FUNCTION(fp, GetLayout) + OS_LOAD_FUNCTION(fp, GetLayout) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HDC))fp)((HDC)arg0); } @@ -4684,7 +4750,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo) rc = (jboolean)GetMenuBarInfo(arg0, arg1, arg2, lparg3); */ { - LOAD_FUNCTION(fp, GetMenuBarInfo) + OS_LOAD_FUNCTION(fp, GetMenuBarInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, MENUBARINFO *))fp)(arg0, arg1, arg2, lparg3); } @@ -4720,7 +4786,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo) rc = (jboolean)GetMenuInfo((HMENU)arg0, lparg1); */ { - LOAD_FUNCTION(fp, GetMenuInfo) + OS_LOAD_FUNCTION(fp, GetMenuInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1); } @@ -4936,7 +5002,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA) rc = (jboolean)GetMonitorInfoA((HMONITOR)arg0, (LPMONITORINFO)lparg1); */ { - LOAD_FUNCTION(fp, GetMonitorInfoA) + OS_LOAD_FUNCTION(fp, GetMonitorInfoA) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1); } @@ -4960,7 +5026,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW) rc = (jboolean)GetMonitorInfoW((HMONITOR)arg0, (LPMONITORINFO)lparg1); */ { - LOAD_FUNCTION(fp, GetMonitorInfoW) + OS_LOAD_FUNCTION(fp, GetMonitorInfoW) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1); } @@ -5829,7 +5895,7 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage) rc = (jshort)GetSystemDefaultUILanguage(); */ { - LOAD_FUNCTION(fp, GetSystemDefaultUILanguage) + OS_LOAD_FUNCTION(fp, GetSystemDefaultUILanguage) if (fp) { rc = (jshort)((jshort (CALLING_CONVENTION*)())fp)(); } @@ -6029,7 +6095,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundContentRect) rc = (jint)GetThemeBackgroundContentRect(arg0, arg1, arg2, arg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, GetThemeBackgroundContentRect) + OS_LOAD_FUNCTION(fp, GetThemeBackgroundContentRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5); } @@ -6056,7 +6122,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundExtent) rc = (jint)GetThemeBackgroundExtent(arg0, arg1, arg2, arg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, GetThemeBackgroundExtent) + OS_LOAD_FUNCTION(fp, GetThemeBackgroundExtent) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5); } @@ -6080,7 +6146,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeColor) rc = (jint)GetThemeColor(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, GetThemeColor) + OS_LOAD_FUNCTION(fp, GetThemeColor) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -6104,7 +6170,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeInt) rc = (jint)GetThemeInt(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, GetThemeInt) + OS_LOAD_FUNCTION(fp, GetThemeInt) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -6130,7 +6196,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMargins) rc = (jint)GetThemeMargins(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6); */ { - LOAD_FUNCTION(fp, GetThemeMargins) + OS_LOAD_FUNCTION(fp, GetThemeMargins) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, MARGINS *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6); } @@ -6155,7 +6221,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMetric) rc = (jint)GetThemeMetric(arg0, arg1, arg2, arg3, arg4, lparg5); */ { - LOAD_FUNCTION(fp, GetThemeMetric) + OS_LOAD_FUNCTION(fp, GetThemeMetric) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); } @@ -6181,7 +6247,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize) rc = (jint)GetThemePartSize(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6); */ { - LOAD_FUNCTION(fp, GetThemePartSize) + OS_LOAD_FUNCTION(fp, GetThemePartSize) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, SIZE *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6); } @@ -6206,7 +6272,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeRect) rc = (jint)GetThemeRect(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, GetThemeRect) + OS_LOAD_FUNCTION(fp, GetThemeRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -6228,7 +6294,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize) rc = (jint)GetThemeSysSize(arg0, arg1); */ { - LOAD_FUNCTION(fp, GetThemeSysSize) + OS_LOAD_FUNCTION(fp, GetThemeSysSize) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -6254,7 +6320,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent) rc = (jint)GetThemeTextExtent(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8); */ { - LOAD_FUNCTION(fp, GetThemeTextExtent) + OS_LOAD_FUNCTION(fp, GetThemeTextExtent) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8); } @@ -6334,7 +6400,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetTouchInputInfo) rc = (jboolean)GetTouchInputInfo((HTOUCHINPUT)arg0, (UINT)arg1, (PTOUCHINPUT)arg2, arg3); */ { - LOAD_FUNCTION(fp, GetTouchInputInfo) + OS_LOAD_FUNCTION(fp, GetTouchInputInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HTOUCHINPUT, UINT, PTOUCHINPUT, jint))fp)((HTOUCHINPUT)arg0, (UINT)arg1, (PTOUCHINPUT)arg2, arg3); } @@ -6634,7 +6700,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowTheme) rc = (jintLong)GetWindowTheme((HWND)arg0); */ { - LOAD_FUNCTION(fp, GetWindowTheme) + OS_LOAD_FUNCTION(fp, GetWindowTheme) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0); } @@ -6778,7 +6844,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill) rc = (jboolean)GradientFill((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5); */ { - LOAD_FUNCTION(fp, GradientFill) + OS_LOAD_FUNCTION(fp, GradientFill) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG))fp)((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5); } @@ -6924,7 +6990,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HitTestThemeBackground) rc = (jint)HitTestThemeBackground(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8); */ { - LOAD_FUNCTION(fp, HitTestThemeBackground) + OS_LOAD_FUNCTION(fp, HitTestThemeBackground) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, jintLong, POINT, jshort *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8); } @@ -7279,7 +7345,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDisableTextFrameService) rc = (jboolean)ImmDisableTextFrameService(arg0); */ { - LOAD_FUNCTION(fp, ImmDisableTextFrameService) + OS_LOAD_FUNCTION(fp, ImmDisableTextFrameService) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -7901,7 +7967,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed) rc = (jboolean)IsAppThemed(); */ { - LOAD_FUNCTION(fp, IsAppThemed) + OS_LOAD_FUNCTION(fp, IsAppThemed) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)(); } @@ -7957,7 +8023,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow) rc = (jboolean)IsHungAppWindow((HWND)arg0); */ { - LOAD_FUNCTION(fp, IsHungAppWindow) + OS_LOAD_FUNCTION(fp, IsHungAppWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0); } @@ -7991,7 +8057,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsTouchWindow) rc = (jboolean)IsTouchWindow((HWND)arg0, (PULONG)lparg1); */ { - LOAD_FUNCTION(fp, IsTouchWindow) + OS_LOAD_FUNCTION(fp, IsTouchWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, PULONG))fp)((HWND)arg0, (PULONG)lparg1); } @@ -8565,7 +8631,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MCIWndRegisterClass) rc = (jboolean)MCIWndRegisterClass(); */ { - LOAD_FUNCTION(fp, MCIWndRegisterClass) + OS_LOAD_FUNCTION(fp, MCIWndRegisterClass) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)(); } @@ -8837,7 +8903,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(MonitorFromWindow) rc = (jintLong)MonitorFromWindow(arg0, arg1); */ { - LOAD_FUNCTION(fp, MonitorFromWindow) + OS_LOAD_FUNCTION(fp, MonitorFromWindow) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11990,7 +12056,7 @@ JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent) NotifyWinEvent((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3); */ { - LOAD_FUNCTION(fp, NotifyWinEvent) + OS_LOAD_FUNCTION(fp, NotifyWinEvent) if (fp) { ((void (CALLING_CONVENTION*)(DWORD, HWND, LONG, LONG))fp)((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3); } @@ -12219,7 +12285,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData) rc = (jintLong)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1); */ { - LOAD_FUNCTION(fp, OpenThemeData) + OS_LOAD_FUNCTION(fp, OpenThemeData) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1); } @@ -12355,7 +12421,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PSPropertyKeyFromString) rc = (jint)PSPropertyKeyFromString(lparg0, lparg1); */ { - LOAD_FUNCTION(fp, PSPropertyKeyFromString) + OS_LOAD_FUNCTION(fp, PSPropertyKeyFromString) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, PROPERTYKEY *))fp)(lparg0, lparg1); } @@ -12586,7 +12652,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PrintWindow) rc = (jboolean)PrintWindow((HWND)arg0, (HDC)arg1, arg2); */ { - LOAD_FUNCTION(fp, PrintWindow) + OS_LOAD_FUNCTION(fp, PrintWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, jint))fp)((HWND)arg0, (HDC)arg1, arg2); } @@ -13228,7 +13294,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RegisterTouchWindow) rc = (jboolean)RegisterTouchWindow((HWND)arg0, (ULONG)arg1); */ { - LOAD_FUNCTION(fp, RegisterTouchWindow) + OS_LOAD_FUNCTION(fp, RegisterTouchWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, ULONG))fp)((HWND)arg0, (ULONG)arg1); } @@ -13582,7 +13648,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemFromRelativeName) rc = (jint)SHCreateItemFromRelativeName(arg0, lparg1, arg2, lparg3, lparg4); */ { - LOAD_FUNCTION(fp, SHCreateItemFromRelativeName) + OS_LOAD_FUNCTION(fp, SHCreateItemFromRelativeName) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jchar *, jintLong, jbyte *, jintLong *))fp)(arg0, lparg1, arg2, lparg3, lparg4); } @@ -13614,7 +13680,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemInKnownFolder) rc = (jint)SHCreateItemInKnownFolder(lparg0, arg1, lparg2, lparg3, lparg4); */ { - LOAD_FUNCTION(fp, SHCreateItemInKnownFolder) + OS_LOAD_FUNCTION(fp, SHCreateItemInKnownFolder) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jchar *, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3, lparg4); } @@ -16292,7 +16358,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetCurrentProcessExplicitAppUserModelID) rc = (jint)SetCurrentProcessExplicitAppUserModelID(lparg0); */ { - LOAD_FUNCTION(fp, SetCurrentProcessExplicitAppUserModelID) + OS_LOAD_FUNCTION(fp, SetCurrentProcessExplicitAppUserModelID) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jchar *))fp)(lparg0); } @@ -16370,7 +16436,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectoryA) rc = (jboolean)SetDllDirectoryA((LPSTR)lparg0); */ { - LOAD_FUNCTION(fp, SetDllDirectoryA) + OS_LOAD_FUNCTION(fp, SetDllDirectoryA) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LPSTR))fp)((LPSTR)lparg0); } @@ -16394,7 +16460,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectoryW) rc = (jboolean)SetDllDirectoryW((LPWSTR)lparg0); */ { - LOAD_FUNCTION(fp, SetDllDirectoryW) + OS_LOAD_FUNCTION(fp, SetDllDirectoryW) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LPWSTR))fp)((LPWSTR)lparg0); } @@ -16452,7 +16518,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetGestureConfig) rc = (jboolean)SetGestureConfig((HWND)arg0, arg1, arg2, (PGESTURECONFIG)arg3, arg4); */ { - LOAD_FUNCTION(fp, SetGestureConfig) + OS_LOAD_FUNCTION(fp, SetGestureConfig) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jint, PGESTURECONFIG, jint))fp)((HWND)arg0, arg1, arg2, (PGESTURECONFIG)arg3, arg4); } @@ -16484,7 +16550,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes) rc = (jboolean)SetLayeredWindowAttributes((HWND)arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, SetLayeredWindowAttributes) + OS_LOAD_FUNCTION(fp, SetLayeredWindowAttributes) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jbyte, jint))fp)((HWND)arg0, arg1, arg2, arg3); } @@ -16504,7 +16570,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetLayout) rc = (jint)SetLayout((HDC)arg0, (DWORD)arg1); */ { - LOAD_FUNCTION(fp, SetLayout) + OS_LOAD_FUNCTION(fp, SetLayout) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HDC, DWORD))fp)((HDC)arg0, (DWORD)arg1); } @@ -16574,7 +16640,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuInfo) rc = (jboolean)SetMenuInfo((HMENU)arg0, lparg1); */ { - LOAD_FUNCTION(fp, SetMenuInfo) + OS_LOAD_FUNCTION(fp, SetMenuInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1); } @@ -16706,7 +16772,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProcessDPIAware) rc = (jboolean)SetProcessDPIAware(); */ { - LOAD_FUNCTION(fp, SetProcessDPIAware) + OS_LOAD_FUNCTION(fp, SetProcessDPIAware) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)(); } @@ -17042,7 +17108,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowTheme) rc = (jint)SetWindowTheme((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2); */ { - LOAD_FUNCTION(fp, SetWindowTheme) + OS_LOAD_FUNCTION(fp, SetWindowTheme) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, LPCWSTR, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2); } @@ -17807,7 +17873,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt) rc = (jboolean)TransparentBlt(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); */ { - LOAD_FUNCTION(fp, TransparentBlt) + OS_LOAD_FUNCTION(fp, TransparentBlt) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); } @@ -17923,7 +17989,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterTouchWindow) rc = (jboolean)UnregisterTouchWindow(arg0); */ { - LOAD_FUNCTION(fp, UnregisterTouchWindow) + OS_LOAD_FUNCTION(fp, UnregisterTouchWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17951,7 +18017,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateLayeredWindow) rc = (jboolean)UpdateLayeredWindow((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8); */ { - LOAD_FUNCTION(fp, UpdateLayeredWindow) + OS_LOAD_FUNCTION(fp, UpdateLayeredWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, jint))fp)((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h index 49d530b235..decc12b8a7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h @@ -50,6 +50,8 @@ /* Optional custom definitions to exclude some types */ #include "defines.h" +#define OS_LOAD_FUNCTION LOAD_FUNCTION + /* Structs excludes */ #ifdef _WIN32_WCE #define NO_ACTCTX @@ -72,6 +74,7 @@ #define NO_DEVMODEW #define NO_DOCINFO #define NO_DWM_BLURBEHIND +#define NO_DTTOPTS #define NO_EMR #define NO_EMREXTCREATEFONTINDIRECTW #define NO_EXTLOGFONTW @@ -242,9 +245,11 @@ #define NO_DrawThemeIcon #define NO_DrawThemeParentBackground #define NO_DrawThemeText +#define NO_DrawThemeTextEx #define NO_DuplicateHandle #define NO_DwmEnableBlurBehindWindow #define NO_DwmExtendFrameIntoClientArea +#define NO_DTTOPTS_1sizeof #define NO_EnableScrollBar #define NO_EndBufferedPaint #define NO_EndDoc @@ -710,6 +715,43 @@ typedef struct _DWM_BLURBEHIND { } DWM_BLURBEHIND, *PDWM_BLURBEHIND; #endif +#ifndef _WIN32_WCE +#ifndef DTT_CALLBACK_PROC +typedef +int +(WINAPI *DTT_CALLBACK_PROC) +( + __in HDC hdc, + __inout_ecount(cchText) LPWSTR pszText, + __in int cchText, + __inout LPRECT prc, + __in UINT dwFlags, + __in LPARAM lParam); +#endif + +#ifndef _DTTOPTS +typedef struct _DTTOPTS +{ + DWORD dwSize; + DWORD dwFlags; + COLORREF crText; + COLORREF crBorder; + COLORREF crShadow; + int iTextShadowType; + POINT ptShadowOffset; + int iBorderSize; + int iFontPropId; + int iColorPropId; + int iStateId; + BOOL fApplyOverlay; + int iGlowSize; + DTT_CALLBACK_PROC pfnDrawTextCallback; + LPARAM lParam; +} DTTOPTS, *PDTTOPTS; +#endif +#endif /* _WIN32_WCE */ + + #if (_WIN32_IE <= 0x0600) typedef struct tagTVITEMCHANGE { NMHDR hdr; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h index a57a384fdc..22ce0ec683 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h @@ -38,8 +38,10 @@ #define DrawThemeIcon_LIB "uxtheme.dll" #define DrawThemeParentBackground_LIB "uxtheme.dll" #define DrawThemeText_LIB "uxtheme.dll" +#define DrawThemeTextEx_LIB "uxtheme.dll" #define DwmEnableBlurBehindWindow_LIB "dwmapi.dll" #define DwmExtendFrameIntoClientArea_LIB "dwmapi.dll" +#define DwmIsCompositionEnabled_LIB "dwmapi.dll" #define GetGestureInfo_LIB "user32.dll" #define GetThemeInt_LIB "uxtheme.dll" #define GetThemeMargins_LIB "uxtheme.dll" diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c index 0accdd13d2..e0932640d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1064; -int OS_nativeFunctionCallCount[1064]; +int OS_nativeFunctionCount = 1067; +int OS_nativeFunctionCallCount[1067]; char * OS_nativeFunctionNames[] = { "ACCEL_1sizeof", "ACTCTX_1sizeof", @@ -166,6 +166,7 @@ char * OS_nativeFunctionNames[] = { "DPtoLP", "DRAWITEMSTRUCT_1sizeof", "DROPFILES_1sizeof", + "DTTOPTS_1sizeof", "DWM_1BLURBEHIND_1sizeof", "DefFrameProcA", "DefFrameProcW", @@ -207,9 +208,11 @@ char * OS_nativeFunctionNames[] = { "DrawThemeIcon", "DrawThemeParentBackground", "DrawThemeText", + "DrawThemeTextEx", "DuplicateHandle", "DwmEnableBlurBehindWindow", "DwmExtendFrameIntoClientArea", + "DwmIsCompositionEnabled", "EMREXTCREATEFONTINDIRECTW_1sizeof", "EMR_1sizeof", "EXTLOGFONTW_1sizeof", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h index 158eee7e48..617be7433d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h @@ -174,6 +174,7 @@ typedef enum { DPtoLP_FUNC, DRAWITEMSTRUCT_1sizeof_FUNC, DROPFILES_1sizeof_FUNC, + DTTOPTS_1sizeof_FUNC, DWM_1BLURBEHIND_1sizeof_FUNC, DefFrameProcA_FUNC, DefFrameProcW_FUNC, @@ -215,9 +216,11 @@ typedef enum { DrawThemeIcon_FUNC, DrawThemeParentBackground_FUNC, DrawThemeText_FUNC, + DrawThemeTextEx_FUNC, DuplicateHandle_FUNC, DwmEnableBlurBehindWindow_FUNC, DwmExtendFrameIntoClientArea_FUNC, + DwmIsCompositionEnabled_FUNC, EMREXTCREATEFONTINDIRECTW_1sizeof_FUNC, EMR_1sizeof_FUNC, EXTLOGFONTW_1sizeof_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c index 3e2d07c17b..d97d093d86 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c @@ -1807,6 +1807,85 @@ void setDROPFILESFields(JNIEnv *env, jobject lpObject, DROPFILES *lpStruct) } #endif +#ifndef NO_DTTOPTS +typedef struct DTTOPTS_FID_CACHE { + int cached; + jclass clazz; + jfieldID dwSize, dwFlags, crText, crBorder, crShadow, iTextShadowType, ptShadowOffset, iBorderSize, iFontPropId, iColorPropId, iStateId, fApplyOverlay, iGlowSize, pfnDrawTextCallback, lParam; +} DTTOPTS_FID_CACHE; + +DTTOPTS_FID_CACHE DTTOPTSFc; + +void cacheDTTOPTSFields(JNIEnv *env, jobject lpObject) +{ + if (DTTOPTSFc.cached) return; + DTTOPTSFc.clazz = (*env)->GetObjectClass(env, lpObject); + DTTOPTSFc.dwSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "dwSize", "I"); + DTTOPTSFc.dwFlags = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "dwFlags", "I"); + DTTOPTSFc.crText = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "crText", I_J); + DTTOPTSFc.crBorder = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "crBorder", I_J); + DTTOPTSFc.crShadow = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "crShadow", I_J); + DTTOPTSFc.iTextShadowType = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iTextShadowType", "I"); + DTTOPTSFc.ptShadowOffset = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "ptShadowOffset", "Lorg/eclipse/swt/internal/win32/POINT;"); + DTTOPTSFc.iBorderSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iBorderSize", "I"); + DTTOPTSFc.iFontPropId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iFontPropId", "I"); + DTTOPTSFc.iColorPropId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iColorPropId", "I"); + DTTOPTSFc.iStateId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iStateId", "I"); + DTTOPTSFc.fApplyOverlay = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "fApplyOverlay", "Z"); + DTTOPTSFc.iGlowSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iGlowSize", "I"); + DTTOPTSFc.pfnDrawTextCallback = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "pfnDrawTextCallback", I_J); + DTTOPTSFc.lParam = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "lParam", I_J); + DTTOPTSFc.cached = 1; +} + +DTTOPTS *getDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct) +{ + if (!DTTOPTSFc.cached) cacheDTTOPTSFields(env, lpObject); + lpStruct->dwSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.dwSize); + lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, DTTOPTSFc.dwFlags); + lpStruct->crText = (*env)->GetIntLongField(env, lpObject, DTTOPTSFc.crText); + lpStruct->crBorder = (*env)->GetIntLongField(env, lpObject, DTTOPTSFc.crBorder); + lpStruct->crShadow = (*env)->GetIntLongField(env, lpObject, DTTOPTSFc.crShadow); + lpStruct->iTextShadowType = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iTextShadowType); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, DTTOPTSFc.ptShadowOffset); + if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->ptShadowOffset); + } + lpStruct->iBorderSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iBorderSize); + lpStruct->iFontPropId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iFontPropId); + lpStruct->iColorPropId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iColorPropId); + lpStruct->iStateId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iStateId); + lpStruct->fApplyOverlay = (*env)->GetBooleanField(env, lpObject, DTTOPTSFc.fApplyOverlay); + lpStruct->iGlowSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iGlowSize); + lpStruct->pfnDrawTextCallback = (DTT_CALLBACK_PROC)(*env)->GetIntLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback); + lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, DTTOPTSFc.lParam); + return lpStruct; +} + +void setDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct) +{ + if (!DTTOPTSFc.cached) cacheDTTOPTSFields(env, lpObject); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.dwSize, (jint)lpStruct->dwSize); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.dwFlags, (jint)lpStruct->dwFlags); + (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.crText, (jintLong)lpStruct->crText); + (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.crBorder, (jintLong)lpStruct->crBorder); + (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.crShadow, (jintLong)lpStruct->crShadow); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.iTextShadowType, (jint)lpStruct->iTextShadowType); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, DTTOPTSFc.ptShadowOffset); + if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->ptShadowOffset); + } + (*env)->SetIntField(env, lpObject, DTTOPTSFc.iBorderSize, (jint)lpStruct->iBorderSize); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.iFontPropId, (jint)lpStruct->iFontPropId); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.iColorPropId, (jint)lpStruct->iColorPropId); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.iStateId, (jint)lpStruct->iStateId); + (*env)->SetBooleanField(env, lpObject, DTTOPTSFc.fApplyOverlay, (jboolean)lpStruct->fApplyOverlay); + (*env)->SetIntField(env, lpObject, DTTOPTSFc.iGlowSize, (jint)lpStruct->iGlowSize); + (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback, (jintLong)lpStruct->pfnDrawTextCallback); + (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.lParam, (jintLong)lpStruct->lParam); +} +#endif + #ifndef NO_DWM_BLURBEHIND typedef struct DWM_BLURBEHIND_FID_CACHE { int cached; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h index aa120cbb01..2028c725ea 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h @@ -383,6 +383,18 @@ void setDROPFILESFields(JNIEnv *env, jobject lpObject, DROPFILES *lpStruct); #define DROPFILES_sizeof() 0 #endif +#ifndef NO_DTTOPTS +void cacheDTTOPTSFields(JNIEnv *env, jobject lpObject); +DTTOPTS *getDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct); +void setDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct); +#define DTTOPTS_sizeof() sizeof(DTTOPTS) +#else +#define cacheDTTOPTSFields(a,b) +#define getDTTOPTSFields(a,b,c) NULL +#define setDTTOPTSFields(a,b,c) +#define DTTOPTS_sizeof() 0 +#endif + #ifndef NO_DWM_BLURBEHIND void cacheDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject); DWM_BLURBEHIND *getDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject, DWM_BLURBEHIND *lpStruct); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java index 5b7b44b10b..d413e38bac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java @@ -104,7 +104,8 @@ public class Gdip extends Platform { public static final int PixelFormat48bppRGB = (12 | (48 << 8) | PixelFormatExtended); public static final int PixelFormat64bppARGB = (13 | (64 << 8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended); public static final int PixelFormat64bppPARGB = (14 | (64 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended); - public static final int PixelFormatMax = 15; + public static final int PixelFormat32bppCMYK = (15 | (32 << 8)); + public static final int PixelFormatMax = 16; public static final int PixelOffsetModeNone = QualityModeHigh + 1; public static final int PixelOffsetModeHalf = QualityModeHigh + 2; public static final int SmoothingModeDefault = QualityModeDefault; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java new file mode 100644 index 0000000000..224d91df4e --- /dev/null +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java @@ -0,0 +1,32 @@ +/*******************************************************************************
+ * Copyright (c) 2011 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.win32;
+
+
+public class DTTOPTS {
+ public int dwSize;
+ public int dwFlags;
+ public int /*long*/ crText;
+ public int /*long*/ crBorder;
+ public int /*long*/ crShadow;
+ public int iTextShadowType;
+ public POINT ptShadowOffset;
+ public int iBorderSize;
+ public int iFontPropId;
+ public int iColorPropId;
+ public int iStateId;
+ public boolean fApplyOverlay;
+ public int iGlowSize;
+ /** @field cast=(DTT_CALLBACK_PROC) */
+ public int /*long*/ pfnDrawTextCallback;
+ public int /*long*/ lParam;
+ public static final int sizeof = OS.DTTOPTS_sizeof ();
+}
\ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java index 20105dc294..468689c544 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java @@ -2267,6 +2267,7 @@ public static final native int DOCHOSTUIINFO_sizeof (); public static final native int DOCINFO_sizeof (); public static final native int DRAWITEMSTRUCT_sizeof (); public static final native int DROPFILES_sizeof (); +public static final native int DTTOPTS_sizeof (); public static final native int DWM_BLURBEHIND_sizeof (); public static final native int EMR_sizeof (); public static final native int EMREXTCREATEFONTINDIRECTW_sizeof (); @@ -4026,6 +4027,8 @@ public static final native int DrawThemeIcon (int /*long*/ hTheme, int /*long*/ public static final native int DrawThemeParentBackground (int /*long*/ hwnd, int /*long*/ hdc, RECT prc); /** @method flags=dynamic */ public static final native int DrawThemeText (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect); +/** @method flags=dynamic */ +public static final native int DrawThemeTextEx (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwFlags, RECT pRect, DTTOPTS pOptions); /** * @method flags=dynamic * @param hWnd cast=(HWND) @@ -4035,7 +4038,9 @@ public static final native int DwmEnableBlurBehindWindow (int /*long*/ hWnd, DWM * @method flags=dynamic * @param hWnd cast=(HWND) */ -public static final native int DwmExtendFrameIntoClientArea (int /*long*/ hWnd, MARGINS pMarInset); +public static final native int DwmExtendFrameIntoClientArea (int /*long*/ hWnd, MARGINS pMarInset); +/** @method flags=dynamic */ +public static final native int DwmIsCompositionEnabled (boolean[] pfEnabled); /** @param hdc cast=(HDC) */ public static final native boolean Ellipse (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); /** @param hMenu cast=(HMENU) */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat index 7806691722..7806691722 100644..100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java index 4f96ceddd4..4f96ceddd4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java index 1682623ef8..1682623ef8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java index 334d7aa6ba..334d7aa6ba 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/package.html b/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/package.html index 4de0891972..4de0891972 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/PrintDialog.java index 4829e2d888..4829e2d888 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/PrintDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java index 6474368380..6474368380 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/PrintDialog.java index 4829e2d888..4829e2d888 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/PrintDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/Printer.java index fb8ca9ab68..fb8ca9ab68 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/Printer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/Printer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java index dfbdfca53b..dfbdfca53b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java index ac206dd8b1..ac206dd8b1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/common/org/eclipse/swt/program/package.html b/bundles/org.eclipse.swt/Eclipse SWT Program/common/org/eclipse/swt/program/package.html index 99d655607e..99d655607e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/common/org/eclipse/swt/program/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/common/org/eclipse/swt/program/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c index 4160de1b98..276ffef2b6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -221,7 +221,7 @@ JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1wi rc = (jintLong)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1); */ { - LOAD_FUNCTION(fp, gnome_vfs_make_uri_from_input_with_dirs) + GNOME_LOAD_FUNCTION(fp, gnome_vfs_make_uri_from_input_with_dirs) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, jint))fp)((const char *)lparg0, arg1); } @@ -253,7 +253,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch) rc = (jint)gnome_vfs_mime_application_launch((GnomeVFSMimeApplication *)arg0, (GList *)arg1); */ { - LOAD_FUNCTION(fp, gnome_vfs_mime_application_launch) + GNOME_LOAD_FUNCTION(fp, gnome_vfs_mime_application_launch) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GnomeVFSMimeApplication *, GList *))fp)((GnomeVFSMimeApplication *)arg0, (GList *)arg1); } @@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show) rc = (jint)gnome_vfs_url_show((const char *)arg0); */ { - LOAD_FUNCTION(fp, gnome_vfs_url_show) + GNOME_LOAD_FUNCTION(fp, gnome_vfs_url_show) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const char *))fp)((const char *)arg0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h index 07f1b5a057..9937221066 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h @@ -28,6 +28,8 @@ #include <libgnomevfs/gnome-vfs-mime-handlers.h> #include <libgnomevfs/gnome-vfs-mime-info.h> +#define GNOME_LOAD_FUNCTION LOAD_FUNCTION + #ifdef AIX #define LIB_VFS "libgnomevfs-2.a(libgnomevfs-2.so.0)" #elif HPUX diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java index 58a8d97e20..58a8d97e20 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java index 741fa4666f..741fa4666f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java index 65b7177863..65b7177863 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c index 3ce68d9355..a326248cef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -37,7 +37,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSClassCreate_FUNC); - rc = (jintLong)JSClassCreate((const JSClassDefinition*)arg0); +/* + rc = (jintLong)JSClassCreate(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSClassCreate) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSClassCreate_FUNC); return rc; } @@ -49,7 +57,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSContextGetGlobalObject_FUNC); - rc = (jintLong)JSContextGetGlobalObject((JSContextRef)arg0); +/* + rc = (jintLong)JSContextGetGlobalObject(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSContextGetGlobalObject) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSContextGetGlobalObject_FUNC); return rc; } @@ -63,7 +79,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); +/* + rc = (jintLong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); + } + } fail: if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSEvaluateScript_FUNC); @@ -77,7 +101,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPrivate_FUNC); - rc = (jintLong)JSObjectGetPrivate((JSObjectRef)arg0); +/* + rc = (jintLong)JSObjectGetPrivate(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPrivate) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPrivate_FUNC); return rc; } @@ -91,7 +123,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); +/* + rc = (jintLong)JSObjectGetProperty(arg0, arg1, arg2, lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong *))fp)(arg0, arg1, arg2, lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetProperty_FUNC); @@ -107,7 +147,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); +/* + rc = (jintLong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPropertyAtIndex_FUNC); @@ -121,7 +169,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMake_FUNC); - rc = (jintLong)JSObjectMake((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2); +/* + rc = (jintLong)JSObjectMake(arg0, arg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMake) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMake_FUNC); return rc; } @@ -137,7 +193,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeArray_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); +/* + rc = (jintLong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); @@ -152,7 +216,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); - rc = (jintLong)JSObjectMakeFunctionWithCallback((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2); +/* + rc = (jintLong)JSObjectMakeFunctionWithCallback(arg0, arg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeFunctionWithCallback) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); return rc; } @@ -165,7 +237,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) jintLong *lparg5=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - JSObjectSetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5); +/* + JSObjectSetProperty(arg0, arg1, arg2, arg3, arg4, lparg5); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); + } + } fail: if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectSetProperty_FUNC); @@ -180,7 +260,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringCreateWithUTF8CString_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)JSStringCreateWithUTF8CString((const char *)lparg0); +/* + rc = (jintLong)JSStringCreateWithUTF8CString(lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringCreateWithUTF8CString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringCreateWithUTF8CString_FUNC); @@ -194,7 +282,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetLength_FUNC); - rc = (jintLong)JSStringGetLength((JSStringRef)arg0); +/* + rc = (jintLong)JSStringGetLength(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetLength) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetLength_FUNC); return rc; } @@ -206,7 +302,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); - rc = (jintLong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0); +/* + rc = (jintLong)JSStringGetMaximumUTF8CStringSize(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetMaximumUTF8CStringSize) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); return rc; } @@ -220,7 +324,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)JSStringGetUTF8CString((JSStringRef)arg0, (char *)lparg1, (size_t)arg2); +/* + rc = (jintLong)JSStringGetUTF8CString(arg0, lparg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetUTF8CString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong))fp)(arg0, lparg1, arg2); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetUTF8CString_FUNC); @@ -236,7 +348,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringIsEqualToUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jint)JSStringIsEqualToUTF8CString((JSStringRef)arg0, (const char *)lparg1); +/* + rc = (jint)JSStringIsEqualToUTF8CString(arg0, lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringIsEqualToUTF8CString) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringIsEqualToUTF8CString_FUNC); @@ -249,7 +369,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1JSStringRelease_FUNC); - JSStringRelease((JSStringRef)arg0); +/* + JSStringRelease(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringRelease) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringRelease_FUNC); } #endif @@ -260,7 +388,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueGetType_FUNC); - rc = (jint)JSValueGetType((JSContextRef)arg0, (JSValueRef)arg1); +/* + rc = (jint)JSValueGetType(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueGetType) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueGetType_FUNC); return rc; } @@ -272,7 +408,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueIsObjectOfClass_FUNC); - rc = (jint)JSValueIsObjectOfClass((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2); +/* + rc = (jint)JSValueIsObjectOfClass(arg0, arg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueIsObjectOfClass) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueIsObjectOfClass_FUNC); return rc; } @@ -284,7 +428,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeBoolean_FUNC); - rc = (jintLong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1); +/* + rc = (jintLong)JSValueMakeBoolean(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeBoolean) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeBoolean_FUNC); return rc; } @@ -296,7 +448,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeNumber_FUNC); - rc = (jintLong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1); +/* + rc = (jintLong)JSValueMakeNumber(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeNumber) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeNumber_FUNC); return rc; } @@ -308,7 +468,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeString_FUNC); - rc = (jintLong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1); +/* + rc = (jintLong)JSValueMakeString(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeString_FUNC); return rc; } @@ -320,7 +488,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeUndefined_FUNC); - rc = (jintLong)JSValueMakeUndefined((JSContextRef)arg0); +/* + rc = (jintLong)JSValueMakeUndefined(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeUndefined) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeUndefined_FUNC); return rc; } @@ -332,7 +508,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueToBoolean) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToBoolean_FUNC); - rc = (jint)JSValueToBoolean((JSContextRef)arg0, (JSValueRef)arg1); +/* + rc = (jint)JSValueToBoolean(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToBoolean) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToBoolean_FUNC); return rc; } @@ -346,7 +530,15 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToNumber_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jdouble)JSValueToNumber((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); +/* + rc = (jdouble)JSValueToNumber(arg0, arg1, lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber) + if (fp) { + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToNumber_FUNC); @@ -362,7 +554,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); +/* + rc = (jintLong)JSValueToStringCopy(arg0, arg1, lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToStringCopy_FUNC); @@ -370,18 +570,6 @@ fail: } #endif -#ifndef NO__1SOUP_1IS_1SESSION -JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1SOUP_1IS_1SESSION) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - WebKitGTK_NATIVE_ENTER(env, that, _1SOUP_1IS_1SESSION_FUNC); - rc = (jboolean)SOUP_IS_SESSION(arg0); - WebKitGTK_NATIVE_EXIT(env, that, _1SOUP_1IS_1SESSION_FUNC); - return rc; -} -#endif - #ifndef NO__1SoupCookie_1expires JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) (JNIEnv *env, jclass that, jintLong arg0) @@ -428,18 +616,6 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) } #endif -#ifndef NO__1WEBKIT_1IS_1WEB_1FRAME -JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1WEBKIT_1IS_1WEB_1FRAME) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - WebKitGTK_NATIVE_ENTER(env, that, _1WEBKIT_1IS_1WEB_1FRAME_FUNC); - rc = (jboolean)WEBKIT_IS_WEB_FRAME(arg0); - WebKitGTK_NATIVE_EXIT(env, that, _1WEBKIT_1IS_1WEB_1FRAME_FUNC); - return rc; -} -#endif - #ifndef NO__1soup_1auth_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) @@ -449,7 +625,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1authenticate_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - soup_auth_authenticate((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2); +/* + soup_auth_authenticate(arg0, lparg1, lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_authenticate) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -463,7 +647,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1host_FUNC); - rc = (jintLong)soup_auth_get_host((SoupAuth *)arg0); +/* + rc = (jintLong)soup_auth_get_host(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_host) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1host_FUNC); return rc; } @@ -475,7 +667,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); - rc = (jintLong)soup_auth_get_scheme_name((SoupAuth *)arg0); +/* + rc = (jintLong)soup_auth_get_scheme_name(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_scheme_name) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); return rc; } @@ -486,7 +686,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); - soup_cookie_jar_add_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1); +/* + soup_cookie_jar_add_cookie(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_add_cookie) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); } #endif @@ -497,7 +705,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); - rc = (jintLong)soup_cookie_jar_all_cookies((SoupCookieJar *)arg0); +/* + rc = (jintLong)soup_cookie_jar_all_cookies(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_all_cookies) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); return rc; } @@ -508,7 +724,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); - soup_cookie_jar_delete_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1); +/* + soup_cookie_jar_delete_cookie(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_delete_cookie) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); } #endif @@ -519,7 +743,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); - rc = (jintLong)soup_cookie_jar_get_cookies((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2); +/* + rc = (jintLong)soup_cookie_jar_get_cookies(arg0, arg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_cookies) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint))fp)(arg0, arg1, arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); return rc; } @@ -531,7 +763,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); +/* rc = (jintLong)soup_cookie_jar_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); return rc; } @@ -545,7 +785,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1parse_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)soup_cookie_parse((const char *)lparg0, (SoupURI *)arg1); +/* + rc = (jintLong)soup_cookie_parse(lparg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_parse) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong))fp)(lparg0, arg1); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1parse_FUNC); @@ -558,7 +806,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1append_FUNC); - soup_message_body_append((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3); +/* + soup_message_body_append(arg0, arg1, arg2, arg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_append) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1append_FUNC); } #endif @@ -568,7 +824,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1flatten_FUNC); - soup_message_body_flatten((SoupMessageBody *)arg0); +/* + soup_message_body_flatten(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_flatten) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1flatten_FUNC); } #endif @@ -579,7 +843,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1get_1uri_FUNC); - rc = (jintLong)soup_message_get_uri((SoupMessage *)arg0); +/* + rc = (jintLong)soup_message_get_uri(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1get_1uri_FUNC); return rc; } @@ -594,7 +866,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1headers_1append_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - soup_message_headers_append((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2); +/* + soup_message_headers_append(arg0, lparg1, lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_headers_append) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -607,7 +887,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); - soup_session_add_feature_by_type((SoupSession *)arg0, (GType)arg1); +/* + soup_session_add_feature_by_type(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_add_feature_by_type) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); } #endif @@ -617,7 +905,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1attach_FUNC); - soup_session_feature_attach((SoupSessionFeature *)arg0, (SoupSession *)arg1); +/* + soup_session_feature_attach(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_attach) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1attach_FUNC); } #endif @@ -627,7 +923,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1detach_FUNC); - soup_session_feature_detach((SoupSessionFeature *)arg0, (SoupSession *)arg1); +/* + soup_session_feature_detach(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_detach) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1detach_FUNC); } #endif @@ -638,18 +942,54 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC); - rc = (jintLong)soup_session_get_feature((SoupSession *)arg0, (GType)arg1); +/* + rc = (jintLong)soup_session_get_feature(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_feature) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1feature_FUNC); return rc; } #endif +#ifndef NO__1soup_1session_1get_1type +JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1type_FUNC); +/* + rc = (jintLong)soup_session_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1type_FUNC); + return rc; +} +#endif + #ifndef NO__1soup_1uri_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1free_FUNC); - soup_uri_free((SoupURI *)arg0); +/* + soup_uri_free(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_free) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1free_FUNC); } #endif @@ -662,7 +1002,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)soup_uri_new((const char *)lparg0); +/* + rc = (jintLong)soup_uri_new(lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1new_FUNC); @@ -676,18 +1024,258 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1to_1string_FUNC); - rc = (jintLong)soup_uri_to_string((SoupURI *)arg0, arg1); +/* + rc = (jintLong)soup_uri_to_string(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_to_string) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1to_1string_FUNC); return rc; } #endif +#ifndef NO__1webkit_1dom_1event_1target_1add_1event_1listener +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1event_1target_1add_1event_1listener) + (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jintLong arg4) +{ + jbyte *lparg1=NULL; + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1event_1target_1add_1event_1listener_FUNC); + if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* + rc = (jint)webkit_dom_event_target_add_event_listener(arg0, lparg1, arg2, arg3, arg4); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_event_target_add_event_listener) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jint, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); + } + } +fail: + if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1event_1target_1add_1event_1listener_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1alt_1key +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1key) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC); +/* + rc = (jint)webkit_dom_mouse_event_get_alt_key(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_alt_key) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1button +JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1button) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jshort rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1button_FUNC); +/* + rc = (jshort)webkit_dom_mouse_event_get_button(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_button) + if (fp) { + rc = (jshort)((jshort (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1button_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1ctrl_1key +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1key) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC); +/* + rc = (jint)webkit_dom_mouse_event_get_ctrl_key(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_ctrl_key) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1meta_1key +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1key) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC); +/* + rc = (jint)webkit_dom_mouse_event_get_meta_key(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_meta_key) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1screen_1x +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1screen_1x) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jlong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC); +/* + rc = (jlong)webkit_dom_mouse_event_get_screen_x(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_screen_x) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1screen_1y +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1screen_1y) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jlong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC); +/* + rc = (jlong)webkit_dom_mouse_event_get_screen_y(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_screen_y) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1mouse_1event_1get_1shift_1key +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_1key) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC); +/* + rc = (jint)webkit_dom_mouse_event_get_shift_key(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_shift_key) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1ui_1event_1get_1char_1code +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1code) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jlong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC); +/* + rc = (jlong)webkit_dom_ui_event_get_char_code(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_char_code) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1ui_1event_1get_1detail +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jlong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1detail_FUNC); +/* + rc = (jlong)webkit_dom_ui_event_get_detail(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_detail) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1detail_FUNC); + return rc; +} +#endif + +#ifndef NO__1webkit_1dom_1ui_1event_1get_1key_1code +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1code) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jlong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC); +/* + rc = (jlong)webkit_dom_ui_event_get_key_code(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_key_code) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC); + return rc; +} +#endif + #ifndef NO__1webkit_1download_1cancel JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1cancel_FUNC); - webkit_download_cancel((WebKitDownload *)arg0); +/* + webkit_download_cancel(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_cancel) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1cancel_FUNC); } #endif @@ -698,7 +1286,15 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1current_1size_FUNC); - rc = (jlong)webkit_download_get_current_size((WebKitDownload *)arg0); +/* + rc = (jlong)webkit_download_get_current_size(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_current_size) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1current_1size_FUNC); return rc; } @@ -710,7 +1306,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1status_FUNC); - rc = (jint)webkit_download_get_status((WebKitDownload *)arg0); +/* + rc = (jint)webkit_download_get_status(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1status_FUNC); return rc; } @@ -722,7 +1326,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1 { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); - rc = (jintLong)webkit_download_get_suggested_filename((WebKitDownload *)arg0); +/* + rc = (jintLong)webkit_download_get_suggested_filename(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_suggested_filename) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); return rc; } @@ -734,7 +1346,15 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1total_1size_FUNC); - rc = (jlong)webkit_download_get_total_size((WebKitDownload *)arg0); +/* + rc = (jlong)webkit_download_get_total_size(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_total_size) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1total_1size_FUNC); return rc; } @@ -746,7 +1366,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1uri_FUNC); - rc = (jintLong)webkit_download_get_uri((WebKitDownload *)arg0); +/* + rc = (jintLong)webkit_download_get_uri(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1uri_FUNC); return rc; } @@ -759,7 +1387,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1ur jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - webkit_download_set_destination_uri((WebKitDownload *)arg0, (const gchar *)lparg1); +/* + webkit_download_set_destination_uri(arg0, lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination_uri) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); @@ -772,7 +1408,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1default_1session_FUNC); +/* rc = (jintLong)webkit_get_default_session(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_get_default_session) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1default_1session_FUNC); return rc; } @@ -784,7 +1428,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1major_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1major_1version_FUNC); +/* rc = (jint)webkit_major_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_major_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1major_1version_FUNC); return rc; } @@ -796,7 +1448,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1micro_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1micro_1version_FUNC); +/* rc = (jint)webkit_micro_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_micro_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1micro_1version_FUNC); return rc; } @@ -808,7 +1468,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1minor_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1minor_1version_FUNC); +/* rc = (jint)webkit_minor_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_minor_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1minor_1version_FUNC); return rc; } @@ -820,7 +1488,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1mes { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1message_FUNC); - rc = (jintLong)webkit_network_request_get_message((WebKitNetworkRequest *)arg0); +/* + rc = (jintLong)webkit_network_request_get_message(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_message) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1message_FUNC); return rc; } @@ -832,7 +1508,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1uri_FUNC); - rc = (jintLong)webkit_network_request_get_uri((WebKitNetworkRequest *)arg0); +/* + rc = (jintLong)webkit_network_request_get_uri(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1uri_FUNC); return rc; } @@ -846,7 +1530,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)webkit_network_request_new((const gchar *)lparg0); +/* + rc = (jintLong)webkit_network_request_new(lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1new_FUNC); @@ -860,7 +1552,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1t { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); +/* rc = (jintLong)webkit_soup_auth_dialog_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_soup_auth_dialog_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); return rc; } @@ -872,7 +1572,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1da { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); - rc = (jintLong)webkit_web_data_source_get_data((WebKitWebDataSource *)arg0); +/* + rc = (jintLong)webkit_web_data_source_get_data(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_data) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); return rc; } @@ -884,7 +1592,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1en { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); - rc = (jintLong)webkit_web_data_source_get_encoding((WebKitWebDataSource *)arg0); +/* + rc = (jintLong)webkit_web_data_source_get_encoding(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_encoding) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); return rc; } @@ -896,7 +1612,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1sou { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); - rc = (jintLong)webkit_web_frame_get_data_source((WebKitWebFrame *)arg0); +/* + rc = (jintLong)webkit_web_frame_get_data_source(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_data_source) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); return rc; } @@ -908,7 +1632,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1c { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); - rc = (jintLong)webkit_web_frame_get_global_context((WebKitWebFrame *)arg0); +/* + rc = (jintLong)webkit_web_frame_get_global_context(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_global_context) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); return rc; } @@ -920,7 +1652,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); - rc = (jint)webkit_web_frame_get_load_status((WebKitWebFrame *)arg0); +/* + rc = (jint)webkit_web_frame_get_load_status(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_load_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); return rc; } @@ -932,7 +1672,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); - rc = (jintLong)webkit_web_frame_get_parent((WebKitWebFrame *)arg0); +/* + rc = (jintLong)webkit_web_frame_get_parent(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_parent) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); return rc; } @@ -944,19 +1692,55 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1title_FUNC); - rc = (jintLong)webkit_web_frame_get_title((WebKitWebFrame *)arg0); +/* + rc = (jintLong)webkit_web_frame_get_title(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_title) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1title_FUNC); return rc; } #endif +#ifndef NO__1webkit_1web_1frame_1get_1type +JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1type_FUNC); +/* + rc = (jintLong)webkit_web_frame_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1type_FUNC); + return rc; +} +#endif + #ifndef NO__1webkit_1web_1frame_1get_1uri JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) (JNIEnv *env, jclass that, jintLong arg0) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); - rc = (jintLong)webkit_web_frame_get_uri((WebKitWebFrame *)arg0); +/* + rc = (jintLong)webkit_web_frame_get_uri(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); return rc; } @@ -968,7 +1752,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); - rc = (jintLong)webkit_web_frame_get_web_view((WebKitWebFrame *)arg0); +/* + rc = (jintLong)webkit_web_frame_get_web_view(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_web_view) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); return rc; } @@ -979,7 +1771,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); - webkit_web_policy_decision_download((WebKitWebPolicyDecision *)arg0); +/* + webkit_web_policy_decision_download(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_download) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); } #endif @@ -989,7 +1789,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); - webkit_web_policy_decision_ignore((WebKitWebPolicyDecision *)arg0); +/* + webkit_web_policy_decision_ignore(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_ignore) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); } #endif @@ -1000,7 +1808,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); - rc = (jint)webkit_web_view_can_go_back((WebKitWebView *)arg0); +/* + rc = (jint)webkit_web_view_can_go_back(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_back) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); return rc; } @@ -1012,7 +1828,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); - rc = (jint)webkit_web_view_can_go_forward((WebKitWebView *)arg0); +/* + rc = (jint)webkit_web_view_can_go_forward(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_forward) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); return rc; } @@ -1024,7 +1848,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); - rc = (jint)webkit_web_view_can_show_mime_type((WebKitWebView *)arg0, (const gchar *)arg1); +/* + rc = (jint)webkit_web_view_can_show_mime_type(arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_show_mime_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); return rc; } @@ -1037,20 +1869,56 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1execute_1script_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - webkit_web_view_execute_script((WebKitWebView *)arg0, (const gchar *)lparg1); +/* + webkit_web_view_execute_script(arg0, lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_execute_script) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1execute_1script_FUNC); } #endif +#ifndef NO__1webkit_1web_1view_1get_1dom_1document +JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1document) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1dom_1document_FUNC); +/* + rc = (jintLong)webkit_web_view_get_dom_document(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_dom_document) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1dom_1document_FUNC); + return rc; +} +#endif + #ifndef NO__1webkit_1web_1view_1get_1load_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) (JNIEnv *env, jclass that, jintLong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); - rc = (jint)webkit_web_view_get_load_status((WebKitWebView *)arg0); +/* + rc = (jint)webkit_web_view_get_load_status(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_load_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); return rc; } @@ -1062,7 +1930,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); - rc = (jintLong)webkit_web_view_get_main_frame((WebKitWebView *)arg0); +/* + rc = (jintLong)webkit_web_view_get_main_frame(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_frame) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); return rc; } @@ -1074,7 +1950,15 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1progress_FUNC); - rc = (jdouble)webkit_web_view_get_progress((WebKitWebView *)arg0); +/* + rc = (jdouble)webkit_web_view_get_progress(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_progress) + if (fp) { + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1progress_FUNC); return rc; } @@ -1086,7 +1970,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1settings_FUNC); - rc = (jintLong)webkit_web_view_get_settings((WebKitWebView *)arg0); +/* + rc = (jintLong)webkit_web_view_get_settings(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_settings) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1settings_FUNC); return rc; } @@ -1098,7 +1990,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1title_FUNC); - rc = (jintLong)webkit_web_view_get_title((WebKitWebView *)arg0); +/* + rc = (jintLong)webkit_web_view_get_title(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_title) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1title_FUNC); return rc; } @@ -1110,7 +2010,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1uri_FUNC); - rc = (jintLong)webkit_web_view_get_uri((WebKitWebView *)arg0); +/* + rc = (jintLong)webkit_web_view_get_uri(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1uri_FUNC); return rc; } @@ -1122,7 +2030,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1fe { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); - rc = (jintLong)webkit_web_view_get_window_features((WebKitWebView *)arg0); +/* + rc = (jintLong)webkit_web_view_get_window_features(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_features) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); return rc; } @@ -1133,7 +2049,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1back_FUNC); - webkit_web_view_go_back((WebKitWebView *)arg0); +/* + webkit_web_view_go_back(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_back) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1back_FUNC); } #endif @@ -1143,7 +2067,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1forward_FUNC); - webkit_web_view_go_forward((WebKitWebView *)arg0); +/* + webkit_web_view_go_forward(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_forward) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1forward_FUNC); } #endif @@ -1161,7 +2093,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; - webkit_web_view_load_string((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4); +/* + webkit_web_view_load_string(arg0, lparg1, lparg2, lparg3, lparg4); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_string) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2, lparg3, lparg4); + } + } fail: if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); @@ -1178,7 +2118,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - webkit_web_view_load_uri((WebKitWebView *)arg0, (const gchar *)lparg1); +/* + webkit_web_view_load_uri(arg0, lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_uri) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1load_1uri_FUNC); @@ -1191,7 +2139,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1new_FUNC); +/* rc = (jintLong)webkit_web_view_new(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1new_FUNC); return rc; } @@ -1202,7 +2158,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1reload_FUNC); - webkit_web_view_reload((WebKitWebView *)arg0); +/* + webkit_web_view_reload(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_reload) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1reload_FUNC); } #endif @@ -1212,7 +2176,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); - webkit_web_view_stop_loading((WebKitWebView *)arg0); +/* + webkit_web_view_stop_loading(arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_stop_loading) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h index 90685cf9f9..72f6ac1163 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h @@ -16,24 +16,63 @@ #ifndef INC_webkitgtk_H #define INC_webkitgtk_H +#include <dlfcn.h> #include <string.h> -#include <JavaScriptCore/JSContextRef.h> -#include <JavaScriptCore/JSObjectRef.h> -#include <JavaScriptCore/JSStringRef.h> -#include <libsoup/soup-cookie.h> -#include <libsoup/soup-cookie-jar.h> -#include <libsoup/soup-session-feature.h> -#include <libsoup/soup-uri.h> -#include <webkit/webkitdownload.h> -#include <webkit/webkitnetworkrequest.h> -#include <webkit/webkitsoupauthdialog.h> -#include <webkit/webkitversion.h> -#include <webkit/webkitwebpolicydecision.h> -#include <webkit/webkitwebsettings.h> -#include <webkit/webkitwebview.h> +#include <glib-object.h> -#if WEBKIT_CHECK_VERSION(1,4,0) -#include <webkit/webkitglobals.h> -#endif +#define WebKitGTK_LOAD_FUNCTION(var, name) \ + static int initialized = 0; \ + static void *var = NULL; \ + if (!initialized) { \ + void* handle = dlopen("libwebkit-1.0.so.2", LOAD_FLAGS); /* webkitgtk 1.2.x lib */ \ + if (!handle) { \ + handle = dlopen("libwebkitgtk-1.0.so.0", LOAD_FLAGS); /* webkitgtk 1.4.x lib */ \ + } \ + if (handle) { \ + var = dlsym(handle, #name); \ + } \ + initialized = 1; \ + } + +typedef struct { + int version; + int attributes; + const char* className; + void* parentClass; + const void* staticValues; + const void* staticFunctions; + void* initialize; + void* finalize; + void* hasProperty; + void* getProperty; + void* setProperty; + void* deleteProperty; + void* getPropertyNames; + void* callAsFunction; + void* callAsConstructor; + void* hasInstance; + void* convertToType; +} JSClassDefinition; + +typedef struct { + char* name; + char* value; + char* domain; + char* path; + void* expires; + gboolean secure; + gboolean http_only; +} SoupCookie; + +typedef struct { + GObject parent; + const char* method; + guint status_code; + char* reason_phrase; + void* request_body; + void* request_headers; + void* response_body; + void* response_headers; +} SoupMessage; #endif /* INC_webkitgtk_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c index 31b101d3e1..7da07562ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int WebKitGTK_nativeFunctionCount = 97; -int WebKitGTK_nativeFunctionCallCount[97]; +int WebKitGTK_nativeFunctionCount = 109; +int WebKitGTK_nativeFunctionCallCount[109]; char * WebKitGTK_nativeFunctionNames[] = { "JSClassDefinition_1sizeof", "_1JSClassCreate", @@ -47,12 +47,10 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1JSValueToBoolean", "_1JSValueToNumber", "_1JSValueToStringCopy", - "_1SOUP_1IS_1SESSION", "_1SoupCookie_1expires", "_1SoupMessage_1method", "_1SoupMessage_1request_1body", "_1SoupMessage_1request_1headers", - "_1WEBKIT_1IS_1WEB_1FRAME", "_1soup_1auth_1authenticate", "_1soup_1auth_1get_1host", "_1soup_1auth_1get_1scheme_1name", @@ -70,9 +68,21 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1soup_1session_1feature_1attach", "_1soup_1session_1feature_1detach", "_1soup_1session_1get_1feature", + "_1soup_1session_1get_1type", "_1soup_1uri_1free", "_1soup_1uri_1new", "_1soup_1uri_1to_1string", + "_1webkit_1dom_1event_1target_1add_1event_1listener", + "_1webkit_1dom_1mouse_1event_1get_1alt_1key", + "_1webkit_1dom_1mouse_1event_1get_1button", + "_1webkit_1dom_1mouse_1event_1get_1ctrl_1key", + "_1webkit_1dom_1mouse_1event_1get_1meta_1key", + "_1webkit_1dom_1mouse_1event_1get_1screen_1x", + "_1webkit_1dom_1mouse_1event_1get_1screen_1y", + "_1webkit_1dom_1mouse_1event_1get_1shift_1key", + "_1webkit_1dom_1ui_1event_1get_1char_1code", + "_1webkit_1dom_1ui_1event_1get_1detail", + "_1webkit_1dom_1ui_1event_1get_1key_1code", "_1webkit_1download_1cancel", "_1webkit_1download_1get_1current_1size", "_1webkit_1download_1get_1status", @@ -95,6 +105,7 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1webkit_1web_1frame_1get_1load_1status", "_1webkit_1web_1frame_1get_1parent", "_1webkit_1web_1frame_1get_1title", + "_1webkit_1web_1frame_1get_1type", "_1webkit_1web_1frame_1get_1uri", "_1webkit_1web_1frame_1get_1web_1view", "_1webkit_1web_1policy_1decision_1download", @@ -103,6 +114,7 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1webkit_1web_1view_1can_1go_1forward", "_1webkit_1web_1view_1can_1show_1mime_1type", "_1webkit_1web_1view_1execute_1script", + "_1webkit_1web_1view_1get_1dom_1document", "_1webkit_1web_1view_1get_1load_1status", "_1webkit_1web_1view_1get_1main_1frame", "_1webkit_1web_1view_1get_1progress", diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h index 69398a9b36..f2210ece9d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -55,12 +55,10 @@ typedef enum { _1JSValueToBoolean_FUNC, _1JSValueToNumber_FUNC, _1JSValueToStringCopy_FUNC, - _1SOUP_1IS_1SESSION_FUNC, _1SoupCookie_1expires_FUNC, _1SoupMessage_1method_FUNC, _1SoupMessage_1request_1body_FUNC, _1SoupMessage_1request_1headers_FUNC, - _1WEBKIT_1IS_1WEB_1FRAME_FUNC, _1soup_1auth_1authenticate_FUNC, _1soup_1auth_1get_1host_FUNC, _1soup_1auth_1get_1scheme_1name_FUNC, @@ -78,9 +76,21 @@ typedef enum { _1soup_1session_1feature_1attach_FUNC, _1soup_1session_1feature_1detach_FUNC, _1soup_1session_1get_1feature_FUNC, + _1soup_1session_1get_1type_FUNC, _1soup_1uri_1free_FUNC, _1soup_1uri_1new_FUNC, _1soup_1uri_1to_1string_FUNC, + _1webkit_1dom_1event_1target_1add_1event_1listener_FUNC, + _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC, + _1webkit_1dom_1mouse_1event_1get_1button_FUNC, + _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC, + _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC, + _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC, + _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC, + _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC, + _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC, + _1webkit_1dom_1ui_1event_1get_1detail_FUNC, + _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC, _1webkit_1download_1cancel_FUNC, _1webkit_1download_1get_1current_1size_FUNC, _1webkit_1download_1get_1status_FUNC, @@ -103,6 +113,7 @@ typedef enum { _1webkit_1web_1frame_1get_1load_1status_FUNC, _1webkit_1web_1frame_1get_1parent_FUNC, _1webkit_1web_1frame_1get_1title_FUNC, + _1webkit_1web_1frame_1get_1type_FUNC, _1webkit_1web_1frame_1get_1uri_FUNC, _1webkit_1web_1frame_1get_1web_1view_FUNC, _1webkit_1web_1policy_1decision_1download_FUNC, @@ -111,6 +122,7 @@ typedef enum { _1webkit_1web_1view_1can_1go_1forward_FUNC, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC, _1webkit_1web_1view_1execute_1script_FUNC, + _1webkit_1web_1view_1get_1dom_1document_FUNC, _1webkit_1web_1view_1get_1load_1status_FUNC, _1webkit_1web_1view_1get_1main_1frame_FUNC, _1webkit_1web_1view_1get_1progress_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c index a39af74a36..5324bd80a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -53,22 +53,22 @@ JSClassDefinition *getJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSC { if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); lpStruct->version = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.version); - lpStruct->attributes = (JSClassAttributes)(*env)->GetIntField(env, lpObject, JSClassDefinitionFc.attributes); + lpStruct->attributes = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.attributes); lpStruct->className = (const char*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.className); - lpStruct->parentClass = (JSClassRef)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass); - lpStruct->staticValues = (const JSStaticValue*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues); - lpStruct->staticFunctions = (const JSStaticFunction*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions); - lpStruct->initialize = (JSObjectInitializeCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.initialize); - lpStruct->finalize = (JSObjectFinalizeCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.finalize); - lpStruct->hasProperty = (JSObjectHasPropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty); - lpStruct->getProperty = (JSObjectGetPropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty); - lpStruct->setProperty = (JSObjectSetPropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty); - lpStruct->deleteProperty = (JSObjectDeletePropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty); - lpStruct->getPropertyNames = (JSObjectGetPropertyNamesCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames); - lpStruct->callAsFunction = (JSObjectCallAsFunctionCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction); - lpStruct->callAsConstructor = (JSObjectCallAsConstructorCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor); - lpStruct->hasInstance = (JSObjectHasInstanceCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance); - lpStruct->convertToType = (JSObjectConvertToTypeCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType); + lpStruct->parentClass = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass); + lpStruct->staticValues = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues); + lpStruct->staticFunctions = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions); + lpStruct->initialize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.initialize); + lpStruct->finalize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.finalize); + lpStruct->hasProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty); + lpStruct->getProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty); + lpStruct->setProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty); + lpStruct->deleteProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty); + lpStruct->getPropertyNames = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames); + lpStruct->callAsFunction = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction); + lpStruct->callAsConstructor = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor); + lpStruct->hasInstance = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance); + lpStruct->convertToType = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType); return lpStruct; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index 087bd2247f..c473e5299c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -33,13 +33,15 @@ class WebKit extends WebBrowser { BrowserFunction eventFunction; static int /*long*/ ExternalClass, PostString; - static boolean LibraryLoaded; + static boolean HasDOMAPI, LibraryLoaded; + static Hashtable WindowMappings = new Hashtable (); static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$ static final String CHARSET_UTF8 = "UTF-8"; //$NON-NLS-1$ static final String CLASSNAME_EXTERNAL = "External"; //$NON-NLS-1$ - static final String ENCODING_FORM = "Content-Type: application/x-www-form-urlencoded"; //$NON-NLS-1$ static final String FUNCTIONNAME_CALLJAVA = "callJava"; //$NON-NLS-1$ + static final String HEADER_CONTENTTYPE = "content-type"; //$NON-NLS-1$ + static final String MIMETYPE_FORMURLENCODED = "application/x-www-form-urlencoded"; //$NON-NLS-1$ static final String OBJECTNAME_EXTERNAL = "external"; //$NON-NLS-1$ static final String PROPERTY_LENGTH = "length"; //$NON-NLS-1$ static final String PROPERTY_PROXYHOST = "network.proxy_host"; //$NON-NLS-1$ @@ -51,6 +53,7 @@ class WebKit extends WebBrowser { static final int MAX_PORT = 65535; static final int MAX_PROGRESS = 100; static final int[] MIN_VERSION = {1, 2, 0}; + static final int SENTINEL_KEYPRESS = -1; static final char SEPARATOR_FILE = System.getProperty ("file.separator").charAt (0); //$NON-NLS-1$ static final int STOP_PROPOGATE = 1; @@ -84,25 +87,16 @@ class WebKit extends WebBrowser { static final String KEY_CHECK_SUBWINDOW = "org.eclipse.swt.internal.control.checksubwindow"; //$NON-NLS-1$ - // the following Callbacks are never freed + /* the following Callbacks are never freed */ static Callback Proc2, Proc3, Proc4, Proc5, Proc6; static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc; + static Callback JSDOMEventProc; static { - - /* - * WebKitGTK is binary-incompatible between its 1.2 and 1.4 releases, - * so swt has separate libraries compiled against each. - */ try { - Library.loadLibrary ("swt-webkit12"); // $NON-NLS-1$ + Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ LibraryLoaded = true; } catch (Throwable e) { - try { - Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ - LibraryLoaded = true; - } catch (Throwable e2) { - } } if (LibraryLoaded) { @@ -122,6 +116,8 @@ class WebKit extends WebBrowser { if (JSObjectGetPropertyProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); JSObjectCallAsFunctionProc = new Callback (WebKit.class, "JSObjectCallAsFunctionProc", 6); //$NON-NLS-1$ if (JSObjectCallAsFunctionProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); + JSDOMEventProc = new Callback (WebKit.class, "JSDOMEventProc", 3); //$NON-NLS-1$ + if (JSDOMEventProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); NativeClearSessions = new Runnable () { public void run () { @@ -213,14 +209,14 @@ class WebKit extends WebBrowser { } } -static Browser findBrowser (int /*long*/ webView) { +static Browser FindBrowser (int /*long*/ webView) { if (webView == 0) return null; int /*long*/ parent = OS.gtk_widget_get_parent (webView); parent = OS.gtk_widget_get_parent (parent); return (Browser)Display.getCurrent ().findWidget (parent); } -static boolean isInstalled () { +static boolean IsInstalled () { if (!LibraryLoaded) return false; // TODO webkit_check_version() should take care of the following, but for some // reason this symbol is missing from the latest build. If it is present in @@ -228,6 +224,9 @@ static boolean isInstalled () { int major = WebKitGTK.webkit_major_version (); int minor = WebKitGTK.webkit_minor_version (); int micro = WebKitGTK.webkit_micro_version (); + HasDOMAPI = major > 1 || + (major == 1 && minor > 4) || + (major == 1 && minor == 4 && micro >= 0); return major > MIN_VERSION[0] || (major == MIN_VERSION[0] && minor > MIN_VERSION[1]) || (major == MIN_VERSION[0] && minor == MIN_VERSION[1] && micro >= MIN_VERSION[2]); @@ -240,7 +239,7 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f int /*long*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject); int /*long*/[] handle = new int /*long*/[1]; C.memmove (handle, ptr, C.PTR_SIZEOF); - Browser browser = findBrowser (handle[0]); + Browser browser = FindBrowser (handle[0]); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception); @@ -269,8 +268,17 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes); } +static int /*long*/ JSDOMEventProc (int /*long*/ window, int /*long*/ event, int /*long*/ user_data) { + LONG webViewHandle = (LONG)WindowMappings.get (new LONG (window)); + if (webViewHandle == null) return 0; + Browser browser = FindBrowser (webViewHandle.value); + if (browser == null) return 0; + WebKit webkit = (WebKit)browser.webBrowser; + return webkit.handleEvent (event, (int)user_data) ? 0 : 1; +} + static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) { - Browser browser = findBrowser (handle); + Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; return webkit.webViewProc (handle, user_data); @@ -286,12 +294,12 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u } int /*long*/ webView; - if (WebKitGTK.WEBKIT_IS_WEB_FRAME (handle)) { + if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) { webView = WebKitGTK.webkit_web_frame_get_web_view (handle); } else { webView = handle; } - Browser browser = findBrowser (webView); + Browser browser = FindBrowser (webView); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; if (webView == handle) { @@ -302,7 +310,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u } static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) { - Browser browser = findBrowser (handle); + Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; return webkit.webViewProc (handle, arg0, arg1, user_data); @@ -310,12 +318,12 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { int /*long*/ webView; - if (WebKitGTK.SOUP_IS_SESSION (handle)) { + if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) { webView = user_data; } else { webView = handle; } - Browser browser = findBrowser (webView); + Browser browser = FindBrowser (webView); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; if (webView == handle) { @@ -326,7 +334,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a } static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) { - Browser browser = findBrowser (handle); + Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; return webkit.webViewProc (handle, arg0, arg1, arg2, arg3, user_data); @@ -560,7 +568,7 @@ public void create (Composite parent, int style) { eventFunction = new BrowserFunction (browser, "HandleWebKitEvent") { //$NON-NLS-1$ public Object function(Object[] arguments) { - return handleEvent (arguments) ? Boolean.TRUE : Boolean.FALSE; + return handleEventFromFunction (arguments) ? Boolean.TRUE : Boolean.FALSE; }; }; @@ -575,17 +583,44 @@ public void create (Composite parent, int style) { browser.setData (KEY_CHECK_SUBWINDOW, Boolean.FALSE); } -void addEventHandlers (boolean top) { +void addEventHandlers (int /*long*/ web_view, boolean top) { + if (top && HasDOMAPI) { + int /*long*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); + if (domDocument != 0) { + WindowMappings.put (new LONG (domDocument), new LONG (web_view)); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.keydown, JSDOMEventProc.getAddress (), 0, SWT.KeyDown); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.keypress, JSDOMEventProc.getAddress (), 0, SENTINEL_KEYPRESS); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.keyup, JSDOMEventProc.getAddress (), 0, SWT.KeyUp); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.mousedown, JSDOMEventProc.getAddress (), 0, SWT.MouseDown); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.mousemove, JSDOMEventProc.getAddress (), 0, SWT.MouseMove); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.mouseup, JSDOMEventProc.getAddress (), 0, SWT.MouseUp); + WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.mousewheel, JSDOMEventProc.getAddress (), 0, SWT.MouseWheel); + + /* + * The following two lines are intentionally commented because they cannot be used to + * consistently send MouseEnter/MouseExit events until https://bugs.webkit.org/show_bug.cgi?id=35246 + * is fixed. + */ + //WebKitGTK.webkit_dom_event_target_add_event_listener (domWindow, WebKitGTK.mouseover, JSDOMEventProc.getAddress (), 0, SWT.MouseEnter); + //WebKitGTK.webkit_dom_event_target_add_event_listener (domWindow, WebKitGTK.mouseout, JSDOMEventProc.getAddress (), 0, SWT.MouseExit); + } + return; + } + + /* install the JS call-out to the registered BrowserFunction */ + StringBuffer buffer = new StringBuffer ("window.SWTkeyhandler = function SWTkeyhandler(e) {"); //$NON-NLS-1$ + buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.keyCode, e.charCode, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey);} catch (e) {}};"); //$NON-NLS-1$ + execute (buffer.toString ()); + buffer = new StringBuffer ("window.SWTmousehandler = function SWTmousehandler(e) {"); //$NON-NLS-1$ + buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.screenX, e.screenY, e.detail, e.button, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey, e.relatedTarget != null);} catch (e) {}};"); //$NON-NLS-1$ + execute (buffer.toString ()); + if (top) { - StringBuffer buffer = new StringBuffer ("window.SWTkeyhandler = function SWTkeyhandler(e) {"); //$NON-NLS-1$ - buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.keyCode, e.charCode, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey);} catch (e) {}};"); //$NON-NLS-1$ - buffer.append ("document.addEventListener('keydown', SWTkeyhandler, true);"); //$NON-NLS-1$ + /* DOM API is not available, so add listener to top-level document */ + buffer = new StringBuffer ("document.addEventListener('keydown', SWTkeyhandler, true);"); //$NON-NLS-1$ buffer.append ("document.addEventListener('keypress', SWTkeyhandler, true);"); //$NON-NLS-1$ buffer.append ("document.addEventListener('keyup', SWTkeyhandler, true);"); //$NON-NLS-1$ - execute (buffer.toString ()); - - buffer = new StringBuffer ("window.SWTmousehandler = function SWTmousehandler(e) {"); //$NON-NLS-1$ - buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.screenX, e.screenY, e.detail, e.button + 1, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey, e.relatedTarget != null);} catch (e) {}};"); //$NON-NLS-1$ buffer.append ("document.addEventListener('mousedown', SWTmousehandler, true);"); //$NON-NLS-1$ buffer.append ("document.addEventListener('mouseup', SWTmousehandler, true);"); //$NON-NLS-1$ buffer.append ("document.addEventListener('mousemove', SWTmousehandler, true);"); //$NON-NLS-1$ @@ -601,21 +636,23 @@ void addEventHandlers (boolean top) { //buffer.append ("document.addEventListener('mouseout', SWTmousehandler, true);"); //$NON-NLS-1$ execute (buffer.toString ()); - } else { - StringBuffer buffer = new StringBuffer ("for (var i = 0; i < frames.length; i++) {"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('keydown', window.SWTkeyhandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('keypress', window.SWTkeyhandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('keyup', window.SWTkeyhandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('mousedown', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('mouseup', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('mousemove', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('mouseover', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('mouseout', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('mousewheel', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ("frames[i].document.addEventListener('dragstart', window.SWTmousehandler, true);"); //$NON-NLS-1$ - buffer.append ('}'); - execute (buffer.toString ()); - } + return; + } + + /* add JS event listener in frames */ + buffer = new StringBuffer ("for (var i = 0; i < frames.length; i++) {"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('keydown', window.SWTkeyhandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('keypress', window.SWTkeyhandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('keyup', window.SWTkeyhandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('mousedown', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('mouseup', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('mousemove', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('mouseover', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('mouseout', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('mousewheel', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ("frames[i].document.addEventListener('dragstart', window.SWTmousehandler, true);"); //$NON-NLS-1$ + buffer.append ('}'); + execute (buffer.toString ()); } public boolean back () { @@ -745,17 +782,87 @@ public String getUrl () { return url; } -boolean handleEvent (Object[] arguments) { +boolean handleEvent (int /*long*/ event, int type) { + /* + * This method handles JS events that are received through the DOM + * listener API that was introduced in WebKitGTK 1.4. + */ + String typeString = null; + boolean isMouseEvent = false; + switch (type) { + case SWT.DragDetect: { + typeString = "dragstart"; //$NON-NLS-1$ + isMouseEvent = true; + break; + } + case SWT.MouseDown: { + typeString = "mousedown"; //$NON-NLS-1$ + isMouseEvent = true; + break; + } + case SWT.MouseMove: { + typeString = "mousemove"; //$NON-NLS-1$ + isMouseEvent = true; + break; + } + case SWT.MouseUp: { + typeString = "mouseup"; //$NON-NLS-1$ + isMouseEvent = true; + break; + } + case SWT.MouseWheel: { + typeString = "mousewheel"; //$NON-NLS-1$ + isMouseEvent = true; + break; + } + case SWT.KeyDown: { + typeString = "keydown"; //$NON-NLS-1$ + break; + } + case SWT.KeyUp: { + typeString = "keyup"; //$NON-NLS-1$ + break; + } + case SENTINEL_KEYPRESS: { + typeString = "keypress"; //$NON-NLS-1$ + break; + } + } + + if (isMouseEvent) { + int screenX = (int)WebKitGTK.webkit_dom_mouse_event_get_screen_x (event); + int screenY = (int)WebKitGTK.webkit_dom_mouse_event_get_screen_y (event); + int button = (int)WebKitGTK.webkit_dom_mouse_event_get_button (event) + 1; + boolean altKey = WebKitGTK.webkit_dom_mouse_event_get_alt_key (event) != 0; + boolean ctrlKey = WebKitGTK.webkit_dom_mouse_event_get_ctrl_key (event) != 0; + boolean shiftKey = WebKitGTK.webkit_dom_mouse_event_get_shift_key (event) != 0; + boolean metaKey = WebKitGTK.webkit_dom_mouse_event_get_meta_key (event) != 0; + int detail = (int)WebKitGTK.webkit_dom_ui_event_get_detail (event); + boolean hasRelatedTarget = false; //WebKitGTK.webkit_dom_mouse_event_get_related_target (event) != 0; + return handleMouseEvent(typeString, screenX, screenY, detail, button, altKey, ctrlKey, shiftKey, metaKey, hasRelatedTarget); + } + + /* key event */ + int keyCode = (int)WebKitGTK.webkit_dom_ui_event_get_key_code (event); + int charCode = (int)WebKitGTK.webkit_dom_ui_event_get_char_code (event); + boolean altKey = WebKitGTK.webkit_dom_mouse_event_get_alt_key (event) != 0; + boolean ctrlKey = WebKitGTK.webkit_dom_mouse_event_get_ctrl_key (event) != 0; + boolean shiftKey = WebKitGTK.webkit_dom_mouse_event_get_shift_key (event) != 0; + boolean metaKey = WebKitGTK.webkit_dom_mouse_event_get_meta_key (event) != 0; + return handleKeyEvent(typeString, keyCode, charCode, altKey, ctrlKey, shiftKey, metaKey); +} +boolean handleEventFromFunction (Object[] arguments) { /* - * DOM events are currently received by hooking DOM listeners - * in javascript that invoke this method via a BrowserFunction. - * It should be possible to replace this mechanism with more - * typical callbacks from C once WebKitGTK enhancement request - * https://bugs.webkit.org/show_bug.cgi?id=33590 is completed. - * In the meantime, the argument lists received here are: - * - * For key events: + * Prior to WebKitGTK 1.4 there was no API for hooking DOM listeners. + * As a workaround, eventFunction was introduced to capture JS events + * and report them back to the java side. This method handles these + * events by extracting their arguments and passing them to the + * handleKeyEvent()/handleMouseEvent() event handler methods. + */ + + /* + * The arguments for key events are: * argument 0: type (String) * argument 1: keyCode (Double) * argument 2: charCode (Double) @@ -765,7 +872,7 @@ boolean handleEvent (Object[] arguments) { * argument 6: metaKey (Boolean) * returns doit * - * For mouse events + * The arguments for mouse events are: * argument 0: type (String) * argument 1: screenX (Double) * argument 2: screenY (Double) @@ -780,8 +887,33 @@ boolean handleEvent (Object[] arguments) { */ String type = (String)arguments[0]; + if (type.equals (DOMEVENT_KEYDOWN) || type.equals (DOMEVENT_KEYPRESS) || type.equals (DOMEVENT_KEYUP)) { + return handleKeyEvent( + type, + ((Double)arguments[1]).intValue (), + ((Double)arguments[2]).intValue (), + ((Boolean)arguments[3]).booleanValue (), + ((Boolean)arguments[4]).booleanValue (), + ((Boolean)arguments[5]).booleanValue (), + ((Boolean)arguments[6]).booleanValue ()); + } + + return handleMouseEvent( + type, + ((Double)arguments[1]).intValue (), + ((Double)arguments[2]).intValue (), + ((Double)arguments[3]).intValue (), + ((Double)arguments[4]).intValue () + 1, + ((Boolean)arguments[5]).booleanValue (), + ((Boolean)arguments[6]).booleanValue (), + ((Boolean)arguments[7]).booleanValue (), + ((Boolean)arguments[8]).booleanValue (), + ((Boolean)arguments[9]).booleanValue ()); +} + +boolean handleKeyEvent (String type, int keyCode, int charCode, boolean altKey, boolean ctrlKey, boolean shiftKey, boolean metaKey) { if (type.equals (DOMEVENT_KEYDOWN)) { - int keyCode = translateKey (((Double)arguments[1]).intValue ()); + keyCode = translateKey (keyCode); lastKeyCode = keyCode; switch (keyCode) { case SWT.SHIFT: @@ -830,11 +962,7 @@ boolean handleEvent (Object[] arguments) { case SWT.TAB: keyEvent.character = SWT.TAB; break; } lastCharCode = keyEvent.character; - keyEvent.stateMask = - (((Boolean)arguments[3]).booleanValue () ? SWT.ALT : 0) | - (((Boolean)arguments[4]).booleanValue () ? SWT.CTRL : 0) | - (((Boolean)arguments[5]).booleanValue () ? SWT.SHIFT : 0) | - (((Boolean)arguments[6]).booleanValue () ? SWT.COMMAND : 0); + keyEvent.stateMask = (altKey ? SWT.ALT : 0) | (ctrlKey ? SWT.CTRL : 0) | (shiftKey ? SWT.SHIFT : 0) | (metaKey ? SWT.COMMAND : 0); keyEvent.stateMask &= ~keyCode; /* remove current keydown if it's a state key */ final int stateMask = keyEvent.stateMask; if (!sendKeyEvent (keyEvent) || browser.isDisposed ()) return false; @@ -865,8 +993,8 @@ boolean handleEvent (Object[] arguments) { */ if (lastKeyCode == 0) return true; - lastCharCode = ((Double)arguments[2]).intValue (); - if (((Boolean)arguments[4]).booleanValue () && (0 <= lastCharCode && lastCharCode <= 0x7F)) { + lastCharCode = charCode; + if (ctrlKey && (0 <= lastCharCode && lastCharCode <= 0x7F)) { if ('a' <= lastCharCode && lastCharCode <= 'z') lastCharCode -= 'a' - 'A'; if (64 <= lastCharCode && lastCharCode <= 95) lastCharCode -= 64; } @@ -876,51 +1004,43 @@ boolean handleEvent (Object[] arguments) { keyEvent.type = SWT.KeyDown; keyEvent.keyCode = lastKeyCode; keyEvent.character = (char)lastCharCode; - keyEvent.stateMask = - (((Boolean)arguments[3]).booleanValue () ? SWT.ALT : 0) | - (((Boolean)arguments[4]).booleanValue () ? SWT.CTRL : 0) | - (((Boolean)arguments[5]).booleanValue () ? SWT.SHIFT : 0) | - (((Boolean)arguments[6]).booleanValue () ? SWT.COMMAND : 0); + keyEvent.stateMask = (altKey ? SWT.ALT : 0) | (ctrlKey ? SWT.CTRL : 0) | (shiftKey ? SWT.SHIFT : 0) | (metaKey ? SWT.COMMAND : 0); return sendKeyEvent (keyEvent) && !browser.isDisposed (); } - if (type.equals(DOMEVENT_KEYUP)) { - int keyCode = translateKey (((Double)arguments[1]).intValue ()); - if (keyCode == 0) { - /* indicates a key for which key events are not sent */ - return true; - } - if (keyCode != lastKeyCode) { - /* keyup does not correspond to the last keydown */ - lastKeyCode = keyCode; - lastCharCode = 0; - } + /* keyup */ - Event keyEvent = new Event (); - keyEvent.widget = browser; - keyEvent.type = SWT.KeyUp; - keyEvent.keyCode = lastKeyCode; - keyEvent.character = (char)lastCharCode; - keyEvent.stateMask = - (((Boolean)arguments[3]).booleanValue () ? SWT.ALT : 0) | - (((Boolean)arguments[4]).booleanValue () ? SWT.CTRL : 0) | - (((Boolean)arguments[5]).booleanValue () ? SWT.SHIFT : 0) | - (((Boolean)arguments[6]).booleanValue () ? SWT.COMMAND : 0); - switch (lastKeyCode) { - case SWT.SHIFT: - case SWT.CONTROL: - case SWT.ALT: - case SWT.COMMAND: { - keyEvent.stateMask |= lastKeyCode; - } + keyCode = translateKey (keyCode); + if (keyCode == 0) { + /* indicates a key for which key events are not sent */ + return true; + } + if (keyCode != lastKeyCode) { + /* keyup does not correspond to the last keydown */ + lastKeyCode = keyCode; + lastCharCode = 0; + } + + Event keyEvent = new Event (); + keyEvent.widget = browser; + keyEvent.type = SWT.KeyUp; + keyEvent.keyCode = lastKeyCode; + keyEvent.character = (char)lastCharCode; + keyEvent.stateMask = (altKey ? SWT.ALT : 0) | (ctrlKey ? SWT.CTRL : 0) | (shiftKey ? SWT.SHIFT : 0) | (metaKey ? SWT.COMMAND : 0); + switch (lastKeyCode) { + case SWT.SHIFT: + case SWT.CONTROL: + case SWT.ALT: + case SWT.COMMAND: { + keyEvent.stateMask |= lastKeyCode; } - browser.notifyListeners (keyEvent.type, keyEvent); - lastKeyCode = lastCharCode = 0; - return keyEvent.doit && !browser.isDisposed (); } + browser.notifyListeners (keyEvent.type, keyEvent); + lastKeyCode = lastCharCode = 0; + return keyEvent.doit && !browser.isDisposed (); +} - /* mouse events */ - +boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int button, boolean altKey, boolean ctrlKey, boolean shiftKey, boolean metaKey, boolean hasRelatedTarget) { /* * MouseOver and MouseOut events are fired any time the mouse enters or exits * any element within the Browser. To ensure that SWT events are only @@ -942,35 +1062,31 @@ boolean handleEvent (Object[] arguments) { * coordinates relative to themselves rather than relative to their top- * level page. Convert screen-relative coordinates to be browser-relative. */ - Point position = new Point (((Double)arguments[1]).intValue (), ((Double)arguments[2]).intValue ()); + Point position = new Point (screenX, screenY); position = browser.getDisplay ().map (null, browser, position); Event mouseEvent = new Event (); mouseEvent.widget = browser; mouseEvent.x = position.x; mouseEvent.y = position.y; - int mask = - (((Boolean)arguments[5]).booleanValue () ? SWT.ALT : 0) | - (((Boolean)arguments[6]).booleanValue () ? SWT.CTRL : 0) | - (((Boolean)arguments[7]).booleanValue () ? SWT.SHIFT : 0) | - (((Boolean)arguments[8]).booleanValue () ? SWT.COMMAND : 0); + int mask = (altKey ? SWT.ALT : 0) | (ctrlKey ? SWT.CTRL : 0) | (shiftKey ? SWT.SHIFT : 0) | (metaKey ? SWT.COMMAND : 0); mouseEvent.stateMask = mask; if (type.equals (DOMEVENT_MOUSEDOWN)) { mouseEvent.type = SWT.MouseDown; - mouseEvent.count = ((Double)arguments[3]).intValue (); - mouseEvent.button = ((Double)arguments[4]).intValue (); + mouseEvent.count = detail; + mouseEvent.button = button; browser.notifyListeners (mouseEvent.type, mouseEvent); if (browser.isDisposed ()) return true; - if (((Double)arguments[3]).intValue () == 2) { + if (detail == 2) { mouseEvent = new Event (); mouseEvent.type = SWT.MouseDoubleClick; mouseEvent.widget = browser; mouseEvent.x = position.x; mouseEvent.y = position.y; mouseEvent.stateMask = mask; - mouseEvent.count = ((Double)arguments[3]).intValue (); - mouseEvent.button = ((Double)arguments[4]).intValue (); + mouseEvent.count = detail; + mouseEvent.button = button; browser.notifyListeners (mouseEvent.type, mouseEvent); } return true; @@ -978,13 +1094,13 @@ boolean handleEvent (Object[] arguments) { if (type.equals (DOMEVENT_MOUSEUP)) { mouseEvent.type = SWT.MouseUp; - mouseEvent.count = ((Double)arguments[3]).intValue (); - mouseEvent.button = ((Double)arguments[4]).intValue (); + mouseEvent.count = detail; + mouseEvent.button = button; } else if (type.equals (DOMEVENT_MOUSEMOVE)) { mouseEvent.type = SWT.MouseMove; } else if (type.equals (DOMEVENT_MOUSEWHEEL)) { mouseEvent.type = SWT.MouseWheel; - mouseEvent.count = ((Double)arguments[3]).intValue (); + mouseEvent.count = detail; /* * The following is intentionally commented because MouseOver and MouseOut events @@ -997,7 +1113,7 @@ boolean handleEvent (Object[] arguments) { } else if (type.equals (DOMEVENT_DRAGSTART)) { mouseEvent.type = SWT.DragDetect; - mouseEvent.button = ((Double)arguments[4]).intValue () + 1; + mouseEvent.button = button; switch (mouseEvent.button) { case 1: mouseEvent.stateMask |= SWT.BUTTON1; break; case 2: mouseEvent.stateMask |= SWT.BUTTON2; break; @@ -1159,6 +1275,11 @@ void onDispose (Event e) { ((BrowserFunction)elements.nextElement ()).dispose (false); } functions = null; + + if (eventFunction != null) { + eventFunction.dispose (false); + eventFunction = null; + } C.free (webViewData); postData = null; @@ -1628,10 +1749,23 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long WebKitGTK.soup_message_body_flatten (body); if (headers == null) headers = new String[0]; - String[] temp = new String[headers.length + 1]; - System.arraycopy (headers, 0, temp, 0, headers.length); - temp[headers.length] = ENCODING_FORM; - headers = temp; + boolean found = false; + for (int i = 0; i < headers.length; i++) { + int index = headers[i].indexOf (':'); + if (index != -1) { + String name = headers[i].substring (0, index).trim ().toLowerCase (); + if (name.equals (HEADER_CONTENTTYPE)) { + found = true; + break; + } + } + } + if (!found) { + String[] temp = new String[headers.length + 1]; + System.arraycopy (headers, 0, temp, 0, headers.length); + temp[headers.length] = HEADER_CONTENTTYPE + ':' + MIMETYPE_FORMURLENCODED; + headers = temp; + } postData = null; } @@ -1735,7 +1869,7 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f } int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); boolean top = mainFrame == frame; - addEventHandlers (top); + addEventHandlers (web_view, top); return 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java index 391ce4a61c..1c81599802 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java @@ -17,37 +17,36 @@ package org.eclipse.swt.internal.webkit; public class JSClassDefinition { public int version; - /** @field cast=(JSClassAttributes) */ public int attributes; /** @field cast=(const char*) */ public int /*long*/ className; - /** @field cast=(JSClassRef) */ + /** @field cast=(void*) */ public int /*long*/ parentClass; - /** @field cast=(const JSStaticValue*) */ + /** @field cast=(const void*) */ public int /*long*/ staticValues; - /** @field cast=(const JSStaticFunction*) */ + /** @field cast=(const void*) */ public int /*long*/ staticFunctions; - /** @field cast=(JSObjectInitializeCallback) */ + /** @field cast=(void*) */ public int /*long*/ initialize; - /** @field cast=(JSObjectFinalizeCallback) */ + /** @field cast=(void*) */ public int /*long*/ finalize; - /** @field cast=(JSObjectHasPropertyCallback) */ + /** @field cast=(void*) */ public int /*long*/ hasProperty; - /** @field cast=(JSObjectGetPropertyCallback) */ + /** @field cast=(void*) */ public int /*long*/ getProperty; - /** @field cast=(JSObjectSetPropertyCallback) */ + /** @field cast=(void*) */ public int /*long*/ setProperty; - /** @field cast=(JSObjectDeletePropertyCallback) */ + /** @field cast=(void*) */ public int /*long*/ deleteProperty; - /** @field cast=(JSObjectGetPropertyNamesCallback) */ + /** @field cast=(void*) */ public int /*long*/ getPropertyNames; - /** @field cast=(JSObjectCallAsFunctionCallback) */ + /** @field cast=(void*) */ public int /*long*/ callAsFunction; - /** @field cast=(JSObjectCallAsConstructorCallback) */ + /** @field cast=(void*) */ public int /*long*/ callAsConstructor; - /** @field cast=(JSObjectHasInstanceCallback) */ + /** @field cast=(void*) */ public int /*long*/ hasInstance; - /** @field cast=(JSObjectConvertToTypeCallback) */ + /** @field cast=(void*) */ public int /*long*/ convertToType; public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java index 01bbe98be5..f9523d7da2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java @@ -67,6 +67,16 @@ public class WebKitGTK extends C { public static final byte[] x = ascii ("x"); // $NON-NLS-1$ public static final byte[] y = ascii ("y"); // $NON-NLS-1$ + /** DOM events */ + public static final byte[] dragstart = ascii ("dragstart"); // $NON-NLS-1$ + public static final byte[] keydown = ascii ("keydown"); // $NON-NLS-1$ + public static final byte[] keypress = ascii ("keypress"); // $NON-NLS-1$ + public static final byte[] keyup = ascii ("keyup"); // $NON-NLS-1$ + public static final byte[] mousedown = ascii ("mousedown"); // $NON-NLS-1$ + public static final byte[] mousemove = ascii ("mousemove"); // $NON-NLS-1$ + public static final byte[] mouseup = ascii ("mouseup"); // $NON-NLS-1$ + public static final byte[] mousewheel = ascii ("mousewheel"); // $NON-NLS-1$ + protected static byte [] ascii (String name) { int length = name.length (); char [] chars = new char [length]; @@ -79,9 +89,7 @@ protected static byte [] ascii (String name) { } -/** - * @param definition cast=(const JSClassDefinition*) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSClassCreate (int /*long*/ definition); public static final int /*long*/ JSClassCreate (int /*long*/ definition) { lock.lock(); @@ -92,9 +100,7 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) { } } -/** - * @param ctx cast=(JSContextRef) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx); public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) { lock.lock(); @@ -105,13 +111,7 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) { } } -/** - * @param ctx cast=(JSContextRef) - * @param script cast=(JSStringRef) - * @param thisObject cast=(JSObjectRef) - * @param sourceURL cast=(JSStringRef) - * @param exception cast=(JSValueRef *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception); public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception) { lock.lock(); @@ -122,9 +122,7 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long* } } -/** - * @param object cast=(JSObjectRef) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object); public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) { lock.lock(); @@ -135,12 +133,7 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) { } } -/** - * @param ctx cast=(JSContextRef) - * @param object cast=(JSObjectRef) - * @param propertyName cast=(JSStringRef) - * @param exception cast=(JSValueRef*) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception); public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception) { lock.lock(); @@ -151,12 +144,7 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo } } -/** - * @param ctx cast=(JSContextRef) - * @param object cast=(JSObjectRef) - * @param propertyIndex cast=(unsigned) - * @param exception cast=(JSValueRef*) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception); public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception) { lock.lock(); @@ -167,11 +155,7 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i } } -/** - * @param ctx cast=(JSContextRef) - * @param jsClass cast=(JSClassRef) - * @param data cast=(void *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data); public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data) { lock.lock(); @@ -182,12 +166,7 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js } } -/** - * @param ctx cast=(JSContextRef) - * @param argumentCount cast=(size_t) - * @param arguments cast=(const struct OpaqueJSValue * const*) - * @param exception cast=(JSValueRef*) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception); public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception) { lock.lock(); @@ -198,11 +177,7 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long } } -/** - * @param ctx cast=(JSContextRef) - * @param name cast=(JSStringRef) - * @param callAsFunction cast=(JSObjectCallAsFunctionCallback) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction); public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction) { lock.lock(); @@ -213,14 +188,7 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ } } -/** - * @param ctx cast=(JSContextRef) - * @param object cast=(JSObjectRef) - * @param propertyName cast=(JSStringRef) - * @param value cast=(JSValueRef) - * @param attributes cast=(JSPropertyAttributes) - * @param exception cast=(JSValueRef *) - */ +/** @method flags=dynamic */ public static final native void _JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception); public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception) { lock.lock(); @@ -231,9 +199,7 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj } } -/** - * @param string cast=(const char *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string); public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) { lock.lock(); @@ -244,9 +210,7 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) { } } -/** - * @param string cast=(JSStringRef) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSStringGetLength (int /*long*/ string); public static final int /*long*/ JSStringGetLength (int /*long*/ string) { lock.lock(); @@ -257,9 +221,7 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) { } } -/** - * @param string cast=(JSStringRef) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string); public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string) { lock.lock(); @@ -270,11 +232,7 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ } } -/** - * @param string cast=(JSStringRef) - * @param buffer cast=(char *) - * @param bufferSize cast=(size_t) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize); public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize) { lock.lock(); @@ -285,10 +243,7 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by } } -/** - * @param a cast=(JSStringRef) - * @param b cast=(const char *) - */ +/** @method flags=dynamic */ public static final native int _JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b); public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) { lock.lock(); @@ -299,9 +254,7 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) } } -/** - * @param string cast=(JSStringRef) - */ +/** @method flags=dynamic */ public static final native void _JSStringRelease (int /*long*/ string); public static final void JSStringRelease (int /*long*/ string) { lock.lock(); @@ -312,10 +265,7 @@ public static final void JSStringRelease (int /*long*/ string) { } } -/** - * @param ctx cast=(JSContextRef) - * @param value cast=(JSValueRef) - */ +/** @method flags=dynamic */ public static final native int _JSValueGetType (int /*long*/ ctx, int /*long*/ value); public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) { lock.lock(); @@ -326,11 +276,7 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) { } } -/** - * @param ctx cast=(JSContextRef) - * @param value cast=(JSValueRef) - * @param jsClass cast=(JSClassRef) - */ +/** @method flags=dynamic */ public static final native int _JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass); public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass) { lock.lock(); @@ -341,10 +287,7 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v } } -/** - * @param ctx cast=(JSContextRef) - * @param bool cast=(bool) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSValueMakeBoolean (int /*long*/ ctx, int bool); public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) { lock.lock(); @@ -355,10 +298,7 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) } } -/** - * @param ctx cast=(JSContextRef) - * @param number cast=(double) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSValueMakeNumber (int /*long*/ ctx, double number); public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number) { lock.lock(); @@ -369,10 +309,7 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num } } -/** - * @param ctx cast=(JSContextRef) - * @param string cast=(JSStringRef) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSValueMakeString (int /*long*/ ctx, int /*long*/ string); public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string) { lock.lock(); @@ -383,9 +320,7 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long } } -/** - * @param ctx cast=(JSContextRef) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx); public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) { lock.lock(); @@ -396,10 +331,7 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) { } } -/** - * @param ctx cast=(JSContextRef) - * @param value cast=(JSValueRef) - */ +/** @method flags=dynamic */ public static final native int _JSValueToBoolean (int /*long*/ ctx, int /*long*/ value); public static final int JSValueToBoolean (int /*long*/ ctx, int /*long*/ value) { lock.lock(); @@ -410,11 +342,7 @@ public static final int JSValueToBoolean (int /*long*/ ctx, int /*long*/ value) } } -/** - * @param ctx cast=(JSContextRef) - * @param value cast=(JSValueRef) - * @param exception cast=(JSValueRef*) - */ +/** @method flags=dynamic */ public static final native double _JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception); public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) { lock.lock(); @@ -425,11 +353,7 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value } } -/** - * @param ctx cast=(JSContextRef) - * @param value cast=(JSValueRef) - * @param exception cast=(JSValueRef*) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception); public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) { lock.lock(); @@ -442,11 +366,7 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo /* --------------------- start libsoup natives --------------------- */ -/** - * @param auth cast=(SoupAuth *) - * @param username cast=(const char *) - * @param password cast=(const char *) - */ +/** @method flags=dynamic */ public static final native void _soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password); public static final void soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password) { lock.lock(); @@ -457,9 +377,7 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern } } -/** - * @param auth cast=(SoupAuth *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth); public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) { lock.lock(); @@ -470,9 +388,7 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) { } } -/** - * @param auth cast=(SoupAuth *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth); public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) { lock.lock(); @@ -483,10 +399,7 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) { } } -/** - * @param jar cast=(SoupCookieJar *) - * @param cookie cast=(SoupCookie *) - */ +/** @method flags=dynamic */ public static final native void _soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie); public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie) { lock.lock(); @@ -497,9 +410,7 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon } } -/** - * @param jar cast=(SoupCookieJar *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar); public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) { lock.lock(); @@ -510,10 +421,7 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) } } -/** - * @param jar cast=(SoupCookieJar *) - * @param cookie cast=(SoupCookie *) - */ +/** @method flags=dynamic */ public static final native void _soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie); public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie) { lock.lock(); @@ -524,10 +432,7 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /* } } -/** - * @param jar cast=(SoupCookieJar *) - * @param uri cast=(SoupURI *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http); public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http) { lock.lock(); @@ -538,6 +443,7 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, } } +/** @method flags=dynamic */ public static final native int /*long*/ _soup_cookie_jar_get_type (); public static final int /*long*/ soup_cookie_jar_get_type () { lock.lock(); @@ -548,10 +454,7 @@ public static final int /*long*/ soup_cookie_jar_get_type () { } } -/** - * @param header cast=(const char *) - * @param origin cast=(SoupURI *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _soup_cookie_parse (byte[] header, int /*long*/ origin); public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ origin) { lock.lock(); @@ -562,230 +465,262 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ } } -/** - * @method flags=getter - * @param cookie cast=(SoupCookie *) - */ -public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); -public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { +/** @method flags=dynamic */ +public static final native void _soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length); +public static final void soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length) { lock.lock(); try { - return _SoupCookie_expires (cookie); + _soup_message_body_append (body, use, data, length); } finally { lock.unlock(); } } -public static final native boolean _SOUP_IS_SESSION (int /*long*/ object); -public static final boolean SOUP_IS_SESSION (int /*long*/ object) { +/** @method flags=dynamic */ +public static final native void _soup_message_body_flatten (int /*long*/ body); +public static final void soup_message_body_flatten (int /*long*/ body) { lock.lock(); try { - return _SOUP_IS_SESSION (object); + _soup_message_body_flatten (body); } finally { lock.unlock(); } } -/** - * @method flags=setter - * @param message cast=(SoupMessage *) - * @param method cast=(const char *) - */ -public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); -public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { +/** @method flags=dynamic */ +public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg); +public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) { lock.lock(); try { - _SoupMessage_method (message, method); + return _soup_message_get_uri (msg); } finally { lock.unlock(); } } -/** - * @method flags=getter - * @param message cast=(SoupMessage *) - */ -public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { +/** @method flags=dynamic */ +public static final native void _soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value); +public static final void soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value) { lock.lock(); try { - return _SoupMessage_request_body (message); + _soup_message_headers_append (headers, name, value); } finally { lock.unlock(); } } -/** - * @method flags=getter - * @param message cast=(SoupMessage *) - */ -public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { +/** @method flags=dynamic */ +public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type); +public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) { lock.lock(); try { - return _SoupMessage_request_headers (message); + _soup_session_add_feature_by_type (session, type); } finally { lock.unlock(); } } -/** - * @param body cast=(SoupMessageBody *) - * @param use cast=(SoupMemoryUse) - * @param data cast=(gconstpointer) - * @param length cast=(gsize) - */ -public static final native void _soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length); -public static final void soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length) { +/** @method flags=dynamic */ +public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type); +public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) { lock.lock(); try { - _soup_message_body_append (body, use, data, length); + return _soup_session_get_feature (session, feature_type); } finally { lock.unlock(); } } -/** - * @param body cast=(SoupMessageBody *) - */ -public static final native void _soup_message_body_flatten (int /*long*/ body); -public static final void soup_message_body_flatten (int /*long*/ body) { +/** @method flags=dynamic */ +public static final native void _soup_session_feature_attach (int /*long*/ feature, int /*long*/ session); +public static final void soup_session_feature_attach (int /*long*/ feature, int /*long*/ session) { lock.lock(); try { - _soup_message_body_flatten (body); + _soup_session_feature_attach (feature, session); } finally { lock.unlock(); } } -/** - * @param msg cast=(SoupMessage *) - */ -public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg); -public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) { +/** @method flags=dynamic */ +public static final native int /*long*/ _soup_session_get_type (); +public static final int /*long*/ soup_session_get_type () { lock.lock(); try { - return _soup_message_get_uri (msg); + return _soup_session_get_type (); } finally { lock.unlock(); } } -/** - * @param headers cast=(SoupMessageHeaders *) - * @param name cast=(const char *) - * @param value cast=(const char *) - */ -public static final native void _soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value); -public static final void soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value) { +/** @method flags=dynamic */ +public static final native void _soup_session_feature_detach (int /*long*/ feature, int /*long*/ session); +public static final void soup_session_feature_detach (int /*long*/ feature, int /*long*/ session) { lock.lock(); try { - _soup_message_headers_append (headers, name, value); + _soup_session_feature_detach (feature, session); } finally { lock.unlock(); } } -/** - * @param session cast=(SoupSession *) - * @param type cast=(GType) - */ -public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type); -public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) { +/** @method flags=dynamic */ +public static final native void _soup_uri_free (int /*long*/ uri); +public static final void soup_uri_free (int /*long*/ uri) { lock.lock(); try { - _soup_session_add_feature_by_type (session, type); + _soup_uri_free (uri); } finally { lock.unlock(); } } -/** - * @param session cast=(SoupSession *) - * @param feature_type cast=(GType) - */ -public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type); -public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) { +/** @method flags=dynamic */ +public static final native int /*long*/ _soup_uri_new (byte[] uri_string); +public static final int /*long*/ soup_uri_new (byte[] uri_string) { lock.lock(); try { - return _soup_session_get_feature (session, feature_type); + return _soup_uri_new (uri_string); } finally { lock.unlock(); } } -/** - * @param feature cast=(SoupSessionFeature *) - * @param session cast=(SoupSession *) - */ -public static final native void _soup_session_feature_attach (int /*long*/ feature, int /*long*/ session); -public static final void soup_session_feature_attach (int /*long*/ feature, int /*long*/ session) { +/** @method flags=dynamic */ +public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query); +public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_path_and_query) { lock.lock(); try { - _soup_session_feature_attach (feature, session); + return _soup_uri_to_string (uri, just_path_and_query); } finally { lock.unlock(); } } -/** - * @param feature cast=(SoupSessionFeature *) - * @param session cast=(SoupSession *) - */ -public static final native void _soup_session_feature_detach (int /*long*/ feature, int /*long*/ session); -public static final void soup_session_feature_detach (int /*long*/ feature, int /*long*/ session) { +/* --------------------- start WebKitGTK natives --------------------- */ + +/** @method flags=dynamic */ +public static final native int _webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData); +public static final int webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData) { lock.lock(); try { - _soup_session_feature_detach (feature, session); + return _webkit_dom_event_target_add_event_listener (target, name, handler, bubble, userData); } finally { lock.unlock(); } } -/** - * @param uri cast=(SoupURI *) - */ -public static final native void _soup_uri_free (int /*long*/ uri); -public static final void soup_uri_free (int /*long*/ uri) { +/** @method flags=dynamic */ +public static final native int _webkit_dom_mouse_event_get_alt_key (int /*long*/ self); +public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) { lock.lock(); try { - _soup_uri_free (uri); + return _webkit_dom_mouse_event_get_alt_key (self); } finally { lock.unlock(); } } -/** - * @param uri_string cast=(const char *) - */ -public static final native int /*long*/ _soup_uri_new (byte[] uri_string); -public static final int /*long*/ soup_uri_new (byte[] uri_string) { +/** @method flags=dynamic */ +public static final native short _webkit_dom_mouse_event_get_button (int /*long*/ self); +public static final short webkit_dom_mouse_event_get_button (int /*long*/ self) { lock.lock(); try { - return _soup_uri_new (uri_string); + return _webkit_dom_mouse_event_get_button (self); } finally { lock.unlock(); } } -/** - * @param uri cast=(SoupURI *) - */ -public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query); -public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_path_and_query) { +/** @method flags=dynamic */ +public static final native int _webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self); +public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self) { lock.lock(); try { - return _soup_uri_to_string (uri, just_path_and_query); + return _webkit_dom_mouse_event_get_ctrl_key (self); } finally { lock.unlock(); } } -/* --------------------- start WebKitGTK natives --------------------- */ +/** @method flags=dynamic */ +public static final native int _webkit_dom_mouse_event_get_meta_key (int /*long*/ self); +public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_mouse_event_get_meta_key (self); + } finally { + lock.unlock(); + } +} -/** - * @param download cast=(WebKitDownload *) - */ +/** @method flags=dynamic */ +public static final native long _webkit_dom_mouse_event_get_screen_x (int /*long*/ self); +public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_mouse_event_get_screen_x (self); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ +public static final native long _webkit_dom_mouse_event_get_screen_y (int /*long*/ self); +public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_mouse_event_get_screen_y (self); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ +public static final native int _webkit_dom_mouse_event_get_shift_key (int /*long*/ self); +public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_mouse_event_get_shift_key (self); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ +public static final native long _webkit_dom_ui_event_get_char_code (int /*long*/ self); +public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_ui_event_get_char_code (self); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ +public static final native long _webkit_dom_ui_event_get_detail (int /*long*/ self); +public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_ui_event_get_detail (self); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ +public static final native long _webkit_dom_ui_event_get_key_code (int /*long*/ self); +public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) { + lock.lock(); + try { + return _webkit_dom_ui_event_get_key_code (self); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ public static final native void _webkit_download_cancel (int /*long*/ download); public static final void webkit_download_cancel (int /*long*/ download) { lock.lock(); @@ -796,9 +731,7 @@ public static final void webkit_download_cancel (int /*long*/ download) { } } -/** - * @param download cast=(WebKitDownload *) - */ +/** @method flags=dynamic */ public static final native long _webkit_download_get_current_size (int /*long*/ download); public static final long webkit_download_get_current_size (int /*long*/ download) { lock.lock(); @@ -809,9 +742,7 @@ public static final long webkit_download_get_current_size (int /*long*/ download } } -/** - * @param download cast=(WebKitDownload *) - */ +/** @method flags=dynamic */ public static final native int _webkit_download_get_status (int /*long*/ download); public static final int webkit_download_get_status (int /*long*/ download) { lock.lock(); @@ -822,9 +753,7 @@ public static final int webkit_download_get_status (int /*long*/ download) { } } -/** - * @param download cast=(WebKitDownload *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download); public static final int /*long*/ webkit_download_get_suggested_filename (int /*long*/ download) { lock.lock(); @@ -835,9 +764,7 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l } } -/** - * @param download cast=(WebKitDownload *) - */ +/** @method flags=dynamic */ public static final native long _webkit_download_get_total_size (int /*long*/ download); public static final long webkit_download_get_total_size (int /*long*/ download) { lock.lock(); @@ -848,9 +775,7 @@ public static final long webkit_download_get_total_size (int /*long*/ download) } } -/** - * @param download cast=(WebKitDownload *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download); public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) { lock.lock(); @@ -861,10 +786,7 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) } } -/** - * @param download cast=(WebKitDownload *) - * @param destination_uri cast=(const gchar *) - */ +/** @method flags=dynamic */ public static final native void _webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri); public static final void webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri) { lock.lock(); @@ -875,6 +797,7 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl } } +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_get_default_session (); public static final int /*long*/ webkit_get_default_session () { lock.lock(); @@ -885,16 +808,7 @@ public static final int /*long*/ webkit_get_default_session () { } } -public static final native boolean _WEBKIT_IS_WEB_FRAME (int /*long*/ object); -public static final boolean WEBKIT_IS_WEB_FRAME (int /*long*/ object) { - lock.lock(); - try { - return _WEBKIT_IS_WEB_FRAME (object); - } finally { - lock.unlock(); - } -} - +/** @method flags=dynamic */ public static final native int _webkit_major_version (); public static final int webkit_major_version () { lock.lock(); @@ -905,6 +819,7 @@ public static final int webkit_major_version () { } } +/** @method flags=dynamic */ public static final native int _webkit_micro_version (); public static final int webkit_micro_version () { lock.lock(); @@ -915,6 +830,7 @@ public static final int webkit_micro_version () { } } +/** @method flags=dynamic */ public static final native int _webkit_minor_version (); public static final int webkit_minor_version () { lock.lock(); @@ -925,9 +841,7 @@ public static final int webkit_minor_version () { } } -/** - * @param request cast=(WebKitNetworkRequest *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request); public static final int /*long*/ webkit_network_request_get_message (int /*long*/ request) { lock.lock(); @@ -938,9 +852,7 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long* } } -/** - * @param request cast=(WebKitNetworkRequest *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request); public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ request) { lock.lock(); @@ -951,9 +863,7 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re } } -/** - * @param uri cast=(const gchar *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_network_request_new (byte[] uri); public static final int /*long*/ webkit_network_request_new (byte[] uri) { lock.lock(); @@ -964,6 +874,7 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) { } } +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_soup_auth_dialog_get_type (); public static final int /*long*/ webkit_soup_auth_dialog_get_type () { lock.lock(); @@ -974,9 +885,7 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () { } } -/** - * @param data_source cast=(WebKitWebDataSource *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source); public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ data_source) { lock.lock(); @@ -987,9 +896,7 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d } } -/** - * @param data_source cast=(WebKitWebDataSource *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source); public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long*/ data_source) { lock.lock(); @@ -1000,9 +907,7 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame); public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ frame) { lock.lock(); @@ -1013,9 +918,7 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame); public static final int /*long*/ webkit_web_frame_get_global_context (int /*long*/ frame) { lock.lock(); @@ -1026,9 +929,7 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame); public static final int webkit_web_frame_get_load_status (int /*long*/ frame) { lock.lock(); @@ -1039,9 +940,7 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) { } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame); public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame) { lock.lock(); @@ -1052,9 +951,7 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame); public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) { lock.lock(); @@ -1065,9 +962,18 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ +public static final native int /*long*/ _webkit_web_frame_get_type (); +public static final int /*long*/ webkit_web_frame_get_type () { + lock.lock(); + try { + return _webkit_web_frame_get_type (); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame); public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) { lock.lock(); @@ -1078,9 +984,7 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) { } } -/** - * @param frame cast=(WebKitWebFrame *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame); public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ frame) { lock.lock(); @@ -1091,9 +995,7 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra } } -/** - * @param decision cast=(WebKitWebPolicyDecision *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_policy_decision_download (int /*long*/ decision); public static final void webkit_web_policy_decision_download (int /*long*/ decision) { lock.lock(); @@ -1104,9 +1006,7 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis } } -/** - * @param decision cast=(WebKitWebPolicyDecision *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision); public static final void webkit_web_policy_decision_ignore (int /*long*/ decision) { lock.lock(); @@ -1117,9 +1017,7 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view); public static final int webkit_web_view_can_go_back (int /*long*/ web_view) { lock.lock(); @@ -1130,9 +1028,7 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) { } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view); public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) { lock.lock(); @@ -1143,10 +1039,7 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) { } } -/** - * @param web_view cast=(WebKitWebView *) - * @param mime_type cast=(const gchar *) - */ +/** @method flags=dynamic */ public static final native int _webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type); public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type) { lock.lock(); @@ -1157,10 +1050,7 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie } } -/** - * @param web_view cast=(WebKitWebView *) - * @param script cast=(const gchar *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_execute_script (int /*long*/ web_view, byte[] script); public static final void webkit_web_view_execute_script (int /*long*/ web_view, byte[] script) { lock.lock(); @@ -1171,9 +1061,18 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view, } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ +public static final native int /*long*/ _webkit_web_view_get_dom_document (int /*long*/ web_view); +public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/ web_view) { + lock.lock(); + try { + return _webkit_web_view_get_dom_document (web_view); + } finally { + lock.unlock(); + } +} + +/** @method flags=dynamic */ public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view); public static final int webkit_web_view_get_load_status (int /*long*/ web_view) { lock.lock(); @@ -1184,9 +1083,7 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view) } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view); public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ web_view) { lock.lock(); @@ -1197,9 +1094,7 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native double _webkit_web_view_get_progress (int /*long*/ web_view); public static final double webkit_web_view_get_progress (int /*long*/ web_view) { lock.lock(); @@ -1210,9 +1105,7 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view) } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view); public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_view) { lock.lock(); @@ -1223,9 +1116,7 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_ } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view); public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_view) { lock.lock(); @@ -1236,9 +1127,7 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view); public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) { lock.lock(); @@ -1249,9 +1138,7 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view); public static final int /*long*/ webkit_web_view_get_window_features (int /*long*/ web_view) { lock.lock(); @@ -1262,9 +1149,7 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_go_back (int /*long*/ web_view); public static final void webkit_web_view_go_back (int /*long*/ web_view) { lock.lock(); @@ -1275,9 +1160,7 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) { } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_go_forward (int /*long*/ web_view); public static final void webkit_web_view_go_forward (int /*long*/ web_view) { lock.lock(); @@ -1288,13 +1171,7 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) { } } -/** - * @param web_view cast=(WebKitWebView *) - * @param content cast=(const gchar *) - * @param mime_type cast=(const gchar *) - * @param encoding cast=(const gchar *) - * @param base_uri cast=(const gchar *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); public static final void webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { lock.lock(); @@ -1305,10 +1182,7 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt } } -/** - * @param web_view cast=(WebKitWebView *) - * @param uri cast=(const gchar *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri); public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri) { lock.lock(); @@ -1319,6 +1193,7 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] } } +/** @method flags=dynamic */ public static final native int /*long*/ _webkit_web_view_new (); public static final int /*long*/ webkit_web_view_new () { lock.lock(); @@ -1329,9 +1204,7 @@ public static final int /*long*/ webkit_web_view_new () { } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_reload (int /*long*/ web_view); public static final void webkit_web_view_reload (int /*long*/ web_view) { lock.lock(); @@ -1342,9 +1215,7 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) { } } -/** - * @param web_view cast=(WebKitWebView *) - */ +/** @method flags=dynamic */ public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view); public static final void webkit_web_view_stop_loading (int /*long*/ web_view) { lock.lock(); @@ -1366,4 +1237,61 @@ public static final native int JSClassDefinition_sizeof (); */ public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size); +/** + * @method flags=getter + * @param cookie cast=(SoupCookie *) + */ +public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); +public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { + lock.lock(); + try { + return _SoupCookie_expires (cookie); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=setter + * @param message cast=(SoupMessage *) + * @param method cast=(const char *) + */ +public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); +public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { + lock.lock(); + try { + _SoupMessage_method (message, method); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=getter + * @param message cast=(SoupMessage *) + */ +public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); +public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { + lock.lock(); + try { + return _SoupMessage_request_body (message); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=getter + * @param message cast=(SoupMessage *) + */ +public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); +public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { + lock.lock(); + try { + return _SoupMessage_request_headers (message); + } finally { + lock.unlock(); + } +} + } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h index 583f87673c..f25a2d2c36 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h @@ -22,5 +22,7 @@ #include <WebKitCOMAPI.h> #include "webkit_win32_custom.h" +#define WebKit_LOAD_FUNCTION LOAD_FUNCTION + #endif /* INC_webkit_win32_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp index 5193f7666b..a1860586a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp @@ -88,7 +88,7 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance) rc = (jint)WebKitCreateInstance(lparg0, arg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, WebKitCreateInstance) + WebKit_LOAD_FUNCTION(fp, WebKitCreateInstance) if (fp) { rc = (jint)((jint (*)(jbyte *, jintLong, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TrayItem.java index d60768bced..d60768bced 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TrayItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java index 175dd4843a..175dd4843a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java index a214cd4b62..a214cd4b62 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java index 161c4cadb0..161c4cadb0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/DeviceData.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/DeviceData.java index ad0c2b2afe..ad0c2b2afe 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/DeviceData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/DeviceData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java index 1382eddd3e..1382eddd3e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java index 6dcd68b96f..6dcd68b96f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontMetrics.java index 919fa2841b..919fa2841b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontMetrics.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontMetrics.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java index ea28083156..ea28083156 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java index feed56809a..feed56809a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java index 8cf8633414..8cf8633414 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java index 7a87377188..7a87377188 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java index 46875f961c..46875f961c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java index 68351dc271..68351dc271 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java index 9aaba2f07a..c4478bb587 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java @@ -156,15 +156,17 @@ void computeRuns() { //TODO ascend descent wrap NSMutableParagraphStyle paragraph = (NSMutableParagraphStyle)new NSMutableParagraphStyle().alloc().init(); int align = OS.NSLeftTextAlignment; - if (justify) { - align = OS.NSJustifiedTextAlignment; - } else { - switch (alignment) { - case SWT.CENTER: - align = OS.NSCenterTextAlignment; - break; - case SWT.RIGHT: - align = OS.NSRightTextAlignment; + if (wrapWidth != -1) { + if (justify) { + align = OS.NSJustifiedTextAlignment; + } else { + switch (alignment) { + case SWT.CENTER: + align = OS.NSCenterTextAlignment; + break; + case SWT.RIGHT: + align = OS.NSRightTextAlignment; + } } } if ((orientation & SWT.RIGHT_TO_LEFT) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java index dc6c63e9a2..dc6c63e9a2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java index 256c9f6af3..256c9f6af3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java index a1257fdb0f..a1257fdb0f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Caret.java index a42a7390fa..a42a7390fa 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Caret.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java index 908cc57869..908cc57869 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java index 67b803549e..406bc49794 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java @@ -595,6 +595,27 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) { return super.dragDetect(x, y, filter, consume); } +public int getCaretPosition() { + checkWidget(); + return selectionRange != null ? (int)/*64*/selectionRange.location : 0; +} + +public Point getCaretLocation() { + checkWidget(); + NSTextView widget = null; + if (this.hasFocus()) { + widget = new NSTextView(view.window().fieldEditor(true, view)); + } + if (widget == null) return new Point (0, 0); + NSLayoutManager layoutManager = widget.layoutManager(); + NSTextContainer container = widget.textContainer(); + NSRange range = widget.selectedRange(); + int /*long*/ [] rectCount = new int /*long*/ [1]; + int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount); + NSRect rect = new NSRect(); + if (rectCount[0] > 0) OS.memmove(rect, pArray, NSRect.sizeof); + return new Point((int)rect.x, (int)rect.y); +} int getCharCount() { NSString str; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java index 6678d079cb..6678d079cb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java index ca0e428614..ca0e428614 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java index 7f2801f906..7f2801f906 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java index 7839aa34a0..7839aa34a0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java index 5f334716a1..5f334716a1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java index 5bbba9de25..1af38eb037 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java @@ -2606,6 +2606,7 @@ void initClasses () { OS.class_addMethod(cls, OS.sel_changeColor_, dialogProc3, "@:@"); OS.class_addMethod(cls, OS.sel_setColor_forAttribute_, dialogProc4, "@:@@"); OS.class_addMethod(cls, OS.sel_changeFont_, dialogProc3, "@:@"); + OS.class_addMethod(cls, OS.sel_validModesForFontPanel_, dialogProc3, "@:@"); OS.class_addMethod(cls, OS.sel_sendSelection_, dialogProc3, "@:@"); OS.class_addMethod(cls, OS.sel_panel_shouldShowFilename_, dialogProc4, "@:@@"); OS.class_addMethod(cls, OS.sel_panelDidEnd_returnCode_contextInfo_, dialogProc5, "@:@i@"); @@ -5240,6 +5241,10 @@ static int /*long*/ dialogProc(int /*long*/ id, int /*long*/ sel, int /*long*/ a FontDialog dialog = (FontDialog)OS.JNIGetObject(jniRef[0]); if (dialog == null) return 0; dialog.changeFont(id, sel, arg0); + } else if (sel == OS.sel_validModesForFontPanel_) { + FontDialog dialog = (FontDialog)OS.JNIGetObject(jniRef[0]); + if (dialog == null) return 0; + return dialog.validModesForFontPanel(id, sel, arg0); } else if (sel == OS.sel_sendSelection_) { FileDialog dialog = (FileDialog)OS.JNIGetObject(jniRef[0]); if (dialog == null) return 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java index 5be438bb4a..5be438bb4a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java index fc999e29ab..8664a76e6a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java @@ -37,6 +37,7 @@ public class FontDialog extends Dialog { RGB rgb; boolean selected; int fontID, fontSize; + boolean effectsVisible = true; /** * Constructs a new instance of this class given only its parent. @@ -89,6 +90,21 @@ void changeFont(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { } /** + * Returns <code>true</code> if the dialog's effects selection controls + * are visible, and <code>false</code> otherwise. + * <p> + * If the platform's font dialog does not have any effects selection controls, + * then this method always returns false. + * </p> + * + * @return <code>true</code> if the dialog's effects selection controls + * are visible and <code>false</code> otherwise + */ +public boolean getEffectsVisible () { + return effectsVisible; +} + +/** * Returns a FontData object describing the font that was * selected in the dialog, or null if none is available. * @@ -186,6 +202,20 @@ void setColor_forAttribute(int /*long*/ id, int /*long*/ sel, int /*long*/ color } /** + * Sets the effects selection controls in the dialog visible if the + * argument is <code>true</code>, and invisible otherwise. + * <p> + * By default the effects selection controls are displayed if the + * platform font dialog supports effects selection. + * </p> + * + * @param visible whether or not the dialog will show the effects selection controls + */ +public void setEffectsVisible(boolean visible) { + effectsVisible = visible; +} + +/** * Sets a FontData object describing the font to be * selected by default in the dialog, or null to let * the platform choose one. @@ -232,6 +262,10 @@ public void setRGB (RGB rgb) { this.rgb = rgb; } +int validModesForFontPanel(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { + return effectsVisible ? OS.NSFontPanelAllModesMask : OS.NSFontPanelAllModesMask & ~OS.NSFontPanelAllEffectsModeMask; +} + void windowWillClose(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) { NSApplication.sharedApplication().stop(null); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java index 15cb5692a9..15cb5692a9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java index db3b4b135b..db3b4b135b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java index 8b875fa648..8b875fa648 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java index 3b06fb96b7..3b06fb96b7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java index adffc449f9..adffc449f9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java index ce62d49578..ce62d49578 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java index 462e01071a..462e01071a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java index 92b7d4388e..92b7d4388e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java index b9eb76f0a4..b9eb76f0a4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java index 9b163c3cf1..9b163c3cf1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java index 02f07e3008..02f07e3008 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java index 770be6ba9d..770be6ba9d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java index a5b5ebc45c..a5b5ebc45c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java index 1d61979f14..1d61979f14 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java index 1f774436b4..1f774436b4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java index b842321ae6..b842321ae6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java index 481c041fb7..481c041fb7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java index 267d895f2a..267d895f2a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java index a4332b1964..a4332b1964 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableItem.java index 8e8ffcdc4d..8e8ffcdc4d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java index 3ea2fb46d2..82c66ce803 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java @@ -702,11 +702,15 @@ boolean acceptsFirstResponder(int /*long*/ id, int /*long*/ sel) { */ public Point getCaretLocation () { checkWidget (); + NSTextView widget = null; if ((style & SWT.SINGLE) != 0) { - //TODO - caret location for single text - return new Point (0, 0); + if (this.hasFocus()) { + widget = new NSTextView(view.window().fieldEditor(true, view)); + } + } else { + widget = (NSTextView) view; } - NSTextView widget = (NSTextView)view; + if (widget == null) return new Point (0, 0); NSLayoutManager layoutManager = widget.layoutManager(); NSTextContainer container = widget.textContainer(); NSRange range = widget.selectedRange(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java index f4f86724e5..f4f86724e5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java index a41397d752..a41397d752 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java index fdc5a4d039..fdc5a4d039 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java index f2c639f663..f2c639f663 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java index bb523df1be..bb523df1be 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java index 0a0f469257..0a0f469257 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java index 826b3669fe..826b3669fe 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java index fece67b98c..6ff03ac0ff 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java @@ -1666,7 +1666,10 @@ void setImage (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { } boolean setInputState (Event event, NSEvent nsEvent, int type) { - if (nsEvent == null) return true; + if (nsEvent == null) { + nsEvent = NSApplication.sharedApplication().currentEvent(); + if (nsEvent == null) return true; + } int /*long*/ modifierFlags = nsEvent.modifierFlags(); if ((modifierFlags & OS.NSAlternateKeyMask) != 0) event.stateMask |= SWT.ALT; if ((modifierFlags & OS.NSShiftKeyMask) != 0) event.stateMask |= SWT.SHIFT; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c index 73d9851dbb..73d9851dbb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h index 352d67b45c..352d67b45c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak index 74eb78d416..66658d73fb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak @@ -10,5 +10,5 @@ #******************************************************************************* maj_ver=3 -min_ver=804 -comma_ver=3,8,0,4 +min_ver=807 +comma_ver=3,8,0,7 diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java index 7a9a4a427c..7a9a4a427c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTError.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTError.java index 6a2341db66..6a2341db66 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTError.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTError.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTException.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTException.java index c139457ff5..c139457ff5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTException.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTException.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmEvent.java index 5b6f9826a1..5b6f9826a1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java index 23e983afc7..23e983afc7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlAdapter.java index 10f273b09f..10f273b09f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlEvent.java index 3513ef31c2..3513ef31c2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java index 4895ec1946..4895ec1946 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeEvent.java index 04dbdd9639..04dbdd9639 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java index 980f0b30ae..980f0b30ae 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusAdapter.java index eab687e12d..eab687e12d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusEvent.java index a703db7cfe..a703db7cfe 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java index 9aa3097d0a..9aa3097d0a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/GestureEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/GestureEvent.java index f6667fdbea..f197f0e32d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/GestureEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/GestureEvent.java @@ -145,7 +145,7 @@ public GestureEvent(Event e) { public String toString() { String string = super.toString (); return string.substring (0, string.length() - 1) // remove trailing '}' - + " stateMask=" + stateMask + + " stateMask=0x" + Integer.toHexString(stateMask) + " detail=" + detail + " x=" + x + " y=" + y diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpEvent.java index fd38eba361..fd38eba361 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java index 9437c093ea..9437c093ea 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyAdapter.java index dca53cc517..dca53cc517 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyEvent.java index 03ecb92cb3..56b511a9e2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -124,10 +124,10 @@ public KeyEvent(Event e) { public String toString() { String string = super.toString (); return string.substring (0, string.length() - 1) // remove trailing '}' - + " character='" + ((character == 0) ? "\\0" : "" + character) + "'" - + " keyCode=" + keyCode - + " keyLocation=" + keyLocation - + " stateMask=" + stateMask + + " character='" + ((character == 0) ? "\\0" : String.valueOf(character)) + "'=0x" + Integer.toHexString(character) + + " keyCode=0x" + Integer.toHexString(keyCode) + + " keyLocation=0x" + Integer.toHexString(keyLocation) + + " stateMask=0x" + Integer.toHexString(stateMask) + " doit=" + doit + "}"; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java index 6107f8370e..6107f8370e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuAdapter.java index 6bd3c6e5df..6bd3c6e5df 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuEvent.java index 4697a9df42..4697a9df42 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java index 0c74780ce9..0c74780ce9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyEvent.java index 36642cfdd5..36642cfdd5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java index 614b13ad5a..614b13ad5a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseAdapter.java index 1ae1c4821f..1ae1c4821f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseEvent.java index 2730002234..d9f746fb26 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -96,7 +96,7 @@ public String toString() { String string = super.toString (); return string.substring (0, string.length() - 1) // remove trailing '}' + " button=" + button - + " stateMask=" + stateMask + + " stateMask=0x" + Integer.toHexString(stateMask) + " x=" + x + " y=" + y + " count=" + count diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java index 8ee2158624..8ee2158624 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java index cc4e00f1a7..cc4e00f1a7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackAdapter.java index d5ba0ef8bf..d5ba0ef8bf 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java index 9b01407c7d..9b01407c7d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintEvent.java index e7c4443ff1..e7c4443ff1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java index 7a047c82ea..7a047c82ea 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionAdapter.java index be1fe9fdc0..be1fe9fdc0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionEvent.java index 7f6a77eb2d..d0034594cd 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -133,7 +133,7 @@ public String toString() { + " y=" + y + " width=" + width + " height=" + height - + " stateMask=" + stateMask + + " stateMask=0x" + Integer.toHexString(stateMask) + " text=" + text + " doit=" + doit + "}"; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java index 32938d3f07..32938d3f07 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellAdapter.java index 39e7d188f1..39e7d188f1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellEvent.java index 736cca3f14..736cca3f14 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java index 36cd8a146a..36cd8a146a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TouchEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TouchEvent.java index ae467a9720..9ad6c401be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TouchEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TouchEvent.java @@ -78,7 +78,7 @@ public TouchEvent(Event e) { public String toString() { String string = super.toString(); string = string.substring (0, string.length() - 1); // remove trailing '}' - string += " stateMask=" + stateMask + string += " stateMask=0x" + Integer.toHexString(stateMask) + " x=" + x + " y=" + y; if (touches != null) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseEvent.java index f50e42ab2a..f50e42ab2a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java index 2d1d4b3261..2d1d4b3261 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeAdapter.java index c7dacb892b..c7dacb892b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeAdapter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeAdapter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeEvent.java index 1a3dbc547d..1a3dbc547d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java index 9e45cc2630..9e45cc2630 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TypedEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TypedEvent.java index 1f2f8676f7..1f2f8676f7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TypedEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TypedEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyEvent.java index 527aaba7e6..527aaba7e6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java index 653e203387..653e203387 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/package.html index b6325f9463..b6325f9463 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java index 141268b017..141268b017 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java index ea9f1d4d23..ea9f1d4d23 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java index 0feebe2873..0feebe2873 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderEvent.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderEvent.java index d365596052..d365596052 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderEvent.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java index 631779fc0a..631779fc0a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/PaletteData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/PaletteData.java index c73a01fa9c..c73a01fa9c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/PaletteData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/PaletteData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java index 3d3f9cbc5d..3d3f9cbc5d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java index e7a5630bbd..e7a5630bbd 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java index c09e15f454..c09e15f454 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/package.html index d71267ad85..d71267ad85 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java index ce73d17e0e..ce73d17e0e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java index 074b038bb5..074b038bb5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/GIFFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/GIFFileFormat.java index 583e7c0e99..583e7c0e99 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/GIFFileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/GIFFileFormat.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGAppn.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGAppn.java index 37160a220b..37160a220b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGAppn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGAppn.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java index b8c8392e1e..b8c8392e1e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGComment.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGComment.java index 21070f16ea..21070f16ea 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGComment.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGComment.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGEndOfImage.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGEndOfImage.java index faa369ccb0..faa369ccb0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGEndOfImage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGEndOfImage.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFileFormat.java index 967feb708d..967feb708d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFileFormat.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java index 28da86905d..28da86905d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFrameHeader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFrameHeader.java index 00d761078c..00d761078c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFrameHeader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFrameHeader.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGHuffmanTable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGHuffmanTable.java index 043c6157e0..043c6157e0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGHuffmanTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGHuffmanTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGQuantizationTable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGQuantizationTable.java index 18eab61ff6..18eab61ff6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGQuantizationTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGQuantizationTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGRestartInterval.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGRestartInterval.java index fd6fc48ef0..fd6fc48ef0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGRestartInterval.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGRestartInterval.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGScanHeader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGScanHeader.java index ae8d25d884..ae8d25d884 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGScanHeader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGScanHeader.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGSegment.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGSegment.java index 0dbf42aa89..0dbf42aa89 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGSegment.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGSegment.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGStartOfImage.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGStartOfImage.java index 5b809994e4..5b809994e4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGStartOfImage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGStartOfImage.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java index a3896e6706..a3896e6706 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataInputStream.java index f399989a32..f399989a32 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataInputStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataInputStream.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataOutputStream.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataOutputStream.java index bd8a330280..bd8a330280 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataOutputStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataOutputStream.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWCodec.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWCodec.java index 190ff01b7e..190ff01b7e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWCodec.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWCodec.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWNode.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWNode.java index 869e532ba3..869e532ba3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWNode.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWNode.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PNGFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PNGFileFormat.java index 3d01237a93..3d01237a93 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PNGFileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PNGFileFormat.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunk.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunk.java index 74b438ea46..74b438ea46 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunk.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunk.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunkReader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunkReader.java index 0997c46b97..0997c46b97 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunkReader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunkReader.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngDecodingDataStream.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngDecodingDataStream.java index a05021a0db..a05021a0db 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngDecodingDataStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngDecodingDataStream.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngFileReadState.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngFileReadState.java index f8f0064de7..f8f0064de7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngFileReadState.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngFileReadState.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTable.java index 48e026958b..48e026958b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTables.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTables.java index 6ecaeb4764..6ecaeb4764 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTables.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTables.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIdatChunk.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIdatChunk.java index 6dfac62210..6dfac62210 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIdatChunk.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIdatChunk.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIendChunk.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIendChunk.java index ed604e0ae9..ed604e0ae9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIendChunk.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIendChunk.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIhdrChunk.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIhdrChunk.java index 37d550883e..37d550883e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIhdrChunk.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIhdrChunk.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngLzBlockReader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngLzBlockReader.java index a2d9c1f3cb..a2d9c1f3cb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngLzBlockReader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngLzBlockReader.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngPlteChunk.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngPlteChunk.java index 421849b730..421849b730 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngPlteChunk.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngPlteChunk.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngTrnsChunk.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngTrnsChunk.java index d659a677d8..d659a677d8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngTrnsChunk.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngTrnsChunk.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinBMPFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinBMPFileFormat.java index 04af102c78..04af102c78 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinBMPFileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinBMPFileFormat.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java index 3dbc5f51b3..3dbc5f51b3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/package.html index ab7efd4a18..ab7efd4a18 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/package.html index d1b671ef87..d1b671ef87 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java index b2354723d3..b2354723d3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java index 690e58c11a..690e58c11a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java index af3b97cfa6..af3b97cfa6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java index c0a9e03293..c0a9e03293 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java index 2d8b5742c1..2d8b5742c1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/package.html index 3da06c41d8..3da06c41d8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/package.html index 31459b907b..31459b907b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Dialog.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Dialog.java index 95de81f4fa..95de81f4fa 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Dialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Dialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Event.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Event.java index 73ddf5261f..73ddf5261f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Event.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Event.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java index a9cda7b1b8..a9cda7b1b8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Item.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Item.java index 282bff2132..282bff2132 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Item.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Item.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Layout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Layout.java index 5c8f3c2850..5c8f3c2850 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Layout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Layout.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Listener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Listener.java index b02efa2cd3..b02efa2cd3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Listener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Listener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/RunnableLock.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/RunnableLock.java index 40a0e6b2b7..40a0e6b2b7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/RunnableLock.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/RunnableLock.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Synchronizer.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Synchronizer.java index 080871c428..080871c428 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Synchronizer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Synchronizer.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java index 354be9d6da..354be9d6da 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/package.html b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/package.html index 6068615622..6068615622 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/package.html +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/package.html diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt index 5088b0cae3..558406da33 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt @@ -1 +1 @@ -version 3.804
\ No newline at end of file +version 3.807
\ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java index 0b279c41a8..3582fac77e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java @@ -842,6 +842,34 @@ GdkColor getBackgroundColor () { return getBaseColor (); } +public Point getCaretLocation () { + checkWidget (); + if ((style & SWT.READ_ONLY) != 0) { + return new Point (0, 0); + } + int index = OS.gtk_editable_get_position (entryHandle); + if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) { + index = OS.gtk_entry_text_index_to_layout_index (entryHandle, index); + } + int [] offset_x = new int [1], offset_y = new int [1]; + OS.gtk_entry_get_layout_offsets (entryHandle, offset_x, offset_y); + int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle); + PangoRectangle pos = new PangoRectangle (); + OS.pango_layout_index_to_pos (layout, index, pos); + int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth (); + int y = offset_y [0] + OS.PANGO_PIXELS (pos.y); + return new Point (x, y); +} + +public int getCaretPosition () { + checkWidget (); + if ((style & SWT.READ_ONLY) != 0) { + return 0; + } + int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle); + return (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (entryHandle)); +} + GdkColor getForegroundColor () { return getTextColor (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java index 948762cabf..0d8c8097a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java @@ -17,7 +17,7 @@ import org.eclipse.swt.*; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.accessibility.*; -import org.eclipse.swt.internal.gtk.OS; +import org.eclipse.swt.internal.gtk.*; /** * Instances of this class are selectable user interface @@ -460,6 +460,14 @@ String formattedStringValue(int fieldName, int value, boolean adjust) { return String.valueOf(value); } +GdkColor getBackgroundColor () { + if ((style & SWT.CALENDAR) != 0) { + return getBaseColor (); + } else { + return super.getBackgroundColor (); + } +} + String getComputeSizeString(int style) { if ((style & SWT.DATE) != 0) { return (style & SWT.SHORT) != 0 ? DEFAULT_SHORT_DATE_FORMAT : (style & SWT.LONG) != 0 ? DEFAULT_LONG_DATE_FORMAT : DEFAULT_MEDIUM_DATE_FORMAT; @@ -1061,11 +1069,22 @@ void sendSelectionEvent () { public void setBackground(Color color) { super.setBackground(color); + if (((style & SWT.CALENDAR) != 0) && color == null) { + OS.gtk_widget_modify_base(handle, 0, null); + } bg = color; if (text != null) text.setBackground(color); if (popupCalendar != null) popupCalendar.setBackground(color); } +void setBackgroundColor (GdkColor color) { + if ((style & SWT.CALENDAR) != 0) { + OS.gtk_widget_modify_base(handle, 0, color); + } else { + super.setBackgroundColor (color); + } +} + public void setEnabled (boolean enabled){ super.setEnabled(enabled); if ((style & SWT.CALENDAR) == 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java index 8658c40d5f..3a60997973 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java @@ -82,6 +82,22 @@ public FontDialog (Shell parent, int style) { } /** + * Returns <code>true</code> if the dialog's effects selection controls + * are visible, and <code>false</code> otherwise. + * <p> + * If the platform's font dialog does not have any effects selection controls, + * then this method always returns false. + * </p> + * + * @return <code>true</code> if the dialog's effects selection controls + * are visible and <code>false</code> otherwise + */ +public boolean getEffectsVisible () { + // The GTK FontDialog does not have any effects selection controls. + return false; +} + +/** * Returns a FontData object describing the font that was * selected in the dialog, or null if none is available. * @@ -206,6 +222,20 @@ public FontData open () { return fontData; } /** + * Sets the effects selection controls in the dialog visible if the + * argument is <code>true</code>, and invisible otherwise. + * <p> + * By default the effects selection controls are displayed if the + * platform font dialog supports effects selection. + * </p> + * + * @param visible whether or not the dialog will show the effects selection controls + */ +public void setEffectsVisible(boolean visible) { + // The GTK FontDialog does not have any effects selection controls. +} + +/** * Sets a FontData object describing the font to be * selected by default in the dialog, or null to let * the platform choose one. diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index 6c18baf905..d70bc90eef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -2035,6 +2035,8 @@ public void setVisible (boolean visible) { OS.GDK_MAP, OS.GDK_UNMAP, OS.GDK_NO_EXPOSE, + OS.GDK_VISIBILITY_NOTIFY, + OS.GDK_WINDOW_STATE }; Display display = this.display; display.putGdkEvents(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java index 73cd8bf4f5..73cd8bf4f5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java index 672ea191e3..672ea191e3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java index 83924037e1..83924037e1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/DeviceData.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/DeviceData.java index ac1c73cf34..ac1c73cf34 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/DeviceData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/DeviceData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java index a00669c096..a00669c096 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontData.java index b018d7a01c..b018d7a01c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontMetrics.java index 83b12e5bcb..83b12e5bcb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontMetrics.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontMetrics.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java index a49e46975d..a49e46975d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java index 8d6836cd9a..8d6836cd9a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java index 340d524787..340d524787 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java index acf228a010..acf228a010 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java index 83b07b22ed..83b07b22ed 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java index a94ca39733..a94ca39733 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java index eb758937bc..eb758937bc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java index 94a1591b5c..94a1591b5c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ColorDialog.java index 762702f733..762702f733 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ColorDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java index 2fe3d38758..2fe3d38758 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java index 71d6ef020e..71d6ef020e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java index 13f9e37602..13f9e37602 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java index c4b01821eb..c4b01821eb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/DirectoryDialog.java index fda36a8d36..fda36a8d36 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/DirectoryDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java index 18b4425317..18b4425317 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FileDialog.java index 7e27cc2979..7e27cc2979 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FileDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FontDialog.java index dce45dee1a..dce45dee1a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FontDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java index ce900951f8..ce900951f8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java index 871b9441ad..871b9441ad 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java index 16b42b1466..16b42b1466 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java index 2b8c9ab5b6..2b8c9ab5b6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java index 541c64531c..541c64531c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MessageBox.java index 4592e11d2b..4592e11d2b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MessageBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MessageBox.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java index c26c24fd3c..c26c24fd3c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java index c4508269f6..c4508269f6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java index ca86b07baa..ca86b07baa 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java index 6415bafe0b..6415bafe0b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java index 3cf87dcb20..3cf87dcb20 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java index 2aacdfcca7..2aacdfcca7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java index 0255d5343d..0255d5343d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java index 7e41ae3fa6..7e41ae3fa6 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolBar.java index a5afb5901e..a5afb5901e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java index 4a1dcf8f50..4a1dcf8f50 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Tracker.java index 77ace947a2..77ace947a2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Tracker.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java index 34256cbe9c..34256cbe9c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java index 5c3ea28c05..5c3ea28c05 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java index ba1491e739..ba1491e739 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java index 8d1eafaeba..8d1eafaeba 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/DeviceData.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/DeviceData.java index 9b95c99718..9b95c99718 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/DeviceData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/DeviceData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java index 36ad265242..36ad265242 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontData.java index a89bfa406a..a89bfa406a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontMetrics.java index 3d6deea3fc..3d6deea3fc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontMetrics.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontMetrics.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java index 3b01e29575..3b01e29575 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GCData.java index 04aa2aa616..04aa2aa616 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GCData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java index 93bb5dca74..93bb5dca74 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java index 9fb0d6d072..9fb0d6d072 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/Converter.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/Converter.java index bde2826420..bde2826420 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/Converter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/Converter.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Button.java index 941e3d8435..941e3d8435 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Button.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java index eda2398f0e..eda2398f0e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Caret.java index 535ab7241b..535ab7241b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Caret.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ColorDialog.java index 5a819c6095..5a819c6095 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ColorDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Combo.java index 0999db44db..0999db44db 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Combo.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java index 390b47ef5a..390b47ef5a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java index 961b385186..961b385186 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java index 25282f2b38..25282f2b38 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/DirectoryDialog.java index 16e172cf2e..16e172cf2e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/DirectoryDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Display.java index 2e14eac5ac..2e14eac5ac 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Display.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FileDialog.java index 1e940623ff..1e940623ff 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FileDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FontDialog.java index fc69d0eab8..fc69d0eab8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FontDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Group.java index 2abdc6a410..2abdc6a410 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Group.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Label.java index 19432c4a6f..19432c4a6f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Label.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/List.java index 48b66e5b7f..48b66e5b7f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/List.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Menu.java index 52b5a2d976..52b5a2d976 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Menu.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MenuItem.java index 626a7763c3..626a7763c3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MenuItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MessageBox.java index d5bd3667a3..d5bd3667a3 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MessageBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MessageBox.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ProgressBar.java index b488d1bf49..b488d1bf49 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ProgressBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Sash.java index 9a512dcebc..9a512dcebc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Sash.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scale.java index f1cd3239dc..f1cd3239dc 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scale.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ScrollBar.java index 5e0608d8f0..5e0608d8f0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ScrollBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scrollable.java index 3d7b2916f2..3d7b2916f2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scrollable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java index 860948f986..860948f986 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Slider.java index 5825034e52..5825034e52 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Slider.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabFolder.java index e745ef6371..e745ef6371 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabFolder.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabItem.java index dc914c6ac4..dc914c6ac4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Text.java index 4cf18d3017..4cf18d3017 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Text.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolBar.java index 078e1896dd..078e1896dd 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolItem.java index 445616029f..445616029f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Tracker.java index 1e6e5dbce8..1e6e5dbce8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Tracker.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java index 47cd148ec9..47cd148ec9 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/WidgetTable.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/WidgetTable.java index 8898734d6f..8898734d6f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/WidgetTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/WidgetTable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java index d1c6a09805..d1c6a09805 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java index 2f064a3e22..2f064a3e22 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java index a885a9d07c..a885a9d07c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/DeviceData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/DeviceData.java index 9b95c99718..9b95c99718 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/DeviceData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/DeviceData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java index b21356c1d0..b21356c1d0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java index 31c12847b7..31c12847b7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java index 6cec1e40ef..6cec1e40ef 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java index 46b5929d35..46b5929d35 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java index 8ccb803401..8ccb803401 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index 9722cb6876..cef405f92f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -625,10 +625,11 @@ void initNative(String filename) { this.handle = createDIB(width, height, 16); break; case Gdip.PixelFormat24bppRGB: + case Gdip.PixelFormat32bppCMYK: this.handle = createDIB(width, height, 24); break; case Gdip.PixelFormat32bppRGB: - // These will loose either precision or transparency + // These will lose either precision or transparency case Gdip.PixelFormat16bppGrayScale: case Gdip.PixelFormat48bppRGB: case Gdip.PixelFormat32bppPARGB: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java index f1d7800e8a..f1d7800e8a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java index 1a8b99f1d4..dbd91a4403 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java @@ -1181,7 +1181,7 @@ RECT drawStrikeout(int /*long*/ hdc, int x, int baseline, StyleItem[] line, int } } RECT rect = new RECT(); - OS.SetRect(rect, x + left, baseline - run.strikeoutPos, x + run.x + run.width, baseline - run.strikeoutPos + run.strikeoutThickness); + OS.SetRect(rect, x + left, baseline - run.strikeoutPos - style.rise, x + run.x + run.width, baseline - run.strikeoutPos + run.strikeoutThickness - style.rise); int /*long*/ brush = OS.CreateSolidBrush(color); OS.FillRect(hdc, rect, brush); OS.DeleteObject(brush); @@ -1240,14 +1240,14 @@ RECT drawStrikeoutGDIP(int /*long*/ graphics, int x, int baseline, StyleItem[] l gdipRect.Width = clipRect.right - clipRect.left; gdipRect.Height = clipRect.bottom - clipRect.top; Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeExclude); - Gdip.Graphics_FillRectangle(graphics, brush, x + left, baseline - run.strikeoutPos, run.x + run.width - left, run.strikeoutThickness); + Gdip.Graphics_FillRectangle(graphics, brush, x + left, baseline - run.strikeoutPos - style.rise, run.x + run.width - left, run.strikeoutThickness); Gdip.Graphics_Restore(graphics, gstate); gstate = Gdip.Graphics_Save(graphics); Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect); - Gdip.Graphics_FillRectangle(graphics, selectionColor, x + left, baseline - run.strikeoutPos, run.x + run.width - left, run.strikeoutThickness); + Gdip.Graphics_FillRectangle(graphics, selectionColor, x + left, baseline - run.strikeoutPos - style.rise, run.x + run.width - left, run.strikeoutThickness); Gdip.Graphics_Restore(graphics, gstate); } else { - Gdip.Graphics_FillRectangle(graphics, brush, x + left, baseline - run.strikeoutPos, run.x + run.width - left, run.strikeoutThickness); + Gdip.Graphics_FillRectangle(graphics, brush, x + left, baseline - run.strikeoutPos - style.rise, run.x + run.width - left, run.strikeoutThickness); } if (brush != selectionColor && brush != color) Gdip.SolidBrush_delete(brush); return null; @@ -1287,7 +1287,7 @@ RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos, } } RECT rect = new RECT(); - OS.SetRect(rect, x + left, baseline - lineUnderlinePos, x + run.x + run.width, baseline - lineUnderlinePos + run.underlineThickness); + OS.SetRect(rect, x + left, baseline - lineUnderlinePos - style.rise, x + run.x + run.width, baseline - lineUnderlinePos + run.underlineThickness - style.rise); if (clipRect != null) { if (clipRect.left == -1) clipRect.left = 0; if (clipRect.right == -1) clipRect.right = 0x7ffff; @@ -1417,7 +1417,7 @@ RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnde } } RECT rect = new RECT(); - OS.SetRect(rect, x + left, baseline - lineUnderlinePos, x + run.x + run.width, baseline - lineUnderlinePos + run.underlineThickness); + OS.SetRect(rect, x + left, baseline - lineUnderlinePos - style.rise, x + run.x + run.width, baseline - lineUnderlinePos + run.underlineThickness - style.rise); Rect gdipRect = null; if (clipRect != null) { if (clipRect.left == -1) clipRect.left = 0; @@ -2604,6 +2604,18 @@ StyleItem[] itemize () { scriptState.uBidiLevel = 1; scriptState.fArabicNumContext = true; } + + /* + * In the version of Usp10.h that SWT is compiled the fReserved field is declared + * as a bitfield size 8. In newer versions of the Uniscribe, the first bit of fReserved + * was used to implement the fMergeNeutralItems feature which can be used to increase + * performance by reducing the number of SCRIPT_ITEM returned by ScriptItemize. + * + * Note: This code is wrong on a big endian machine. + */ + if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { + scriptControl.fReserved = 0x1; + } OS.ScriptApplyDigitSubstitution(null, scriptControl, scriptState); int /*long*/ hHeap = OS.GetProcessHeap(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java index b0612c48a8..b0612c48a8 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java index 6e50f11203..6e50f11203 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java index 890eee4bc1..890eee4bc1 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java index e939e6242c..e939e6242c 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java index 9f4d485e3e..443e6ec81d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java @@ -658,6 +658,126 @@ boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] } /** + * Returns a point describing the location of the caret relative + * to the receiver. + * + * @return a point, the location of the caret + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> + * </ul> + * + * @since 3.8 + */ +public Point getCaretLocation () { + checkWidget (); + /* + * Bug in Windows. For some reason, Windows is unable + * to return the pixel coordinates of the last character + * in the widget. The fix is to temporarily insert a + * space, query the coordinates and delete the space. + * The selection is always an i-beam in this case because + * this is the only time the start of the selection can + * be equal to the last character position in the widget. + * If EM_POSFROMCHAR fails for any other reason, return + * pixel coordinates (0,0). + */ + int position = getCaretPosition (); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ caretPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, position, 0); + if (caretPos == -1) { + caretPos = 0; + if (position >= OS.GetWindowTextLength (hwndText)) { + int cp = getCodePage (); + int [] start = new int [1], end = new int [1]; + OS.SendMessage (hwndText, OS.EM_GETSEL, start, end); + OS.SendMessage (hwndText, OS.EM_SETSEL, position, position); + /* + * Feature in Windows. When an edit control with ES_MULTILINE + * style that does not have the WS_VSCROLL style is full (i.e. + * there is no space at the end to draw any more characters), + * EM_REPLACESEL sends a WM_CHAR with a backspace character + * to remove any further text that is added. This is an + * implementation detail of the edit control that is unexpected + * and can cause endless recursion when EM_REPLACESEL is sent + * from a WM_CHAR handler. The fix is to ignore calling the + * handler from WM_CHAR. + */ + ignoreCharacter = ignoreModify = true; + OS.SendMessage (hwndText, OS.EM_REPLACESEL, 0, new TCHAR (cp, " ", true)); + caretPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, position, 0); + OS.SendMessage (hwndText, OS.EM_SETSEL, position, position + 1); + OS.SendMessage (hwndText, OS.EM_REPLACESEL, 0, new TCHAR (cp, "", true)); + ignoreCharacter = ignoreModify = false; + OS.SendMessage (hwndText, OS.EM_SETSEL, start [0], start [0]); + OS.SendMessage (hwndText, OS.EM_SETSEL, start [0], end [0]); + } + } + return new Point (OS.GET_X_LPARAM (caretPos), OS.GET_Y_LPARAM (caretPos)); +} + +/** + * Returns the character position of the caret. + * <p> + * Indexing is zero based. + * </p> + * + * @return the position of the caret + * + * @exception SWTException <ul> + * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> + * </ul> + * + * @since 3.8 + */ +public int getCaretPosition () { + checkWidget (); + int [] start = new int [1], end = new int [1]; + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + OS.SendMessage (hwndText, OS.EM_GETSEL, start, end); + /* + * In Windows, there is no API to get the position of the caret + * when the selection is not an i-beam. The best that can be done + * is to query the pixel position of the current caret and compare + * it to the pixel position of the start and end of the selection. + * + * NOTE: This does not work when the i-beam belongs to another + * control. In this case, guess that the i-beam is at the start + * of the selection. + */ + int caret = start [0]; + if (start [0] != end [0]) { + if (!OS.IsWinCE) { + int idThread = OS.GetWindowThreadProcessId (hwndText, null); + GUITHREADINFO lpgui = new GUITHREADINFO (); + lpgui.cbSize = GUITHREADINFO.sizeof; + if (OS.GetGUIThreadInfo (idThread, lpgui)) { + if (lpgui.hwndCaret == hwndText || lpgui.hwndCaret == 0) { + POINT ptCurrentPos = new POINT (); + if (OS.GetCaretPos (ptCurrentPos)) { + int /*long*/ endPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, end [0], 0); + if (endPos == -1) { + int /*long*/ startPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, start [0], 0); + int startX = OS.GET_X_LPARAM (startPos); + if (ptCurrentPos.x > startX) caret = end [0]; + } else { + int endX = OS.GET_X_LPARAM (endPos); + if (ptCurrentPos.x >= endX) caret = end [0]; + } + } + } + } + } + } + if (!OS.IsUnicode && OS.IsDBLocale) { + caret = mbcsToWcsPos (caret); + } + return caret; +} + +/** * Returns the item at the given, zero-relative index in the * receiver's list. Throws an exception if the index is out * of range. diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java index 746b0ab655..746b0ab655 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java index ee86187624..ee86187624 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java index 94bc063e8f..94bc063e8f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java index 3b21e1ab53..3b21e1ab53 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java index 5236fda51e..5236fda51e 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java index 0bf70ee45d..0bf70ee45d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java index ede8c5d02b..ede8c5d02b 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java index 2d676ec72f..6091a606db 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java @@ -35,6 +35,7 @@ import org.eclipse.swt.graphics.*; public class FontDialog extends Dialog { FontData fontData; RGB rgb; + boolean effectsVisible = true; /** * Constructs a new instance of this class given only its parent. @@ -83,6 +84,23 @@ public FontDialog (Shell parent, int style) { } /** + * Returns <code>true</code> if the dialog's effects selection controls + * are visible, and <code>false</code> otherwise. + * <p> + * If the platform's font dialog does not have any effects selection controls, + * then this method always returns false. + * </p> + * + * @return <code>true</code> if the dialog's effects selection controls + * are visible and <code>false</code> otherwise + * + * @since 3.8 + */ +public boolean getEffectsVisible () { + return effectsVisible; +} + +/** * Returns a FontData object describing the font that was * selected in the dialog, or null if none is available. * @@ -173,7 +191,11 @@ public FontData open () { CHOOSEFONT lpcf = new CHOOSEFONT (); lpcf.lStructSize = CHOOSEFONT.sizeof; lpcf.hwndOwner = hwndOwner; - lpcf.Flags = OS.CF_SCREENFONTS | OS.CF_EFFECTS; + lpcf.Flags = OS.CF_SCREENFONTS; + if (effectsVisible) { + lpcf.Flags |= OS.CF_EFFECTS; + } + int /*long*/ lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); if (fontData != null && fontData.data != null) { LOGFONT logFont = fontData.data; @@ -202,7 +224,7 @@ public FontData open () { oldModal = display.getModalDialog (); display.setModalDialog (this); } - + /* Open the dialog */ boolean success = OS.ChooseFont (lpcf); @@ -246,10 +268,12 @@ public FontData open () { float points = pixels * 72f /logPixelsY; fontData = FontData.win32_new (logFont, points); - int red = lpcf.rgbColors & 0xFF; - int green = (lpcf.rgbColors >> 8) & 0xFF; - int blue = (lpcf.rgbColors >> 16) & 0xFF; - rgb = new RGB (red, green, blue); + if (effectsVisible) { + int red = lpcf.rgbColors & 0xFF; + int green = (lpcf.rgbColors >> 8) & 0xFF; + int blue = (lpcf.rgbColors >> 16) & 0xFF; + rgb = new RGB (red, green, blue); + } } /* Free the OS memory */ @@ -275,6 +299,22 @@ public FontData open () { } /** + * Sets the effects selection controls in the dialog visible if the + * argument is <code>true</code>, and invisible otherwise. + * <p> + * By default the effects selection controls are displayed if the + * platform font dialog supports effects selection. + * </p> + * + * @param visible whether or not the dialog will show the effects selection controls + * + * @since 3.8 + */ +public void setEffectsVisible(boolean visible) { + effectsVisible = visible; +} + +/** * Sets a FontData object describing the font to be * selected by default in the dialog, or null to let * the platform choose one. diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java index 8d00eef630..8d00eef630 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java index a6d4a18113..a6d4a18113 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java index f73886d0bb..f73886d0bb 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java index e667cffbf7..e667cffbf7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java index 8694a26c2d..8694a26c2d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java index 46023b78d4..46023b78d4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java index e02cf81d49..e02cf81d49 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java index cf21cc258d..cf21cc258d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java index 73bfc18af0..73bfc18af0 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java index e20f00c890..e20f00c890 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java index 2f03875289..2f03875289 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java index b3d441e71f..b3d441e71f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index 7c0e98e73f..f76718d46a 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -6740,7 +6740,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { string = item.text; } else { String [] strings = item.strings; - if (strings != null) string = strings [plvfi.iSubItem]; + if (strings != null && plvfi.iSubItem < strings.length) string = strings [plvfi.iSubItem]; } if (string != null) { /* @@ -6785,7 +6785,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { image = item.image; } else { Image [] images = item.images; - if (images != null) image = images [plvfi.iSubItem]; + if (images != null && plvfi.iSubItem < images.length) image = images [plvfi.iSubItem]; } if (image != null) { plvfi.iImage = imageIndex (image, plvfi.iSubItem); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java index 8f77963cb0..130fc8d2de 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java @@ -805,8 +805,9 @@ public void setText (String string) { * mnemonic characters and replace doubled mnemonics * with spaces. */ + boolean replace = !OS.IsWinCE && OS.WIN32_VERSION <= OS.VERSION (4, 10); int /*long*/ hHeap = OS.GetProcessHeap (); - TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string, true), true); + TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string, replace), true); int byteCount = buffer.length () * TCHAR.sizeof; int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java index bbeaa14a17..bbeaa14a17 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java index 38f0451215..38f0451215 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java index 9cb33cf35d..9cb33cf35d 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java index c8caddbbe7..c8caddbbe7 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java index 17e34b0fe2..17e34b0fe2 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java index acc7f10085..7761bb7dc5 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java @@ -97,6 +97,7 @@ public class Tree extends Composite { int /*long*/ headerToolTipHandle, itemToolTipHandle; int /*long*/ lastTimerID = -1; int lastTimerCount; + static final boolean ENABLE_TVS_EX_FADEINOUTEXPANDOS = System.getProperty("org.eclipse.swt.internal.win32.enableFadeInOutExpandos") != null; static final int TIMER_MAX_COUNT = 8; static final int INSET = 3; static final int GRID_WIDTH = 1; @@ -277,7 +278,7 @@ void _setBackgroundPixel (int newPixel) { * set the background color of a tree, the plus/minus * animation draws badly. The fix is to clear the effect. */ - if (explorerTheme) { + if (explorerTheme && ENABLE_TVS_EX_FADEINOUTEXPANDOS) { int bits2 = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if (newPixel == -1 && findImageControl () == null) { bits2 |= OS.TVS_EX_FADEINOUTEXPANDOS; @@ -1841,7 +1842,8 @@ void createHandle () { if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0) && OS.IsAppThemed ()) { explorerTheme = true; OS.SetWindowTheme (handle, Display.EXPLORER, null); - int bits = OS.TVS_EX_DOUBLEBUFFER | OS.TVS_EX_FADEINOUTEXPANDOS | OS.TVS_EX_RICHTOOLTIP; + int bits = OS.TVS_EX_DOUBLEBUFFER | OS.TVS_EX_RICHTOOLTIP; + if (ENABLE_TVS_EX_FADEINOUTEXPANDOS) bits |= OS.TVS_EX_FADEINOUTEXPANDOS; /* * This code is intentionally commented. */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java index 42a43f8106..8e76cb9d5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java @@ -659,8 +659,9 @@ public void setText (String string) { * mnemonic characters and replace doubled mnemonics * with spaces. */ + boolean replace = !OS.IsWinCE && OS.WIN32_VERSION <= OS.VERSION (4, 10); int /*long*/ hHeap = OS.GetProcessHeap (); - TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string, true), true); + TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string, replace), true); int byteCount = buffer.length () * TCHAR.sizeof; int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java index a259212a6f..a259212a6f 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java index 65ceaa5320..65ceaa5320 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java diff --git a/bundles/org.eclipse.swt/build.xml b/bundles/org.eclipse.swt/build.xml index a9b2f0717e..98753db869 100644 --- a/bundles/org.eclipse.swt/build.xml +++ b/bundles/org.eclipse.swt/build.xml @@ -15,7 +15,7 @@ <target name="init"> <property name="plugin" value="org.eclipse.swt" /> - <property name="version.suffix" value="3.8.0" /> + <property name="version.suffix" value="3.8.0.201109271348" /> <property name="full.name" value="${plugin}_${version.suffix}" /> <property name="temp.folder" value="${basedir}/temp.folder" /> <property name="plugin.destination" value="${basedir}" /> diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 412a86bf86..ceefe341ff 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -34,11 +34,11 @@ <property name="repo.src" value="../../../eclipse.platform.swt"/> <property name="repo.bin" value="../../../eclipse.platform.swt.binaries"/> - <property name="repo.releng" value="../../../eclipse.platform.releng"/> + <property name="repo.common" value="../../../eclipse.platform.common"/> <property name="src_common" value="'bundles/org.eclipse.swt/Eclipse SWT/common/library' 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/common/library'"/> <property name="src_win32" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/> - <property name="src_gtk" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/cde/library'"/> + <property name="src_gtk" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/cde/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library' "/> <property name="src_cocoa" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library'"/> <property name="src_carbon" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library'"/> <property name="src_motif" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/motif/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/motif/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/cde/library'"/> @@ -50,6 +50,7 @@ <property name="file_make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/> <property name="file_version" value="bundles/org.eclipse.swt/Eclipse SWT/common/version.txt"/> <property name="file_build_notes" value="bundles/org.eclipse.swt/buildnotes_swt.html"/> + <property name="file_swt_map" value="maps/org.eclipse.releng/maps/swt.map"/> <target name="check_libraries" depends="get_version"> <antcall target="check_fragment_libraries"> @@ -81,7 +82,7 @@ <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="10"/> + <param name="library_count" value="11"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/> </antcall> <antcall target="check_fragment_libraries"> @@ -93,11 +94,11 @@ <param name="fragment" value="org.eclipse.swt.gtk.linux.s390x"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="12"/> + <param name="library_count" value="11"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="12"/> + <param name="library_count" value="11"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/> </antcall> <antcall target="check_fragment_libraries"> @@ -158,7 +159,7 @@ <target name="check_fragment_libraries" depends="get_version"> <echo>Checking ${fragment}</echo> <property name="checkdir" value="~/build/check_libraries"/> - <property name="library_count" value="124"/> + <property name="library_count" value="123"/> <property name="fragment" value=""/> <fileset id="match" dir="${repo.bin}/bundles/${fragment}"> <filename regex="[0-9][0-9][0-9][0-9]."/> @@ -588,28 +589,9 @@ <replace file="${repo.src}/${file_build_notes}" token="${match_line}" value="${match_line}${body}"/> </target> - <target name="cvs_tag"> - <condition property="CVS_TAG" value="" else="-r${TAG}"> - <equals arg1="${TAG}" arg2="master"/> - </condition> - </target> - <!-- Set swt_tag to the current tag in the swt map file --> - <target name="get_tag" unless="swt_tag" depends="cvs_tag"> - <property name="tmpdir" value="${tmphome}"/> - <!--property name="map" value="${repo.releng}/bundles/org.eclipse.releng/maps/swt.map"/--> - <property name="map" value="org.eclipse.releng/maps/swt.map"/> - <property name="cvsRsh" value="plink"/> - <property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/> - <cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}"> - <commandline> - <argument value="checkout"/> - <argument line="${CVS_TAG}"/> - <argument value="${map}"/> - </commandline> - </cvs> - - <loadfile property="swt_tag" srcfile="${tmpdir}/${map}"> + <target name="get_tag" unless="swt_tag"> + <loadfile property="swt_tag" srcfile="${repo.common}/${file_swt_map}"> <filterchain> <tokenfilter delimoutput=""> <containsstring contains="plugin@org.eclipse.swt=GIT,tag="/> @@ -731,30 +713,19 @@ <antcall target="update_swt_map"/> </target> - <target name="update_swt_map" depends="cvs_tag"> - <property name="tmpdir" value="${tmphome}"/> - <property name="cvsRsh" value="plink"/> - <property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/> - <!-- download the map file --> - <property name="map" value="org.eclipse.releng/maps/swt.map"/> - <cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}"> - <commandline> - <argument value="checkout"/> - <argument line="${CVS_TAG}"/> - <argument value="${map}"/> - </commandline> - </cvs> - + <target name="update_swt_map" depends="get_new_tag"> <!-- update and commit map file --> - <replaceregexp file="${tmpdir}/${map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/> - <cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}"> - <commandline> - <argument value="commit"/> - <argument value="-m"/> - <argument value="'new version v${swt_new_tag}'"/> - <argument value="${map}"/> - </commandline> - </cvs> + <replaceregexp file="${repo.common}/${file_swt_map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/> + + <exec dir="${repo.common}" executable="git" failonerror="true"> + <arg line="add '${file_swt_map}'"/> + </exec> + <exec dir="${repo.common}" executable="git" failonerror="true"> + <arg line="status"/> + </exec> + <exec dir="${repo.common}" executable="git" failonerror="true"> + <arg line="commit -m 'SWT contribution v${swt_new_tag}'"/> + </exec> </target> <target name="check_sha1_file" unless="natives_changed"> @@ -1060,20 +1031,30 @@ <param name="repo" value="eclipse.platform.swt"/> <param name="repo.exists" value="repo.src.exists"/> </antcall> - <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true" timeout="900000"> <arg line="fetch"/> </exec> - <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true" timeout="900000"> <arg line="reset --hard origin/${TAG}"/> </exec> <antcall target="init_repo"> <param name="repo" value="eclipse.platform.swt.binaries"/> <param name="repo.exists" value="repo.bin.exists"/> </antcall> - <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000"> <arg line="fetch"/> </exec> - <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000"> + <arg line="reset --hard origin/${TAG}"/> + </exec> + <antcall target="init_repo"> + <param name="repo" value="eclipse.platform.common"/> + <param name="repo.exists" value="repo.common.exists"/> + </antcall> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> <arg line="reset --hard origin/${TAG}"/> </exec> </target> @@ -1097,6 +1078,15 @@ <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true"> <arg line="push origin ${TAG}"/> </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="rebase origin/${TAG}"/> + </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="push origin ${TAG}"/> + </exec> <exec dir="${repo.src}" executable="git" failonerror="true"> <arg line="push --tags"/> </exec> diff --git a/bundles/org.eclipse.swt/buildnotes_swt.html b/bundles/org.eclipse.swt/buildnotes_swt.html index a4b0ace250..3803bb0d1f 100755..100644 --- a/bundles/org.eclipse.swt/buildnotes_swt.html +++ b/bundles/org.eclipse.swt/buildnotes_swt.html @@ -11,6 +11,36 @@ Eclipse Platform Build Notes<br> SWT</h1> +<h2>SWT Build 3807 - Tuesday October 18, 2011</h2> + +<blockquote> +<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=;chfieldfrom=2011-10-07+17%3A25%3A00+-0400;chfieldto=2011-10-17+20%3A15%3A59+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a> +</blockquote> + +<h2>SWT Build 3806a - Saturday October 08, 2011</h2> + +<blockquote> +<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=;chfieldfrom=2011-10-03+17%3A22%3A24+-0400;chfieldto=2011-10-07+21%3A24%3A58+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a> +</blockquote> + +<h2>SWT Build 3806 - Tuesday October 04, 2011</h2> + +<blockquote> +<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=;chfieldfrom=2011-09-26+16%3A44%3A33+-0400;chfieldto=2011-10-03+21%3A22%3A22+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a> +</blockquote> + +<h2>SWT Build 3805 - Tuesday September 27, 2011</h2> + +<blockquote> +<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=;chfieldfrom=2011-09-19+17%3A14%3A56+-0400;chfieldto=2011-09-26+20%3A44%3A30+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a> +</blockquote> + +<h2>SWT Build 3804b - Tuesday September 20, 2011</h2> + +<blockquote> +<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=;chfieldfrom=2011-09-14+17%3A48%3A20+-0400;chfieldto=2011-09-19+21%3A14%3A53+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a> +</blockquote> + <h2>SWT Build 3804a - Thursday September 15, 2011</h2> <blockquote> diff --git a/examples/org.eclipse.swt.examples.controls/.classpath b/examples/org.eclipse.swt.examples.controls/.classpath index 065ac06e19..065ac06e19 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/.classpath +++ b/examples/org.eclipse.swt.examples.controls/.classpath diff --git a/examples/org.eclipse.swt.examples.controls/build.properties b/examples/org.eclipse.swt.examples.controls/build.properties index 9f2a951713..9f2a951713 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/build.properties +++ b/examples/org.eclipse.swt.examples.controls/build.properties diff --git a/examples/org.eclipse.swt.examples.controls/doc-html/swt_controls_ex.html b/examples/org.eclipse.swt.examples.controls/doc-html/swt_controls_ex.html index 7946309121..7946309121 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/doc-html/swt_controls_ex.html +++ b/examples/org.eclipse.swt.examples.controls/doc-html/swt_controls_ex.html diff --git a/examples/org.eclipse.swt.examples.controls/icons/controls_example.gif b/examples/org.eclipse.swt.examples.controls/icons/controls_example.gif Binary files differindex cbdee97066..cbdee97066 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/icons/controls_example.gif +++ b/examples/org.eclipse.swt.examples.controls/icons/controls_example.gif diff --git a/examples/org.eclipse.swt.examples.controls/plugin.properties b/examples/org.eclipse.swt.examples.controls/plugin.properties index 107c0cd0d9..107c0cd0d9 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/plugin.properties +++ b/examples/org.eclipse.swt.examples.controls/plugin.properties diff --git a/examples/org.eclipse.swt.examples.controls/plugin.xml b/examples/org.eclipse.swt.examples.controls/plugin.xml index bf8e0922de..bf8e0922de 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/plugin.xml +++ b/examples/org.eclipse.swt.examples.controls/plugin.xml diff --git a/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java b/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java index 5eb6d55c9d..5eb6d55c9d 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java +++ b/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java diff --git a/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlView.java b/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlView.java index da95327885..da95327885 100755..100644 --- a/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlView.java +++ b/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlView.java diff --git a/examples/org.eclipse.swt.examples.launcher/.classpath b/examples/org.eclipse.swt.examples.launcher/.classpath index 065ac06e19..065ac06e19 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/.classpath +++ b/examples/org.eclipse.swt.examples.launcher/.classpath diff --git a/examples/org.eclipse.swt.examples.launcher/build.properties b/examples/org.eclipse.swt.examples.launcher/build.properties index 17441fe43f..17441fe43f 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/build.properties +++ b/examples/org.eclipse.swt.examples.launcher/build.properties diff --git a/examples/org.eclipse.swt.examples.launcher/doc-html/swt_launcher_ex.html b/examples/org.eclipse.swt.examples.launcher/doc-html/swt_launcher_ex.html index b5f4f8cef9..b5f4f8cef9 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/doc-html/swt_launcher_ex.html +++ b/examples/org.eclipse.swt.examples.launcher/doc-html/swt_launcher_ex.html diff --git a/examples/org.eclipse.swt.examples.launcher/doc/org.eclipse.swt.examples.launcher.launchItems.html b/examples/org.eclipse.swt.examples.launcher/doc/org.eclipse.swt.examples.launcher.launchItems.html index 3edf91876a..3edf91876a 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/doc/org.eclipse.swt.examples.launcher.launchItems.html +++ b/examples/org.eclipse.swt.examples.launcher/doc/org.eclipse.swt.examples.launcher.launchItems.html diff --git a/examples/org.eclipse.swt.examples.launcher/icons/closedFolder.gif b/examples/org.eclipse.swt.examples.launcher/icons/closedFolder.gif Binary files differindex beb6ed134c..beb6ed134c 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/icons/closedFolder.gif +++ b/examples/org.eclipse.swt.examples.launcher/icons/closedFolder.gif diff --git a/examples/org.eclipse.swt.examples.launcher/icons/generic_example.gif b/examples/org.eclipse.swt.examples.launcher/icons/generic_example.gif Binary files differindex f9fb6b0cab..f9fb6b0cab 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/icons/generic_example.gif +++ b/examples/org.eclipse.swt.examples.launcher/icons/generic_example.gif diff --git a/examples/org.eclipse.swt.examples.launcher/icons/launcher_example.gif b/examples/org.eclipse.swt.examples.launcher/icons/launcher_example.gif Binary files differindex 3ab4d32c05..3ab4d32c05 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/icons/launcher_example.gif +++ b/examples/org.eclipse.swt.examples.launcher/icons/launcher_example.gif diff --git a/examples/org.eclipse.swt.examples.launcher/icons/openFolder.gif b/examples/org.eclipse.swt.examples.launcher/icons/openFolder.gif Binary files differindex a9c777343c..a9c777343c 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/icons/openFolder.gif +++ b/examples/org.eclipse.swt.examples.launcher/icons/openFolder.gif diff --git a/examples/org.eclipse.swt.examples.launcher/plugin.properties b/examples/org.eclipse.swt.examples.launcher/plugin.properties index 5a03aa119f..5a03aa119f 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/plugin.properties +++ b/examples/org.eclipse.swt.examples.launcher/plugin.properties diff --git a/examples/org.eclipse.swt.examples.launcher/plugin.xml b/examples/org.eclipse.swt.examples.launcher/plugin.xml index 263c8d0e2c..263c8d0e2c 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/plugin.xml +++ b/examples/org.eclipse.swt.examples.launcher/plugin.xml diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java index fc105f286b..fc105f286b 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemTreeNode.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemTreeNode.java index 06030a535c..06030a535c 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemTreeNode.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemTreeNode.java diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java index 9b641be688..9b641be688 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherView.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherView.java index b2c934fac5..b2c934fac5 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherView.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherView.java diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java index 6637af1e07..6637af1e07 100755..100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java diff --git a/examples/org.eclipse.swt.examples.ole.win32/.classpath b/examples/org.eclipse.swt.examples.ole.win32/.classpath index 065ac06e19..065ac06e19 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/.classpath +++ b/examples/org.eclipse.swt.examples.ole.win32/.classpath diff --git a/examples/org.eclipse.swt.examples.ole.win32/build.properties b/examples/org.eclipse.swt.examples.ole.win32/build.properties index e744e8f1f5..e744e8f1f5 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/build.properties +++ b/examples/org.eclipse.swt.examples.ole.win32/build.properties diff --git a/examples/org.eclipse.swt.examples.ole.win32/doc-html/swt_ole_ex.html b/examples/org.eclipse.swt.examples.ole.win32/doc-html/swt_ole_ex.html index d27da8ef51..d27da8ef51 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/doc-html/swt_ole_ex.html +++ b/examples/org.eclipse.swt.examples.ole.win32/doc-html/swt_ole_ex.html diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/backward_nav.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/backward_nav.gif Binary files differindex 5fcf41b783..5fcf41b783 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/backward_nav.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/backward_nav.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/forward_nav.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/forward_nav.gif Binary files differindex 3b9b6af9b1..3b9b6af9b1 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/forward_nav.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/forward_nav.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/home_nav.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/home_nav.gif Binary files differindex 77a2306ed2..77a2306ed2 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/home_nav.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/home_nav.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/refresh_nav.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/refresh_nav.gif Binary files differindex e270e18bde..e270e18bde 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/refresh_nav.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/refresh_nav.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/search_nav.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/search_nav.gif Binary files differindex 73ac91bddb..73ac91bddb 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/search_nav.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/search_nav.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/stop_nav.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/stop_nav.gif Binary files differindex 653d347b57..653d347b57 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/stop_nav.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/stop_nav.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/icons/webbrowser_example.gif b/examples/org.eclipse.swt.examples.ole.win32/icons/webbrowser_example.gif Binary files differindex 895e22110d..895e22110d 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/icons/webbrowser_example.gif +++ b/examples/org.eclipse.swt.examples.ole.win32/icons/webbrowser_example.gif diff --git a/examples/org.eclipse.swt.examples.ole.win32/plugin.properties b/examples/org.eclipse.swt.examples.ole.win32/plugin.properties index d4c362fac8..d4c362fac8 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/plugin.properties +++ b/examples/org.eclipse.swt.examples.ole.win32/plugin.properties diff --git a/examples/org.eclipse.swt.examples.ole.win32/plugin.xml b/examples/org.eclipse.swt.examples.ole.win32/plugin.xml index eaee603691..eaee603691 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/plugin.xml +++ b/examples/org.eclipse.swt.examples.ole.win32/plugin.xml diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java index e9ba5d4c2d..e9ba5d4c2d 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java +++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java index a55c2e3674..a55c2e3674 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java +++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java index 4498813c2b..4498813c2b 100755..100644 --- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java +++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java diff --git a/examples/org.eclipse.swt.examples.paint/.classpath b/examples/org.eclipse.swt.examples.paint/.classpath index 065ac06e19..065ac06e19 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/.classpath +++ b/examples/org.eclipse.swt.examples.paint/.classpath diff --git a/examples/org.eclipse.swt.examples.paint/build.properties b/examples/org.eclipse.swt.examples.paint/build.properties index afd0cca35e..afd0cca35e 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/build.properties +++ b/examples/org.eclipse.swt.examples.paint/build.properties diff --git a/examples/org.eclipse.swt.examples.paint/doc-html/swt_paint_ex.html b/examples/org.eclipse.swt.examples.paint/doc-html/swt_paint_ex.html index e48e7ce5c8..e48e7ce5c8 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/doc-html/swt_paint_ex.html +++ b/examples/org.eclipse.swt.examples.paint/doc-html/swt_paint_ex.html diff --git a/examples/org.eclipse.swt.examples.paint/icons/paint_example.gif b/examples/org.eclipse.swt.examples.paint/icons/paint_example.gif Binary files differindex d945dde53b..d945dde53b 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/icons/paint_example.gif +++ b/examples/org.eclipse.swt.examples.paint/icons/paint_example.gif diff --git a/examples/org.eclipse.swt.examples.paint/plugin.properties b/examples/org.eclipse.swt.examples.paint/plugin.properties index ed78759efc..ed78759efc 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/plugin.properties +++ b/examples/org.eclipse.swt.examples.paint/plugin.properties diff --git a/examples/org.eclipse.swt.examples.paint/plugin.xml b/examples/org.eclipse.swt.examples.paint/plugin.xml index b0de0750d3..b0de0750d3 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/plugin.xml +++ b/examples/org.eclipse.swt.examples.paint/plugin.xml diff --git a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java index 19437fca0e..19437fca0e 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java +++ b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java diff --git a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java index 1250f49f36..1250f49f36 100755..100644 --- a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java +++ b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java diff --git a/examples/org.eclipse.swt.examples/.classpath b/examples/org.eclipse.swt.examples/.classpath index 065ac06e19..065ac06e19 100755..100644 --- a/examples/org.eclipse.swt.examples/.classpath +++ b/examples/org.eclipse.swt.examples/.classpath diff --git a/examples/org.eclipse.swt.examples/build.properties b/examples/org.eclipse.swt.examples/build.properties index 6a50879f1b..6a50879f1b 100755..100644 --- a/examples/org.eclipse.swt.examples/build.properties +++ b/examples/org.eclipse.swt.examples/build.properties diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_addressbook_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_addressbook_ex.html index 6b04c2db09..6b04c2db09 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_addressbook_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_addressbook_ex.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_fileviewer_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_fileviewer_ex.html index ce21ccd1a3..ce21ccd1a3 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_fileviewer_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_fileviewer_ex.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_helloworld_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_helloworld_ex.html index 67ec7a44a3..67ec7a44a3 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_helloworld_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_helloworld_ex.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_hoverhelp_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_hoverhelp_ex.html index 7eb89b1b2c..7eb89b1b2c 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_hoverhelp_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_hoverhelp_ex.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_imageanalyzer_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_imageanalyzer_ex.html index d984cda273..d984cda273 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_imageanalyzer_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_imageanalyzer_ex.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_javaviewer_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_javaviewer_ex.html index 4d1e773546..4d1e773546 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_javaviewer_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_javaviewer_ex.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_manual_setup.html b/examples/org.eclipse.swt.examples/doc-html/swt_manual_setup.html index ad3e314145..ad3e314145 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_manual_setup.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_manual_setup.html diff --git a/examples/org.eclipse.swt.examples/doc-html/swt_texteditor_ex.html b/examples/org.eclipse.swt.examples/doc-html/swt_texteditor_ex.html index 23ce9b13a8..23ce9b13a8 100755..100644 --- a/examples/org.eclipse.swt.examples/doc-html/swt_texteditor_ex.html +++ b/examples/org.eclipse.swt.examples/doc-html/swt_texteditor_ex.html diff --git a/examples/org.eclipse.swt.examples/plugin.properties b/examples/org.eclipse.swt.examples/plugin.properties index dab20eaf76..dab20eaf76 100755..100644 --- a/examples/org.eclipse.swt.examples/plugin.properties +++ b/examples/org.eclipse.swt.examples/plugin.properties diff --git a/examples/org.eclipse.swt.examples/plugin.xml b/examples/org.eclipse.swt.examples/plugin.xml index 4b2f58874d..4b2f58874d 100755..100644 --- a/examples/org.eclipse.swt.examples/plugin.xml +++ b/examples/org.eclipse.swt.examples/plugin.xml diff --git a/examples/org.eclipse.swt.examples/src/examples_accessibility.properties b/examples/org.eclipse.swt.examples/src/examples_accessibility.properties index d8fccb7ac7..d8fccb7ac7 100755..100644 --- a/examples/org.eclipse.swt.examples/src/examples_accessibility.properties +++ b/examples/org.eclipse.swt.examples/src/examples_accessibility.properties diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java index 0cdb8864f4..0cdb8864f4 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java index 3a51431b43..3a51431b43 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/FindListener.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/FindListener.java index 1732505df3..1732505df3 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/FindListener.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/FindListener.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/SearchDialog.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/SearchDialog.java index 24b66e2e85..24b66e2e85 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/SearchDialog.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/SearchDialog.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java index 075ee21e96..075ee21e96 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/AlignableTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java index 99d0fa44bc..99d0fa44bc 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java index 6ca3776dd3..6ca3776dd3 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java index 1c1baf7948..1c1baf7948 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java index bb4d454ca3..97fb5f3228 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java @@ -35,6 +35,7 @@ class DialogTab extends Tab { Button primaryModalButton, applicationModalButton, systemModalButton; Button sheetButton; Button saveButton, openButton, multiButton; + private Button effectsVisibleButton; static String [] FilterExtensions = {"*.txt", "*.bat", "*.doc", "*"}; static String [] FilterNames = {ControlExample.getResourceString("FilterName_0"), @@ -164,6 +165,7 @@ class DialogTab extends Tab { if (name.equals (ControlExample.getResourceString("FontDialog"))) { FontDialog dialog = new FontDialog (shell, style); dialog.setText (ControlExample.getResourceString("Title")); + dialog.setEffectsVisible(effectsVisibleButton.getSelection()); FontData result = dialog.open (); textWidget.append (ControlExample.getResourceString("FontDialog") + Text.DELIMITER); textWidget.append (ControlExample.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER); @@ -174,6 +176,7 @@ class DialogTab extends Tab { textWidget.append ("\t" + fonts [i] + Text.DELIMITER); } } + textWidget.append ("getEffectsVisible() = " + dialog.getEffectsVisible() + Text.DELIMITER); textWidget.append ("getRGB() = " + dialog.getRGB() + Text.DELIMITER + Text.DELIMITER); return; } @@ -371,6 +374,16 @@ class DialogTab extends Tab { multiButton = new Button(fileDialogStyleGroup, SWT.CHECK); multiButton.setText("SWT.MULTI"); + /* Create a group for the font dialog controls */ + Group fontDialogStyleGroup = new Group (controlGroup, SWT.NONE); + fontDialogStyleGroup.setLayout (new GridLayout ()); + fontDialogStyleGroup.setLayoutData (new GridData (GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL)); + fontDialogStyleGroup.setText (ControlExample.getResourceString("Font_Dialog")); + + /* Create the font dialog buttons */ + effectsVisibleButton = new Button(fontDialogStyleGroup, SWT.CHECK); + effectsVisibleButton.setText("Effects Visible"); + /* Create the orientation group */ if (RTL_SUPPORT_ENABLE) { createOrientationGroup(); @@ -419,6 +432,8 @@ class DialogTab extends Tab { openButton.setSelection (true); multiButton.setEnabled (false); noIconButton.setSelection (true); + effectsVisibleButton.setEnabled(false); + effectsVisibleButton.setSelection(true); } /** @@ -467,6 +482,7 @@ class DialogTab extends Tab { String name = dialogCombo.getText (); boolean isMessageBox = name.equals (ControlExample.getResourceString("MessageBox")); boolean isFileDialog = name.equals (ControlExample.getResourceString("FileDialog")); + boolean isFontDialog = name.equals (ControlExample.getResourceString("FontDialog")); okButton.setEnabled (isMessageBox); cancelButton.setEnabled (isMessageBox); yesButton.setEnabled (isMessageBox); @@ -483,6 +499,7 @@ class DialogTab extends Tab { saveButton.setEnabled (isFileDialog); openButton.setEnabled (isFileDialog); multiButton.setEnabled (isFileDialog); + effectsVisibleButton.setEnabled (isFontDialog); /* Unselect the buttons */ if (!isMessageBox) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java index 6a68ecb759..6a68ecb759 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java index 3ceaca98eb..3ceaca98eb 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ListTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java index e07645151d..e07645151d 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java index 2b292a6c10..2b292a6c10 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashTab.java index ace06008f2..ace06008f2 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java index 8a8708c3e4..8a8708c3e4 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java index 0de164eddb..0de164eddb 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java index 1bb8390ddf..1bb8390ddf 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SliderTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java index a352c16888..a352c16888 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java index 68a2962860..68a2962860 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java index 8617f79b74..8617f79b74 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java index 3cd590f673..3cd590f673 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java index 6c12861ddc..6c12861ddc 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TreeTab.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java index 0c3d8c30b0..0c3d8c30b0 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java index 11b601cb51..11b601cb51 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Copy.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Copy.gif Binary files differindex 4274b070ac..4274b070ac 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Copy.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Copy.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Cut.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Cut.gif Binary files differindex eb948b94b0..eb948b94b0 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Cut.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Cut.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Delete.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Delete.gif Binary files differindex 6f647666d3..6f647666d3 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Delete.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Delete.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Parent.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Parent.gif Binary files differindex 9b278e6fa8..9b278e6fa8 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Parent.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Parent.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Paste.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Paste.gif Binary files differindex 75e0ab2352..75e0ab2352 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Paste.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Paste.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Print.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Print.gif Binary files differindex 4dfa8cd3fa..4dfa8cd3fa 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Print.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Print.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Refresh.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Refresh.gif Binary files differindex a063c230ac..a063c230ac 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Refresh.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Refresh.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Rename.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Rename.gif Binary files differindex 25b1325e52..25b1325e52 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Rename.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Rename.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Search.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Search.gif Binary files differindex 6dc3ebefc9..6dc3ebefc9 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Search.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/cmd_Search.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/generic_example.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/generic_example.gif Binary files differindex f9fb6b0cab..f9fb6b0cab 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/generic_example.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/generic_example.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedDrive.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedDrive.gif Binary files differindex 04e530e37c..04e530e37c 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedDrive.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedDrive.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedFolder.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedFolder.gif Binary files differindex beb6ed134c..beb6ed134c 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedFolder.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_ClosedFolder.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_File.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_File.gif Binary files differindex 6b86d07978..6b86d07978 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_File.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_File.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenDrive.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenDrive.gif Binary files differindex 7b2b6334ca..7b2b6334ca 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenDrive.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenDrive.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenFolder.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenFolder.gif Binary files differindex a9c777343c..a9c777343c 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenFolder.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/icon_OpenFolder.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld1.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld1.java index 1c98dc3941..1c98dc3941 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld1.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld1.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld2.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld2.java index 320c8c8d76..320c8c8d76 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld2.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld2.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld3.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld3.java index 7b61ad157c..7b61ad157c 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld3.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld3.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld4.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld4.java index 204f458fa0..204f458fa0 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld4.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld4.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld5.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld5.java index 63611549df..63611549df 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld5.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/helloworld/HelloWorld5.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java index ac17858a81..ac17858a81 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/information.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/information.gif Binary files differindex 26c7477336..26c7477336 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/information.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/information.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/warning.gif b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/warning.gif Binary files differindex cf4fdf93c7..cf4fdf93c7 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/warning.gif +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/warning.gif diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java index 88935d08c7..88935d08c7 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java index a48e850977..a48e850977 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java index c31f57b8e3..c31f57b8e3 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java index ce4b897f24..ce4b897f24 100755..100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java diff --git a/examples/org.eclipse.swt.opengl.examples/plugin.properties b/examples/org.eclipse.swt.opengl.examples/plugin.properties index 53ce66cc6a..53ce66cc6a 100755..100644 --- a/examples/org.eclipse.swt.opengl.examples/plugin.properties +++ b/examples/org.eclipse.swt.opengl.examples/plugin.properties diff --git a/examples/org.eclipse.swt.opengl.examples/plugin.xml b/examples/org.eclipse.swt.opengl.examples/plugin.xml index 118725e39d..118725e39d 100755..100644 --- a/examples/org.eclipse.swt.opengl.examples/plugin.xml +++ b/examples/org.eclipse.swt.opengl.examples/plugin.xml diff --git a/examples/org.eclipse.swt.opengl.examples/src/examples_opengl.properties b/examples/org.eclipse.swt.opengl.examples/src/examples_opengl.properties index 492713296b..492713296b 100755..100644 --- a/examples/org.eclipse.swt.opengl.examples/src/examples_opengl.properties +++ b/examples/org.eclipse.swt.opengl.examples/src/examples_opengl.properties diff --git a/examples/org.eclipse.swt.opengl.examples/src/org/eclipse/swt/opengl/examples/ImageDataUtil.java b/examples/org.eclipse.swt.opengl.examples/src/org/eclipse/swt/opengl/examples/ImageDataUtil.java index 9166ae9608..9166ae9608 100755..100644 --- a/examples/org.eclipse.swt.opengl.examples/src/org/eclipse/swt/opengl/examples/ImageDataUtil.java +++ b/examples/org.eclipse.swt.opengl.examples/src/org/eclipse/swt/opengl/examples/ImageDataUtil.java diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet253.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet253.java index 75f1ec9fcf..302ee1c1f3 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet253.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet253.java @@ -11,7 +11,7 @@ package org.eclipse.swt.snippets; /* - * Table example snippet: compute the visible rows in a table + * Table example snippet: compute the number of visible rows in a table * * For a list of all SWT example snippets see * http://www.eclipse.org/swt/snippets/ diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet254.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet254.java index a6d3c25405..f73313d709 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet254.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet254.java @@ -11,7 +11,7 @@ package org.eclipse.swt.snippets; /* - * Tree example snippet: compute the visible rows in a tree + * Tree example snippet: compute the number of visible rows in a tree * * For a list of all SWT example snippets see * http://www.eclipse.org/swt/snippets/ diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java new file mode 100644 index 0000000000..d6abf68f31 --- /dev/null +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2011 IBM Corporation and others. + * All rights reserved. This Example Content is intended to demonstrate + * usage of Eclipse technology. It is provided to you under the terms and + * conditions of the Eclipse Distribution License v1.0 which is available + * at http://www.eclipse.org/org/documents/edl-v10.php + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.swt.snippets; + +/* + * Tree example snippet: determine which TreeItems are visible in a Tree's viewport + * + * For a list of all SWT example snippets see + * http://www.eclipse.org/swt/snippets/ + */ +import org.eclipse.swt.*; +import org.eclipse.swt.widgets.*; +import org.eclipse.swt.graphics.*; +import org.eclipse.swt.layout.*; + +public class Snippet358 { + +public static void main(String [] args) { + Display display = new Display(); + Shell shell = new Shell(display); + shell.setLayout(new GridLayout ()); + final Tree tree = new Tree(shell, SWT.NONE); + tree.setLayoutData(new GridData(200, 200)); + for (int i = 0; i < 9; i++) { + TreeItem item = new TreeItem(tree, SWT.NONE); + item.setText("root-level item " + i); + for (int j = 0; j < 9; j++) { + new TreeItem(item, SWT.NONE).setText("item " + i + "-" + j); + } + } + + Button button = new Button(shell, SWT.PUSH); + button.setText("Print item visibilities"); + button.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + Rectangle treeBounds = new Rectangle(0, 0, 0, 0); + Point treeSize = tree.getSize(); + treeBounds.width = treeSize.x; + treeBounds.height = treeSize.y; + TreeItem[] rootItems = tree.getItems(); + for (int i = 0; i < rootItems.length; i++) { + TreeItem rootItem = rootItems[i]; + System.out.println(rootItem.getText() + " is at least partially visible? " + treeBounds.intersects(rootItem.getBounds())); + TreeItem[] childItems = rootItem.getItems(); + for (int j = 0; j < childItems.length; j++) { + TreeItem childItem = childItems[j]; + System.out.println(childItem.getText() + " is at least partially visible? " + treeBounds.intersects(childItem.getBounds())); + } + } + } + }); + + shell.pack(); + shell.open(); + while (!shell.isDisposed()) { + if (!display.readAndDispatch()) display.sleep(); + } + display.dispose (); +} + +} diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java index 23d1dc2cc5..cefc739790 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java @@ -426,9 +426,9 @@ public void test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener( public void test_setBackgroundLorg_eclipse_swt_graphics_Color() { Color color = new Color(control.getDisplay(), 255, 0, 0); control.setBackground(color); - assertEquals(color, control.getBackground()); + assertEquals("getBackground not equal color after setBackground(color)", color, control.getBackground()); control.setBackground(null); - assertTrue(!control.getBackground().equals(color)); + assertTrue("getBackground unchanged after setBackground(null)", !control.getBackground().equals(color)); color.dispose(); } |
