Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2004-05-17 18:28:28 +0000
committerSilenio Quarti2004-05-17 18:28:28 +0000
commit23a612fbbfb7f73f6d3140e05bfb655fcefc2862 (patch)
tree5428d01e3f660218900d8f69d275dce1f9f79b67
parent06c8d0140cdc3176c199291454a98528f9d127b7 (diff)
downloadeclipse.platform.swt-23a612fbbfb7f73f6d3140e05bfb655fcefc2862.tar.gz
eclipse.platform.swt-23a612fbbfb7f73f6d3140e05bfb655fcefc2862.tar.xz
eclipse.platform.swt-23a612fbbfb7f73f6d3140e05bfb655fcefc2862.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java2
3 files changed, 7 insertions, 4 deletions
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 fc4769e97f..9e8550b924 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
@@ -377,11 +377,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(XCreateRegion)
#ifndef NO_XCreateWindow
JNIEXPORT jint JNICALL OS_NATIVE(XCreateWindow)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jlong arg10, jint arg11)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jlong arg10, jobject arg11)
{
+ XSetWindowAttributes _arg11, *lparg11=NULL;
jint rc;
OS_NATIVE_ENTER(env, that, XCreateWindow_FUNC);
- rc = (jint)XCreateWindow((Display *)arg0, (Window)arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, (Visual *)arg9, arg10, (XSetWindowAttributes *)arg11);
+ if (arg11) lparg11 = getXSetWindowAttributesFields(env, arg11, &_arg11);
+ rc = (jint)XCreateWindow((Display *)arg0, (Window)arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, (Visual *)arg9, arg10, (XSetWindowAttributes *)lparg11);
+ if (arg11) setXSetWindowAttributesFields(env, arg11, lparg11);
OS_NATIVE_EXIT(env, that, XCreateWindow_FUNC);
return rc;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
index d864a19292..7452a83681 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
@@ -632,7 +632,7 @@ public static final synchronized native int XCreateImage(int display, int visual
public static final synchronized native int XCreatePixmap(int display, int drawable, int width, int height, int depth);
public static final synchronized native int XCreatePixmapCursor(int display, int source, int mask, XColor foreground_color, XColor background_color, int x, int y);
public static final synchronized native int XCreateRegion();
-public static final synchronized native int XCreateWindow(int display, int parent, int x, int y, int width, int height, int border_width, int depth, int clazz, int visual, long value_mask, int attributes);
+public static final synchronized native int XCreateWindow(int display, int parent, int x, int y, int width, int height, int border_width, int depth, int clazz, int visual, long value_mask, XSetWindowAttributes attributes);
public static final synchronized native int XDefaultColormap(int display, int screen_number);
public static final synchronized native int XDefaultColormapOfScreen(int screen);
public static final synchronized native int XDefaultDepthOfScreen(int screen);
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 7b636d7474..68f7971c64 100755
--- 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
@@ -328,7 +328,7 @@ protected void init() {
OS.XpGetPageDimensions(xDisplay, printContext, width, height, rect);
xDrawable = OS.XCreateWindow(xDisplay, OS.XRootWindowOfScreen(xScreen),
0, 0, rect.width, rect.height, 0,
- OS.CopyFromParent, OS.CopyFromParent, OS.CopyFromParent, 0, 0);
+ OS.CopyFromParent, OS.CopyFromParent, OS.CopyFromParent, 0, null);
if (xDrawable == 0) SWT.error(SWT.ERROR_NO_HANDLES);
/* Initialize the default font */

Back to the top