diff options
| author | Veronika Irvine <veronika> | 2006-02-09 20:01:41 +0000 |
|---|---|---|
| committer | Veronika Irvine <veronika> | 2006-02-09 20:01:41 +0000 |
| commit | 32e3be4cf6d4df308bb7ba7131358b236c899b4c (patch) | |
| tree | 3dacfd6941ade59ecdf7e6608e2ac1d84b8b87f0 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java | |
| parent | d61f1c6afcf32ea184f14d914b6a7730549347ac (diff) | |
| download | eclipse.platform.swt-32e3be4cf6d4df308bb7ba7131358b236c899b4c.tar.gz eclipse.platform.swt-32e3be4cf6d4df308bb7ba7131358b236c899b4c.tar.xz eclipse.platform.swt-32e3be4cf6d4df308bb7ba7131358b236c899b4c.zip | |
Bug 126996 - Same image problem occurs if TreeColumn or TableColumn present
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java index 93716c44ab..ca434b8f33 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java @@ -1315,9 +1315,9 @@ public void setImage (int index, Image image) { } int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, pixbuf, -1); - if (image != null && parent.columnCount == 0) { + if (image != null) { int /*long*/parentHandle = parent.handle; - int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0); + int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index); if (OS.gtk_tree_view_column_get_sizing (column) == OS.GTK_TREE_VIEW_COLUMN_FIXED) { parent.setScrollWidth (column, this); /* @@ -1401,12 +1401,10 @@ public void setText (int index, String string) { byte[] buffer = Converter.wcsToMbcs (null, string, true); int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, buffer, -1); - if (parent.columnCount == 0) { - int /*long*/parentHandle = parent.handle; - int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0); - if (OS.gtk_tree_view_column_get_sizing (column) == OS.GTK_TREE_VIEW_COLUMN_FIXED) { - parent.setScrollWidth (column, this); - } + int /*long*/parentHandle = parent.handle; + int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index); + if (OS.gtk_tree_view_column_get_sizing (column) == OS.GTK_TREE_VIEW_COLUMN_FIXED) { + parent.setScrollWidth (column, this); } cached = true; } |