Bug 386054: Unnecessary code in dialogs?
Remove unnecessary gtk_window_set_icon_list() code from Color and Font
dialogs. Windows that have gtk_window_set_transient_for() set on them
inherit their icons from their parent windows.
No issues observed in ControlExample.
Change-Id: I43f509861345288b9620751ff38622006ef59d4b
Signed-off-by: Eric Williams <ericwill@redhat.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
index 397a74a..c3689c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
@@ -140,11 +140,6 @@
if (parent != null) {
long /*int*/ shellHandle = parent.topHandle ();
GTK.gtk_window_set_transient_for (handle, shellHandle);
- long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle);
- if (pixbufs != 0) {
- GTK.gtk_window_set_icon_list (handle, pixbufs);
- OS.g_list_free (pixbufs);
- }
}
long /*int*/ group = GTK.gtk_window_get_group (0);
GTK.gtk_window_group_add_window (group, handle);
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 d862a94..1e0888c 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
@@ -160,11 +160,6 @@
if (parent!=null) {
long /*int*/ shellHandle = parent.topHandle ();
GTK.gtk_window_set_transient_for(handle, shellHandle);
- long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle);
- if (pixbufs != 0) {
- GTK.gtk_window_set_icon_list (handle, pixbufs);
- OS.g_list_free (pixbufs);
- }
}
long /*int*/ group = GTK.gtk_window_get_group(0);
GTK.gtk_window_group_add_window (group, handle);
