diff options
| author | Eric Williams | 2018-08-14 20:56:15 +0000 |
|---|---|---|
| committer | Eric Williams | 2018-08-15 18:30:00 +0000 |
| commit | f241cc874342ce675ac143bbdd287a607962252e (patch) | |
| tree | daa09f75517f1340a4a344dfecac306136a4470f | |
| parent | ec246fda5bf19bc9c71a708e1e0fafc51bd99a1b (diff) | |
| download | eclipse.platform.swt-f241cc874342ce675ac143bbdd287a607962252e.tar.gz eclipse.platform.swt-f241cc874342ce675ac143bbdd287a607962252e.tar.xz eclipse.platform.swt-f241cc874342ce675ac143bbdd287a607962252e.zip | |
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>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java | 5 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java | 5 |
2 files changed, 0 insertions, 10 deletions
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 397a74a6ff..c3689c3eb0 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 @@ public RGB open () { 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 d862a945f9..1e0888c087 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 @@ public FontData open () { 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); |