diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT')
8 files changed, 20 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java index 6b4b552719..b34449a7ea 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java @@ -450,7 +450,7 @@ void createHandle (int index) { * clear the GTK_RECEIVES_DEFAULT flag. */ if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) { - OS.GTK_WIDGET_UNSET_FLAGS (buttonHandle, OS.GTK_RECEIVES_DEFAULT); + gtk_widget_set_receives_default (buttonHandle, false); } } 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 35c0369518..8d68182c7d 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 @@ -532,7 +532,7 @@ int /*long*/ focusHandle () { boolean forceFocus (int /*long*/ focusHandle) { if (socketHandle != 0) gtk_widget_set_can_focus (focusHandle, true); boolean result = super.forceFocus (focusHandle); - if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS); + if (socketHandle != 0) gtk_widget_set_can_focus (focusHandle, false); return result; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index 6e57710576..83d1920130 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -195,7 +195,7 @@ void fixFocus (Control focusControl) { OS.gtk_widget_grab_focus (focusHandle); // widget could be disposed at this point if (isDisposed ()) return; - OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS); + gtk_widget_set_can_focus (focusHandle, false); } void fixStyle () { @@ -840,7 +840,7 @@ void moveHandle (int x, int y) { * old bounds of the child are correctly redrawn. */ boolean visible = gtk_widget_get_visible (parentHandle); - OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_VISIBLE); + gtk_widget_set_visible (parentHandle, false); OS.gtk_fixed_move (parentHandle, topHandle, x, y); if (visible) { gtk_widget_set_visible (parentHandle, true); @@ -4564,7 +4564,7 @@ public void setVisible (boolean visible) { } state |= HIDDEN; if (fixFocus) { - OS.GTK_WIDGET_UNSET_FLAGS (topHandle, OS.GTK_VISIBLE); + gtk_widget_set_visible (topHandle, false); fixFocus (control); if (isDisposed ()) return; gtk_widget_set_visible (topHandle, true); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java index e65d539966..96cd6be002 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java @@ -163,10 +163,10 @@ void createText(boolean dropDown) { createPopupShell(-1, -1, -1); } else { up = new Button(this, SWT.ARROW | SWT.UP); - OS.GTK_WIDGET_UNSET_FLAGS(up.handle, OS.GTK_CAN_FOCUS); + gtk_widget_set_can_focus (up.handle, false); //up.setToolTipText(SWT.getMessage ("SWT_Up")); //$NON-NLS-1$ down = new Button(this, SWT.ARROW | SWT.DOWN); - OS.GTK_WIDGET_UNSET_FLAGS(down.handle, OS.GTK_CAN_FOCUS); + gtk_widget_set_can_focus (down.handle, false); //down.setToolTipText(SWT.getMessage ("SWT_Down")); //$NON-NLS-1$ up.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { @@ -185,7 +185,7 @@ void createText(boolean dropDown) { void createDropDownButton() { down = new Button(this, SWT.ARROW | SWT.DOWN); - OS.GTK_WIDGET_UNSET_FLAGS(down.handle, OS.GTK_CAN_FOCUS); + gtk_widget_set_can_focus (down.handle, false); down.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { boolean dropped = isDropped(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java index 05d4dcec64..7da2a5e5bf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java @@ -329,7 +329,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { } int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { - OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS); + gtk_widget_set_can_focus (handle, false); parent.lastFocus = this; return 0; } @@ -514,7 +514,7 @@ boolean setFocus () { // widget could be disposed at this point if (isDisposed ()) return false; boolean result = OS.gtk_widget_is_focus (handle); - if (!result) OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS); + if (!result) gtk_widget_set_can_focus (handle, false); return result; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java index 072dd38538..7a45c3af0d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java @@ -963,7 +963,7 @@ public void setEnabled (boolean enabled) { if (enabled) { OS.gtk_widget_set_sensitive (handle, true); } else { - OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_SENSITIVE); + OS.gtk_widget_set_sensitive (handle, false); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java index 87f0b0a3fd..ccaa1c62ec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java @@ -278,7 +278,7 @@ void createHandle (int index) { boolean enabled = gtk_widget_get_sensitive (parentHandle); if (!enabled) OS.gtk_widget_set_sensitive (parentHandle, true); OS.gtk_menu_shell_insert (parentHandle, handle, index); - if (!enabled) OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_SENSITIVE); + if (!enabled) OS.gtk_widget_set_sensitive (parentHandle, false); OS.gtk_widget_show (handle); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java index eb1b4e8b87..e69adb80a7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java @@ -1778,6 +1778,14 @@ void gtk_widget_set_visible (int /*long*/ widget, boolean visible) { } } +void gtk_widget_set_receives_default (int /*long*/ widget, boolean receives_default) { + if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) { + OS.gtk_widget_set_receives_default (widget, receives_default); + } else { + OS.GTK_WIDGET_UNSET_FLAGS (widget, OS.GTK_RECEIVES_DEFAULT); + } +} + /** * Returns a string containing a concise, human-readable * description of the receiver. |