diff options
author | Steve Northover <steve> | 2001-11-15 18:22:54 +0000 |
---|---|---|
committer | Steve Northover <steve> | 2001-11-15 18:22:54 +0000 |
commit | 3c2a2be937ad86e26bb4fccd093c23bfe9744320 (patch) | |
tree | 0e77dace0b78be1870b4699e7ddcfeaa90768d22 | |
parent | 10957ed5d2b31ee830e63f5c2109a11f96063c35 (diff) | |
download | eclipse.platform.swt-3c2a2be937ad86e26bb4fccd093c23bfe9744320.tar.gz eclipse.platform.swt-3c2a2be937ad86e26bb4fccd093c23bfe9744320.tar.xz eclipse.platform.swt-3c2a2be937ad86e26bb4fccd093c23bfe9744320.zip |
*** empty log message ***
-rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java index 316d5836aa..9365083cd2 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java @@ -336,7 +336,25 @@ public void close () { void createHandle () {
boolean embedded = handle != 0;
+
+ /*
+ * On Windows 98 and NT, setting a window to be the
+ * top most window using HWND_TOPMOST can result in a
+ * parent dialog shell being moved behind its parent
+ * if the dialog has a sibling that is currently on top
+ * This only occurs using SetWindowPos (), not when the
+ * handle is created.
+ */
+ /*
+ * The following code is intentionally commented.
+ */
+// if ((style & SWT.ON_TOP) != 0) display.lockActiveWindow = true;
super.createHandle ();
+ /*
+ * The following code is intentionally commented.
+ */
+// if ((style & SWT.ON_TOP) != 0) display.lockActiveWindow = false;
+
if (!embedded) {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
bits &= ~OS.WS_OVERLAPPED;
@@ -754,6 +772,19 @@ void setParent () { void setToolTipText (int hwnd, String text) {
if (OS.IsWinCE) return;
if (toolTipHandle == 0) {
+
+ /*
+ * On Windows 98 and NT, setting a window to be the
+ * top most window using HWND_TOPMOST can result in a
+ * parent dialog shell being moved behind its parent
+ * if the dialog has a sibling that is currently on top
+ * This only occurs using SetWindowPos (), not when the
+ * handle is created.
+ */
+ /*
+ * The following code is intentionally commented.
+ */
+// display.lockActiveWindow = true;
toolTipHandle = OS.CreateWindowEx (
OS.WS_EX_TOPMOST,
new TCHAR (0, OS.TOOLTIPS_CLASS, true),
@@ -764,7 +795,12 @@ void setToolTipText (int hwnd, String text) { 0,
OS.GetModuleHandle (null),
null);
+ /*
+ * The following code is intentionally commented.
+ */
+// display.lockActiveWindow = false;
if (toolTipHandle == 0) error (SWT.ERROR_NO_HANDLES);
+
/*
* Feature in Windows. Despite the fact that the
* tool tip text contains \r\n, the tooltip will
|