aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiraj Modi2014-04-21 09:46:11 (EDT)
committerNiraj Modi2014-04-21 09:46:11 (EDT)
commit7002e3764417bb21d44767542aab25b31fa31c34 (patch)
tree569ad3ca5e210316a2f74a38c488bf3182ced563
parent9832f2c86854d5a2c73e4f95e2456eeaba926970 (diff)
downloadeclipse.platform.swt-7002e3764417bb21d44767542aab25b31fa31c34.zip
eclipse.platform.swt-7002e3764417bb21d44767542aab25b31fa31c34.tar.gz
eclipse.platform.swt-7002e3764417bb21d44767542aab25b31fa31c34.tar.bz2
Bug 432435 - [win32] Every program using an SWT UI is byrefs/changes/62/24862/5
defaultidentified as the same application Change-Id: I346044bd5dcc48282c6d174a35f38f7419cddb8f Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java10
3 files changed, 17 insertions, 5 deletions
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 483001f..e769734 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 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
@@ -4276,6 +4276,10 @@ public static String getAppVersion () {
* On Motif, for example, this can be used to set
* the name used for resource lookup. Accessibility
* tools may also ask for the application name.
+ * On Windows, if application name is set to any
+ * value other than "SWT" (case insensitive), it is
+ * used to set the application user model ID which
+ * is used by the OS for taskbar grouping.
* </p><p>
* Specifying <code>null</code> for the name clears it.
* </p>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 629ff08..1909073 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 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
@@ -3927,6 +3927,10 @@ public static String getAppVersion () {
* On Motif, for example, this can be used to set
* the name used for resource lookup. Accessibility
* tools may also ask for the application name.
+ * On Windows, if application name is set to any
+ * value other than "SWT" (case insensitive), it is
+ * used to set the application user model ID which
+ * is used by the OS for taskbar grouping.
* </p><p>
* Specifying <code>null</code> for the name clears it.
* </p>
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 9a6d405..2ae13d6 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 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
@@ -2699,9 +2699,9 @@ public long /*int*/ internal_new_GC (GCData data) {
protected void init () {
super.init ();
- /* Set the application user model ID */
+ /* Set the application user model ID, if APP_NAME is non Default */
char [] appName = null;
- if (APP_NAME != null) {
+ if (APP_NAME != null && !"SWT".equalsIgnoreCase (APP_NAME)) {
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 1)) {
int length = APP_NAME.length ();
appName = new char [length + 1];
@@ -4580,6 +4580,10 @@ public static String getAppVersion () {
* On Motif, for example, this can be used to set
* the name used for resource lookup. Accessibility
* tools may also ask for the application name.
+ * On Windows, if application name is set to any
+ * value other than "SWT" (case insensitive), it is
+ * used to set the application user model ID which
+ * is used by the OS for taskbar grouping.
* </p><p>
* Specifying <code>null</code> for the name clears it.
* </p>