Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Williams2018-08-14 16:00:34 -0400
committerEric Williams2018-08-14 16:00:34 -0400
commite3f3349387b3ce22f47efd31d4fa38e6772723a4 (patch)
tree479e29dad056f47cf129ee0982cf9ff250f8ec79
parentddc3826de4b8789f3df31a6927cb568b8e21c19f (diff)
downloadeclipse.platform.swt-e3f3349387b3ce22f47efd31d4fa38e6772723a4.tar.gz
eclipse.platform.swt-e3f3349387b3ce22f47efd31d4fa38e6772723a4.tar.xz
eclipse.platform.swt-e3f3349387b3ce22f47efd31d4fa38e6772723a4.zip
Bug 386769: Use of GTK_HAS_FOCUS with deprecated GTK_WIDGET_SET and
UNSET FLAGS in Composite Widget Remove GTK_HAS_FOCUS flags as they are deprecated and already set by gtk_widget_grab_focus(). Change-Id: I5439bca85543ebe48ea07b0b6a8c7e87eb122504 Signed-off-by: Eric Williams <ericwill@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java2
2 files changed, 0 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
index f7bd6602bb..97119bed03 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -57,7 +57,6 @@ public class GTK extends OS {
public static final int GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER = 2;
public static final int GTK_FRAME_LABEL_PAD = 1;
public static final int GTK_FRAME_LABEL_SIDE_PAD = 2;
- public static final int GTK_HAS_FOCUS = 1 << 12;
public static final int GTK_ICON_SIZE_MENU = 1;
public static final int GTK_ICON_SIZE_SMALL_TOOLBAR = 2;
public static final int GTK_ICON_SIZE_LARGE_TOOLBAR = 3;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 6aebd3ac7b..b1a1150329 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -1743,9 +1743,7 @@ boolean setTabItemFocus (boolean next) {
if (!super.setTabItemFocus (next)) return false;
if (socketHandle != 0) {
int direction = next ? GTK.GTK_DIR_TAB_FORWARD : GTK.GTK_DIR_TAB_BACKWARD;
- GTK.GTK_WIDGET_UNSET_FLAGS (socketHandle, GTK.GTK_HAS_FOCUS);
GTK.gtk_widget_child_focus (socketHandle, direction);
- GTK.GTK_WIDGET_SET_FLAGS (socketHandle, GTK.GTK_HAS_FOCUS);
}
return true;
}

Back to the top