Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2013-07-12 16:47:52 +0000
committerAlexander Kurtakov2013-07-12 16:47:52 +0000
commit6d2109680e67f01ec005aa6e7ba9c30428f9e77a (patch)
tree6d2a0007775f1451758d67de6c035b2fed8c5a81
parent4c12d494486dd1ab75b7abc45b6e43b9bfe348e4 (diff)
downloadeclipse.platform.swt-6d2109680e67f01ec005aa6e7ba9c30428f9e77a.tar.gz
eclipse.platform.swt-6d2109680e67f01ec005aa6e7ba9c30428f9e77a.tar.xz
eclipse.platform.swt-6d2109680e67f01ec005aa6e7ba9c30428f9e77a.zip
Remove Gtk 2.6 hack for popups.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java14
3 files changed, 0 insertions, 42 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
index 22589a874e..cbaabb6fa1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -782,20 +782,6 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
return result;
}
-long /*int*/ gtk_popup_menu (long /*int*/ widget) {
- long /*int*/ result = super.gtk_popup_menu (widget);
- /*
- * Bug in GTK. The context menu for the typeahead in GtkTreeViewer
- * opens in the bottom right corner of the screen when Shift+F10
- * is pressed and the typeahead window was not visible. The fix is
- * to prevent the context menu from opening by stopping the default
- * handler.
- *
- * NOTE: The bug only happens in GTK 2.6.5 and lower.
- */
- return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
-}
-
long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {
sendSelectionEvent (SWT.DefaultSelection);
return 0;
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 521024ef21..2a8d1e5c7f 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
@@ -1933,20 +1933,6 @@ long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
return super.gtk_expose_event (widget, eventPtr);
}
-long /*int*/ gtk_popup_menu (long /*int*/ widget) {
- long /*int*/ result = super.gtk_popup_menu (widget);
- /*
- * Bug in GTK. The context menu for the typeahead in GtkTreeViewer
- * opens in the bottom right corner of the screen when Shift+F10
- * is pressed and the typeahead window was not visible. The fix is
- * to prevent the context menu from opening by stopping the default
- * handler.
- *
- * NOTE: The bug only happens in GTK 2.6.5 and lower.
- */
- return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
-}
-
long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 786e843516..fff697991f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -1947,20 +1947,6 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
return super.gtk_motion_notify_event (widget, event);
}
-long /*int*/ gtk_popup_menu (long /*int*/ widget) {
- long /*int*/ result = super.gtk_popup_menu (widget);
- /*
- * Bug in GTK. The context menu for the typeahead in GtkTreeViewer
- * opens in the bottom right corner of the screen when Shift+F10
- * is pressed and the typeahead window was not visible. The fix is
- * to prevent the context menu from opening by stopping the default
- * handler.
- *
- * NOTE: The bug only happens in GTK 2.6.5 and lower.
- */
- return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
-}
-
long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {
if (path == 0) return 0;
TreeItem item = null;

Back to the top