Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2007-01-31 11:03:44 -0500
committerSilenio Quarti2007-01-31 11:03:44 -0500
commitb93840f5579a5edb90e36e09a9da31fff5918f01 (patch)
tree916d7bce33d77d44dfd06b9b30eecfb268e3c89a
parentac9dd82a3889d9a4f5f2598059d5adf2e9107104 (diff)
downloadeclipse.platform.swt-b93840f5579a5edb90e36e09a9da31fff5918f01.tar.gz
eclipse.platform.swt-b93840f5579a5edb90e36e09a9da31fff5918f01.tar.xz
eclipse.platform.swt-b93840f5579a5edb90e36e09a9da31fff5918f01.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties2
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties2
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.win32.WGL.properties2
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java6
9 files changed, 52 insertions, 9 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
index 5ab5c5506f..9cb170f04a 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 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
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
index b3c3951e97..426fa2ea7e 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 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
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.win32.WGL.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.win32.WGL.properties
index 094e0d9f5e..71f0c0f09c 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.win32.WGL.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.win32.WGL.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 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
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
index 8e7c6ad3eb..7c78a51566 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 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
@@ -4146,6 +4146,12 @@ OS_SetGraphicsMode=
OS_SetGraphicsMode_0=cast=HDC
OS_SetGraphicsMode_1=
+OS_SetLayeredWindowAttributes=flags=dynamic
+OS_SetLayeredWindowAttributes_0=
+OS_SetLayeredWindowAttributes_1=
+OS_SetLayeredWindowAttributes_2=
+OS_SetLayeredWindowAttributes_3=
+
OS_SetLayout=flags=dynamic
OS_SetLayout_0=cast=(HDC)
OS_SetLayout_1=cast=(DWORD)
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 88d919e69d..09dc439859 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 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
@@ -11977,6 +11977,34 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetGraphicsMode)
}
#endif
+#ifndef NO_SetLayeredWindowAttributes
+JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyte arg2, jint arg3)
+{
+ jboolean rc = 0;
+ OS_NATIVE_ENTER(env, that, SetLayeredWindowAttributes_FUNC);
+/*
+ rc = (jboolean)SetLayeredWindowAttributes(arg0, arg1, arg2, arg3);
+*/
+ {
+ static int initialized = 0;
+ static HMODULE hm = NULL;
+ static FARPROC fp = NULL;
+ rc = 0;
+ if (!initialized) {
+ if (!hm) hm = LoadLibrary(SetLayeredWindowAttributes_LIB);
+ if (hm) fp = GetProcAddress(hm, "SetLayeredWindowAttributes");
+ initialized = 1;
+ }
+ if (fp) {
+ rc = (jboolean)fp(arg0, arg1, arg2, arg3);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, SetLayeredWindowAttributes_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_SetLayout
JNIEXPORT jint JNICALL OS_NATIVE(SetLayout)
(JNIEnv *env, jclass that, jint arg0, jint arg1)
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 fe6b99f7fb..5d21896857 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
@@ -51,6 +51,7 @@
#define MonitorFromWindow_LIB "user32.dll"
#define NotifyWinEvent_LIB "user32.dll"
#define OpenThemeData_LIB "uxtheme.dll"
+#define SetLayeredWindowAttributes_LIB "user32.dll"
#define SetLayout_LIB "gdi32.dll"
#define SetMenuInfo_LIB "user32.dll"
#define SetProcessDPIAware_LIB "user32.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 bfbeb2f8d4..ecf161342b 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 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
@@ -14,8 +14,8 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 854;
-int OS_nativeFunctionCallCount[854];
+int OS_nativeFunctionCount = 855;
+int OS_nativeFunctionCallCount[855];
char * OS_nativeFunctionNames[] = {
"ACCEL_1sizeof",
"ACTCTX_1sizeof",
@@ -765,6 +765,7 @@ char * OS_nativeFunctionNames[] = {
"SetFocus",
"SetForegroundWindow",
"SetGraphicsMode",
+ "SetLayeredWindowAttributes",
"SetLayout",
"SetMenu",
"SetMenuDefaultItem",
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 680e27b541..2fb1457637 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 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
@@ -773,6 +773,7 @@ typedef enum {
SetFocus_FUNC,
SetForegroundWindow_FUNC,
SetGraphicsMode_FUNC,
+ SetLayeredWindowAttributes_FUNC,
SetLayout_FUNC,
SetMenu_FUNC,
SetMenuDefaultItem_FUNC,
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 cbb9865101..3df5069907 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
@@ -272,6 +272,7 @@ public class OS extends C {
public static final int BI_BITFIELDS = 3;
public static final int BI_RGB = 0;
public static final int BLACKNESS = 0x42;
+ public static final int BLACK_BRUSH = 4;
public static final int BCM_FIRST = 0x1600;
public static final int BCM_GETIDEALSIZE = BCM_FIRST + 0x1;
public static final int BCM_GETIMAGELIST = BCM_FIRST + 0x3;
@@ -999,6 +1000,8 @@ public class OS extends C {
public static final int LVS_SHAREIMAGELISTS = 0x40;
public static final int LVS_SHOWSELALWAYS = 0x8;
public static final int LVS_SINGLESEL = 0x4;
+ public static final int LWA_COLORKEY = 0x00000001;
+ public static final int LWA_ALPHA = 0x00000002;
public static final int MAX_LINKID_TEXT = 48;
// public static final int MAX_PATH = 260;
public static final int MA_NOACTIVATE = 0x3;
@@ -1952,10 +1955,12 @@ public class OS extends C {
public static final int WS_EX_CAPTIONOKBTN = 0x80000000;
public static final int WS_EX_CLIENTEDGE = 0x200;
public static final int WS_EX_DLGMODALFRAME = 0x1;
+ public static final int WS_EX_LAYERED = 0x00080000;
public static final int WS_EX_LAYOUTRTL = 0x00400000;
public static final int WS_EX_LEFTSCROLLBAR = 0x00004000;
public static final int WS_EX_MDICHILD = 0x00000040;
public static final int WS_EX_NOINHERITLAYOUT = 0x00100000;
+ public static final int WS_EX_NOACTIVATE = 0x08000000;
public static final int WS_EX_RIGHT = 0x00001000;
public static final int WS_EX_RTLREADING = 0x00002000;
public static final int WS_EX_STATICEDGE = 0x20000;
@@ -3683,6 +3688,7 @@ public static final native int SetErrorMode (int uMode);
public static final native int /*long*/ SetFocus (int /*long*/ hWnd);
public static final native boolean SetForegroundWindow (int /*long*/ hWnd);
public static final native int SetGraphicsMode (int /*long*/ hdc, int iMode);
+public static final native boolean SetLayeredWindowAttributes(int /*long*/ hwnd, int crKey, byte bAlpha, int dwFlags);
public static final native int SetLayout (int /*long*/ hdc, int dwLayout);
public static final native boolean SetMenu (int /*long*/ hWnd, int /*long*/ hMenu);
public static final native boolean SetMenuDefaultItem (int /*long*/ hMenu, int uItem, int fByPos);

Back to the top