diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java | 64 |
1 files changed, 4 insertions, 60 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java index af72e9e527..521024ef21 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java @@ -582,21 +582,7 @@ void createColumn (TableColumn column, int index) { column.modelIndex = modelIndex; } if (!searchEnabled ()) { - /* - * Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE) - * would prevent the user from being able to type in text to search the tree. - * After 2.6.5, GTK introduced Ctrl+F as being the key binding for interactive - * search. This meant that even if FALSE was passed to enable_search, the user - * can still bring up the search pop up using the keybinding. GTK also introduced - * the notion of passing a -1 to gtk_set_search_column to disable searching - * (including the search key binding). The fix is to use the right calls - * for the right version. - */ - if (OS.GTK_VERSION >= OS.VERSION (2, 6, 5)) { - OS.gtk_tree_view_set_search_column (handle, -1); - } else { - OS.gtk_tree_view_set_enable_search (handle, false); - } + OS.gtk_tree_view_set_search_column (handle, -1); } else { /* Set the search column whenever the model changes */ int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex; @@ -637,21 +623,7 @@ void createHandle (int index) { OS.g_object_set (handle, OS.fixed_height_mode, true, 0); } if (!searchEnabled ()) { - /* - * Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE) - * would prevent the user from being able to type in text to search the tree. - * After 2.6.5, GTK introduced Ctrl+F as being the key binding for interactive - * search. This meant that even if FALSE was passed to enable_search, the user - * can still bring up the search pop up using the keybinding. GTK also introduced - * the notion of passing a -1 to gtk_set_search_column to disable searching - * (including the search key binding). The fix is to use the right calls - * for the right version. - */ - if (OS.GTK_VERSION >= OS.VERSION (2, 6, 5)) { - OS.gtk_tree_view_set_search_column (handle, -1); - } else { - OS.gtk_tree_view_set_enable_search (handle, false); - } + OS.gtk_tree_view_set_search_column (handle, -1); } } @@ -1048,21 +1020,7 @@ void destroyItem (TableColumn column) { } } if (!searchEnabled ()) { - /* - * Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE) - * would prevent the user from being able to type in text to search the tree. - * After 2.6.5, GTK introduced Ctrl+F as being the key binding for interactive - * search. This meant that even if FALSE was passed to enable_search, the user - * can still bring up the search pop up using the keybinding. GTK also introduced - * the notion of passing a -1 to gtk_set_search_column to disable searching - * (including the search key binding). The fix is to use the right calls - * for the right version. - */ - if (OS.GTK_VERSION >= OS.VERSION (2, 6, 5)) { - OS.gtk_tree_view_set_search_column (handle, -1); - } else { - OS.gtk_tree_view_set_enable_search (handle, false); - } + OS.gtk_tree_view_set_search_column (handle, -1); } else { /* Set the search column whenever the model changes */ int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex; @@ -2460,21 +2418,7 @@ public void removeAll () { resetCustomDraw (); if (!searchEnabled ()) { - /* - * Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE) - * would prevent the user from being able to type in text to search the tree. - * After 2.6.5, GTK introduced Ctrl+F as being the key binding for interactive - * search. This meant that even if FALSE was passed to enable_search, the user - * can still bring up the search pop up using the keybinding. GTK also introduced - * the notion of passing a -1 to gtk_set_search_column to disable searching - * (including the search key binding). The fix is to use the right calls - * for the right version. - */ - if (OS.GTK_VERSION >= OS.VERSION (2, 6, 5)){ - OS.gtk_tree_view_set_search_column (handle, -1); - } else { - OS.gtk_tree_view_set_enable_search (handle, false); - } + OS.gtk_tree_view_set_search_column (handle, -1); } else { /* Set the search column whenever the model changes */ int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex; |