diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c index bf5b9cb7af1..35e3cc4aa9a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c @@ -7,9 +7,6 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation *******************************************************************************/ /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */ @@ -2275,6 +2272,16 @@ JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1widget_1get_1window) } #endif +#ifndef NO_gtk_1widget_1hide +JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1hide) + (JNIEnv *env, jclass that, jlong arg0) +{ + GTK3_NATIVE_ENTER(env, that, gtk_1widget_1hide_FUNC); + gtk_widget_hide((GtkWidget *)arg0); + GTK3_NATIVE_EXIT(env, that, gtk_1widget_1hide_FUNC); +} +#endif + #ifndef NO_gtk_1widget_1input_1shape_1combine_1region JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1input_1shape_1combine_1region) (JNIEnv *env, jclass that, jlong arg0, jlong arg1) @@ -2408,6 +2415,16 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1shape_1combine_1region) } #endif +#ifndef NO_gtk_1widget_1show +JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1show) + (JNIEnv *env, jclass that, jlong arg0) +{ + GTK3_NATIVE_ENTER(env, that, gtk_1widget_1show_FUNC); + gtk_widget_show((GtkWidget *)arg0); + GTK3_NATIVE_EXIT(env, that, gtk_1widget_1show_FUNC); +} +#endif + #ifndef NO_gtk_1widget_1size_1allocate JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1size_1allocate) (JNIEnv *env, jclass that, jlong arg0, jobject arg1) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h index 9eed9c0cd17..217b2e2e7a8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h @@ -7,9 +7,6 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation *******************************************************************************/ /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */ @@ -209,6 +206,7 @@ typedef enum { gtk_1widget_1get_1screen_FUNC, gtk_1widget_1get_1toplevel_FUNC, gtk_1widget_1get_1window_FUNC, + gtk_1widget_1hide_FUNC, gtk_1widget_1input_1shape_1combine_1region_FUNC, gtk_1widget_1override_1font_FUNC, gtk_1widget_1remove_1accelerator_FUNC, @@ -221,6 +219,7 @@ typedef enum { gtk_1widget_1set_1parent_1window_FUNC, gtk_1widget_1set_1redraw_1on_1allocate_FUNC, gtk_1widget_1shape_1combine_1region_FUNC, + gtk_1widget_1show_FUNC, gtk_1widget_1size_1allocate_FUNC, gtk_1widget_1style_1get__J_3B_3IJ_FUNC, gtk_1widget_1style_1get__J_3B_3JJ_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c index f7f7f26124a..155bd6d56a3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c @@ -7,9 +7,6 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation *******************************************************************************/ /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h index 7db184262b4..7990914394c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h @@ -7,9 +7,6 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation *******************************************************************************/ /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 262bfbaf443..bc2e9a63b03 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -9352,16 +9352,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1widget_1has_1focus) } #endif -#ifndef NO_gtk_1widget_1hide -JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1hide) - (JNIEnv *env, jclass that, jlong arg0) -{ - GTK_NATIVE_ENTER(env, that, gtk_1widget_1hide_FUNC); - gtk_widget_hide((GtkWidget *)arg0); - GTK_NATIVE_EXIT(env, that, gtk_1widget_1hide_FUNC); -} -#endif - #ifndef NO_gtk_1widget_1insert_1action_1group JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1insert_1action_1group) (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) @@ -9680,16 +9670,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1visible) } #endif -#ifndef NO_gtk_1widget_1show -JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1show) - (JNIEnv *env, jclass that, jlong arg0) -{ - GTK_NATIVE_ENTER(env, that, gtk_1widget_1show_FUNC); - gtk_widget_show((GtkWidget *)arg0); - GTK_NATIVE_EXIT(env, that, gtk_1widget_1show_FUNC); -} -#endif - #ifndef NO_gtk_1widget_1unparent JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1unparent) (JNIEnv *env, jclass that, jlong arg0) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index c483797d324..8d57a7eedcb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -748,7 +748,6 @@ typedef enum { gtk_1widget_1grab_1focus_FUNC, gtk_1widget_1has_1default_FUNC, gtk_1widget_1has_1focus_FUNC, - gtk_1widget_1hide_FUNC, gtk_1widget_1insert_1action_1group_FUNC, gtk_1widget_1is_1focus_FUNC, gtk_1widget_1mnemonic_1activate_FUNC, @@ -774,7 +773,6 @@ typedef enum { gtk_1widget_1set_1valign_FUNC, gtk_1widget_1set_1vexpand_FUNC, gtk_1widget_1set_1visible_FUNC, - gtk_1widget_1show_FUNC, gtk_1widget_1unparent_FUNC, gtk_1window_1fullscreen_FUNC, gtk_1window_1get_1default_1size_FUNC, 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 a7793a09f6a..cffb588f19c 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 @@ -2340,8 +2340,7 @@ public class GTK extends OS { public static final native void gtk_widget_grab_focus(long widget); /** @param widget cast=(GtkWidget *) */ public static final native boolean gtk_widget_has_focus(long widget); - /** @param widget cast=(GtkWidget *) */ - public static final native void gtk_widget_hide(long widget); + /** @param widget cast=(GtkWidget *) */ public static final native boolean gtk_widget_is_focus(long widget); /** @param widget cast=(GtkWidget *) */ @@ -2399,8 +2398,7 @@ public class GTK extends OS { * @param height cast=(gint) */ public static final native void gtk_widget_set_size_request(long widget, int width, int height); - /** @param widget cast=(GtkWidget *) */ - public static final native void gtk_widget_show(long widget); + /** @param widget cast=(GtkWidget *) */ public static final native boolean gtk_widget_activate(long widget); /** @param widget cast=(GtkWidget *) */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java index 5e5c9e278aa..91921218c10 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java @@ -1089,5 +1089,9 @@ public class GTK3 { public static final native int GdkEventWindowState_sizeof(); public static final native int GdkGeometry_sizeof(); public static final native int GdkWindowAttr_sizeof(); + /** @param widget cast=(GtkWidget *) */ + public static final native void gtk_widget_show(long widget); + /** @param widget cast=(GtkWidget *) */ + public static final native void gtk_widget_hide(long widget); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index c6f5025470b..5b03fc50f40 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -709,8 +709,13 @@ public void create (Composite parent, int style) { OS.g_signal_connect (WebKitGTK.webkit_web_context_get_default(), WebKitGTK.download_started, Proc3.getAddress (), DOWNLOAD_STARTED); } - GTK.gtk_widget_show (webView); - GTK.gtk_widget_show (browser.handle); + if (GTK.GTK4) { + GTK.gtk_widget_set_visible(webView, true); + GTK.gtk_widget_set_visible(browser.handle, true); + } else { + GTK3.gtk_widget_show(webView); + GTK3.gtk_widget_show(browser.handle); + } // Webview 'title' property OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/SyncDialogUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/SyncDialogUtil.java index bb69ea849e5..19911691033 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/SyncDialogUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/SyncDialogUtil.java @@ -17,6 +17,7 @@ import java.util.function.*; import org.eclipse.swt.internal.gtk.*; +import org.eclipse.swt.internal.gtk3.*; import org.eclipse.swt.widgets.*; /** @@ -76,7 +77,11 @@ static public int run(Display display, long handle, boolean isNativeDialog) { if (isNativeDialog) { GTK.gtk_native_dialog_show(handle); } else { - GTK.gtk_widget_show(handle); + if (GTK.GTK4) { + GTK.gtk_widget_set_visible(handle, true); + } else { + GTK3.gtk_widget_show(handle); + } } while (!display.isDisposed()) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java index 983ea961e0a..bfe1d77024c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java @@ -1295,28 +1295,28 @@ public void setText (String string) { private void updateWidgetsVisibility() { if (text.length() == 0 && image == null) { - GTK.gtk_widget_hide (boxHandle); - GTK.gtk_widget_hide (labelHandle); - GTK.gtk_widget_hide (imageHandle); + gtk_widget_hide (boxHandle); + gtk_widget_hide (labelHandle); + gtk_widget_hide (imageHandle); } else { - GTK.gtk_widget_show (boxHandle); + gtk_widget_show (boxHandle); if (text.length() == 0) - GTK.gtk_widget_hide (labelHandle); + gtk_widget_hide (labelHandle); else - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (labelHandle); if (image == null) - GTK.gtk_widget_hide (imageHandle); + gtk_widget_hide (imageHandle); else - GTK.gtk_widget_show (imageHandle); + gtk_widget_show (imageHandle); } } @Override void showWidget () { super.showWidget (); - if (boxHandle != 0 && ((text != null && text.length() != 0) || image != null)) GTK.gtk_widget_show (boxHandle); - if (labelHandle != 0 && text != null && text.length() != 0) GTK.gtk_widget_show (labelHandle); - if (arrowHandle != 0) GTK.gtk_widget_show (arrowHandle); + if (boxHandle != 0 && ((text != null && text.length() != 0) || image != null)) gtk_widget_show (boxHandle); + if (labelHandle != 0 && text != null && text.length() != 0) gtk_widget_show (labelHandle); + if (arrowHandle != 0) gtk_widget_show (arrowHandle); } @Override 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 10dddc457e0..6a64f0b58e0 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 @@ -1660,7 +1660,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize if (fixedHandle != 0 && handle != 0 && getVisible() && !GTK.gtk_widget_get_visible(topHandle) //if SWT State is not HIDDEN, but widget is hidden on GTK side. && topHandle == fixedHandle && width > 0 && height > 0 && resize) { - GTK.gtk_widget_show(topHandle); + gtk_widget_show(topHandle); } int result = super.setBounds (x, y, width, height, move, resize); @@ -1823,7 +1823,7 @@ public void setTabList (Control [] tabList) { void showWidget () { super.showWidget (); if (socketHandle != 0) { - GTK.gtk_widget_show (socketHandle); + gtk_widget_show (socketHandle); embeddedHandle = GTK.gtk_socket_get_id (socketHandle); } if (scrolledHandle == 0) fixStyle (handle); 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 64f4ec59c6d..c7e87f7eeac 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 @@ -1145,10 +1145,10 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize */ if (!GTK.gtk_widget_get_visible(topHandle)) { Control focusControl = display.getFocusControl(); - GTK.gtk_widget_show(topHandle); + gtk_widget_show(topHandle); gtk_widget_get_preferred_size (topHandle, requisition); gtk_widget_size_allocate(topHandle, allocation, -1); - GTK.gtk_widget_hide(topHandle); + gtk_widget_hide(topHandle); /* Bug 540002: Showing and hiding widget causes original focused control to loose focus, * Reset focus to original focused control after dealing with allocation. */ @@ -1180,7 +1180,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize } } - GTK.gtk_widget_hide(topHandle); + gtk_widget_hide(topHandle); } else { if ((state & HIDDEN) == 0) { if (!GTK.GTK4) { @@ -1189,7 +1189,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize } } - GTK.gtk_widget_show(topHandle); + gtk_widget_show(topHandle); } } @@ -6126,7 +6126,7 @@ public void setVisible (boolean visible) { if (!GTK.GTK4) { if (enableWindow != 0) GDK.gdk_window_show_unraised(enableWindow); } - GTK.gtk_widget_show (topHandle); + gtk_widget_show (topHandle); } } else { /* @@ -6151,7 +6151,7 @@ public void setVisible (boolean visible) { if (isDisposed ()) return; GTK.gtk_widget_set_can_focus (topHandle, true); } - GTK.gtk_widget_hide (topHandle); + gtk_widget_hide (topHandle); if (isDisposed ()) return; if (!GTK.GTK4) { if (enableWindow != 0) GDK.gdk_window_hide(enableWindow); @@ -6338,9 +6338,9 @@ void showWidget () { } else { GTK3.gtk_container_add(parentHandle, topHandle); } - if (handle != 0 && handle != topHandle) GTK.gtk_widget_show (handle); + if (handle != 0 && handle != topHandle) gtk_widget_show (handle); if ((state & (ZERO_WIDTH | ZERO_HEIGHT)) == 0) { - if (fixedHandle != 0) GTK.gtk_widget_show (fixedHandle); + if (fixedHandle != 0) gtk_widget_show (fixedHandle); } if (fixedHandle != 0) fixStyle (fixedHandle); } 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 090a33e9d55..cb9289111e0 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 @@ -434,7 +434,7 @@ private void createHandleForCalendar() { flags |= GTK.GTK_CALENDAR_SHOW_WEEK_NUMBERS; } GTK3.gtk_calendar_set_display_options(handle, flags); - GTK.gtk_widget_show(handle); + gtk_widget_show(handle); } } @@ -457,8 +457,8 @@ private void createHandleForDateWithDropDown () { GTK3.gtk_container_add(fixedHandle, handle); GTK3.gtk_container_add(handle, textEntryHandle); - GTK.gtk_widget_show(containerHandle); - GTK.gtk_widget_show(textEntryHandle); + gtk_widget_show(containerHandle); + gtk_widget_show(textEntryHandle); // In GTK 3 font description is inherited from parent widget which is not how SWT has always worked, @@ -2326,7 +2326,7 @@ void selectAll () { void hideDateTime () { if (isDate () || isTime ()){ - GTK.gtk_widget_hide (fixedHandle); + gtk_widget_hide (fixedHandle); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java index 5d135c46e8b..5bbf30ec8d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java @@ -275,7 +275,7 @@ public long await(long result) { } } } - + Optional result = Optional.empty(); if (response == GTK.GTK_RESPONSE_ACCEPT) { result = Optional.ofNullable(selectedPath); @@ -306,7 +306,7 @@ void GTK3setNativeDialogMessage(long handle, String message) { if (label == 0) error(SWT.ERROR_NO_HANDLES); GTK3.gtk_container_add(box, label); - GTK.gtk_widget_show(label); + GTK3.gtk_widget_show(label); GTK3.gtk_label_set_line_wrap(label, true); GTK.gtk_box_set_homogeneous(box, false); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index 84bd0177754..dfc3d563a75 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -5556,7 +5556,7 @@ void showIMWindow (Control control) { GTK4.gtk_window_set_child(preeditWindow, preeditLabel); } else { GTK3.gtk_container_add (preeditWindow, preeditLabel); - GTK.gtk_widget_show (preeditLabel); + GTK3.gtk_widget_show (preeditLabel); } } long [] preeditString = new long [1]; @@ -5578,9 +5578,9 @@ void showIMWindow (Control control) { GtkRequisition requisition = new GtkRequisition (); GTK.gtk_widget_get_preferred_size (preeditLabel, requisition, null); GTK3.gtk_window_resize (preeditWindow, requisition.width, requisition.height); - GTK.gtk_widget_show (preeditWindow); + GTK3.gtk_widget_show (preeditWindow); } else { - GTK.gtk_widget_hide (preeditWindow); + GTK3.gtk_widget_hide (preeditWindow); } if (preeditString [0] != 0) OS.g_free (preeditString [0]); if (pangoAttrs [0] != 0) OS.pango_attr_list_unref (pangoAttrs [0]); 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 72c1b76c451..6bca156549b 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 @@ -409,7 +409,7 @@ void resizeControl () { * to be zero, and the widget is never shown during a layout operation, similar to * Bug 487757. The fix is to show the control before setting any bounds. */ - if (visible) GTK.gtk_widget_show(control.topHandle ()); + if (visible) gtk_widget_show(control.topHandle ()); control.setBounds (x, y, width, Math.max (0, height), true, true); control.setVisible (visible); @@ -522,16 +522,16 @@ public void setImage (Image image) { } else { GTK3.gtk_image_set_from_surface(imageHandle, image.surface); } - if (text.length () == 0) GTK.gtk_widget_hide (labelHandle); - GTK.gtk_widget_show(imageHandle); + if (text.length () == 0) gtk_widget_hide (labelHandle); + gtk_widget_show(imageHandle); } else { if (GTK.GTK4) { GTK4.gtk_picture_set_paintable(imageHandle, 0); } else { GTK3.gtk_image_set_from_surface(imageHandle, 0); } - GTK.gtk_widget_show(labelHandle); - GTK.gtk_widget_hide(imageHandle); + gtk_widget_show(labelHandle); + gtk_widget_hide(imageHandle); } } @@ -557,12 +557,12 @@ void showWidget (int index) { GTK4.gtk_box_append(parent.handle, handle); gtk_box_set_child_packing (parent.handle, handle, false, false, 0, GTK.GTK_PACK_START); } else { - GTK.gtk_widget_show (handle); - GTK.gtk_widget_show (clientHandle); + gtk_widget_show (handle); + gtk_widget_show (clientHandle); if (labelHandle != 0) - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (labelHandle); if (boxHandle != 0) - GTK.gtk_widget_show (boxHandle); + gtk_widget_show (boxHandle); GTK3.gtk_container_add (parent.handle, handle); gtk_box_set_child_packing (parent.handle, handle, false, false, 0, GTK.GTK_PACK_START); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java index 7e20a4986a0..f963ffc1f63 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java @@ -401,8 +401,8 @@ public void setText (String string) { @Override void showWidget () { super.showWidget (); - if (clientHandle != 0) GTK.gtk_widget_show (clientHandle); - if (labelHandle != 0) GTK.gtk_widget_show (labelHandle); + if (clientHandle != 0) gtk_widget_show (clientHandle); + if (labelHandle != 0) gtk_widget_show (labelHandle); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java index ed2eb59080f..8a8d414436b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java @@ -654,16 +654,16 @@ public void setImage (Image image) { } else { GTK3.gtk_image_set_from_surface(imageHandle, image.surface); } - GTK.gtk_widget_hide (labelHandle); - GTK.gtk_widget_show (imageHandle); + gtk_widget_hide (labelHandle); + gtk_widget_show (imageHandle); } else { if (GTK.GTK4) { GTK4.gtk_picture_set_paintable(imageHandle, 0); } else { GTK3.gtk_image_set_from_surface(imageHandle, 0); } - GTK.gtk_widget_show (labelHandle); - GTK.gtk_widget_hide (imageHandle); + gtk_widget_show (labelHandle); + gtk_widget_hide (imageHandle); } } @@ -706,8 +706,8 @@ public void setText (String string) { char [] chars = fixMnemonic (string); byte [] buffer = Converter.wcsToMbcs (chars, true); GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer); - GTK.gtk_widget_hide (imageHandle); - GTK.gtk_widget_show (labelHandle); + gtk_widget_hide (imageHandle); + gtk_widget_show (labelHandle); } @Override @@ -719,9 +719,9 @@ void setWidgetBackground () { @Override void showWidget () { super.showWidget (); - if (frameHandle != 0) GTK.gtk_widget_show (frameHandle); - if (labelHandle != 0) GTK.gtk_widget_show (labelHandle); - if (boxHandle != 0) GTK.gtk_widget_show (boxHandle); + if (frameHandle != 0) gtk_widget_show (frameHandle); + if (labelHandle != 0) gtk_widget_show (labelHandle); + if (boxHandle != 0) gtk_widget_show (boxHandle); } @Override 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 c702eb7b208..4e053f85015 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 @@ -1337,7 +1337,7 @@ void verifyMenuPosition (int itemCount) { * We need to "show" the menu before fetching the preferred height. * Note, this does not actually pop-up the menu. */ - GTK.gtk_widget_show(handle); + gtk_widget_show(handle); /* * Menus are height-for-width only: use gtk_widget_get_preferred_height() * instead of gtk_widget_get_preferred_size(). 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 1ab9134fff4..85b73d3d362 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 @@ -433,19 +433,19 @@ void createHandle(int index) { } GTK3.gtk_container_add (boxHandle, imageHandle); - GTK.gtk_widget_show (imageHandle); + gtk_widget_show (imageHandle); } if (labelHandle != 0) { GTK.gtk_label_set_xalign (labelHandle, 0); GTK.gtk_widget_set_halign (labelHandle, GTK.GTK_ALIGN_FILL); gtk_box_pack_end (boxHandle, labelHandle, true, true, 0); - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (labelHandle); } if (boxHandle != 0) { GTK3.gtk_container_add (handle, boxHandle); - GTK.gtk_widget_show (boxHandle); + gtk_widget_show (boxHandle); } if ((style & SWT.SEPARATOR) == 0) { @@ -460,7 +460,7 @@ void createHandle(int index) { if (!enabled) GTK.gtk_widget_set_sensitive (parentHandle, true); GTK3.gtk_menu_shell_insert (parentHandle, handle, index); if (!enabled) GTK.gtk_widget_set_sensitive (parentHandle, false); - GTK.gtk_widget_show (handle); + gtk_widget_show (handle); } } @@ -1067,7 +1067,7 @@ private void _setImage (Image image) { GTK3.gtk_image_set_from_surface(imageHandle, surface); } } - GTK.gtk_widget_show(imageHandle); + gtk_widget_show(imageHandle); } else { if (imageHandle != 0) { if (OS.SWT_PADDED_MENU_ITEMS) { @@ -1076,7 +1076,7 @@ private void _setImage (Image image) { if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); GTK.gtk_image_set_pixel_size (imageHandle, 16); GTK3.gtk_container_add (boxHandle, imageHandle); - GTK.gtk_widget_show (imageHandle); + gtk_widget_show (imageHandle); } else { GTK3.gtk_container_remove(boxHandle, imageHandle); imageHandle = 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java index f462cef7922..de4d87922b0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java @@ -592,7 +592,7 @@ void resizeHandle (int width, int height) { @Override void showWidget () { super.showWidget (); - if (scrolledHandle != 0) GTK.gtk_widget_show (scrolledHandle); + if (scrolledHandle != 0) gtk_widget_show (scrolledHandle); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index 9603ef610d9..3ffcf7adb34 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -2586,7 +2586,7 @@ public void setMenuBar (Menu menu) { if (menuBar != null) { long menuHandle = menuBar.handle; - GTK.gtk_widget_hide (menuHandle); + gtk_widget_hide (menuHandle); if (!GTK.GTK4) { destroyAccelGroup(); @@ -2595,7 +2595,7 @@ public void setMenuBar (Menu menu) { menuBar = menu; if (menuBar != null) { long menuHandle = menu.handle; - GTK.gtk_widget_show (menuHandle); + gtk_widget_show (menuHandle); if (!GTK.GTK4) { createAccelGroup(); @@ -2616,7 +2616,7 @@ public void setMinimized (boolean minimized) { if (this.minimized == minimized) return; super.setMinimized (minimized); if(!GTK.gtk_widget_get_visible(shellHandle)) { - GTK.gtk_widget_show(shellHandle); + gtk_widget_show(shellHandle); } if (minimized) { if (GTK.GTK4) { @@ -2929,13 +2929,13 @@ public void setVisible (boolean visible) { int [] init_width = new int[1], init_height = new int[1]; GTK3.gtk_window_get_size(shellHandle, init_width, init_height); GTK3.gtk_window_resize(shellHandle, 1, 1); - GTK.gtk_widget_show (shellHandle); + gtk_widget_show (shellHandle); GTK3.gtk_window_resize(shellHandle, init_width[0], init_height[0]); resizeBounds (init_width[0], init_height[0], false); oldWidth = init_width[0]; oldHeight = init_height[0]; } else { - GTK.gtk_widget_show (shellHandle); + gtk_widget_show (shellHandle); } /** * Feature in GTK: This handles grabbing the keyboard focus from a SWT.ON_TOP window @@ -3005,7 +3005,7 @@ public void setVisible (boolean visible) { } else { fixActiveShell (); checkAndUngrabFocus(); - GTK.gtk_widget_hide (shellHandle); + gtk_widget_hide (shellHandle); sendEvent (SWT.Hide); } } @@ -3064,9 +3064,9 @@ void showWidget () { GTK3.gtk_container_add (shellHandle, vboxHandle); } - if (scrolledHandle != 0) GTK.gtk_widget_show (scrolledHandle); - if (handle != 0) GTK.gtk_widget_show (handle); - if (vboxHandle != 0) GTK.gtk_widget_show (vboxHandle); + if (scrolledHandle != 0) gtk_widget_show (scrolledHandle); + if (handle != 0) gtk_widget_show (handle); + if (vboxHandle != 0) gtk_widget_show (vboxHandle); } @Override @@ -3104,7 +3104,7 @@ long sizeAllocateProc (long handle, long arg0, long user_data) { @Override long sizeRequestProc (long handle, long arg0, long user_data) { - GTK.gtk_widget_hide (handle); + gtk_widget_hide (handle); return 0; } @@ -3232,12 +3232,12 @@ void updateMinimized (boolean minimized) { if (minimized) { if (shells[i].isVisible ()) { shells[i].showWithParent = true; - GTK.gtk_widget_hide(shells[i].shellHandle); + gtk_widget_hide(shells[i].shellHandle); } } else { if (shells[i].showWithParent) { shells[i].showWithParent = false; - GTK.gtk_widget_show(shells[i].shellHandle); + gtk_widget_show(shells[i].shellHandle); } } } @@ -3319,7 +3319,7 @@ public void dispose () { if (popupChild != null && popupChild.shellHandle != 0 && !popupChild.isDisposed()) { popupChild.dispose(); } - GTK.gtk_widget_hide (shellHandle); + gtk_widget_hide (shellHandle); super.dispose (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java index 34de4c1dd5d..fd95057d491 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java @@ -304,11 +304,11 @@ void createItem (TabItem item, int index) { OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE); if (GTK.GTK4) { - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } else { - GTK.gtk_widget_show(boxHandle); - GTK.gtk_widget_show(labelHandle); - GTK.gtk_widget_show(pageHandle); + gtk_widget_show(boxHandle); + gtk_widget_show(labelHandle); + gtk_widget_show(pageHandle); } item.state |= HANDLE; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java index 20bbe33d14a..c93fe2b476e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java @@ -413,14 +413,14 @@ public void setImage (Image image) { } else { GTK3.gtk_image_set_from_surface(imageHandle, image.surface); } - GTK.gtk_widget_show(imageHandle); + gtk_widget_show(imageHandle); } else { if (GTK.GTK4) { GTK4.gtk_image_clear(imageHandle); } else { GTK3.gtk_image_set_from_surface(imageHandle, 0); } - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } } @@ -468,9 +468,9 @@ public void setText (String string) { byte [] buffer = Converter.wcsToMbcs (chars, true); GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer); if (string.length () != 0) { - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (labelHandle); } else { - GTK.gtk_widget_hide (labelHandle); + gtk_widget_hide (labelHandle); } } 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 ac264052508..2e358c828a0 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 @@ -737,13 +737,13 @@ void createItem (TableColumn column, int index) { GTK4.gtk_box_append(boxHandle, imageHandle); GTK4.gtk_box_append(boxHandle, labelHandle); - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } else { GTK3.gtk_container_add (boxHandle, imageHandle); GTK3.gtk_container_add (boxHandle, labelHandle); - GTK.gtk_widget_show (boxHandle); - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (boxHandle); + gtk_widget_show (labelHandle); } column.labelHandle = labelHandle; @@ -1492,9 +1492,9 @@ public int getHeaderHeight () { long buttonHandle = columns[i].buttonHandle; if (buttonHandle != 0) { if (!GTK.gtk_widget_get_visible(buttonHandle)) { - GTK.gtk_widget_show(buttonHandle); + gtk_widget_show(buttonHandle); gtk_widget_get_preferred_size(buttonHandle, requisition); - GTK.gtk_widget_hide(buttonHandle); + gtk_widget_hide(buttonHandle); } else { gtk_widget_get_preferred_size(buttonHandle, requisition); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java index f030a0fe9d6..444e94c5aae 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java @@ -463,10 +463,10 @@ public void pack () { if (buttonHandle != 0) { boolean hideHeader = !GTK.gtk_widget_get_visible(buttonHandle); GtkRequisition requisition = new GtkRequisition (); - GTK.gtk_widget_show(buttonHandle); + gtk_widget_show(buttonHandle); gtk_widget_get_preferred_size (buttonHandle, requisition); if (hideHeader) { - GTK.gtk_widget_hide(buttonHandle); + gtk_widget_hide(buttonHandle); } width = requisition.width; } @@ -627,14 +627,14 @@ public void setImage (Image image) { } else { GTK3.gtk_image_set_from_surface(imageHandle, headerImageList.getSurface(imageIndex)); } - GTK.gtk_widget_show(imageHandle); + gtk_widget_show(imageHandle); } else { if (GTK.GTK4) { GTK4.gtk_image_clear(imageHandle); } else { GTK3.gtk_image_set_from_surface(imageHandle, 0); } - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } } @@ -703,9 +703,9 @@ public void setText (String string) { byte [] buffer = Converter.wcsToMbcs (chars, true); GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer); if (string.length () != 0) { - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (labelHandle); } else { - GTK.gtk_widget_hide (labelHandle); + gtk_widget_hide (labelHandle); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java index acdc80e0690..419aebec04c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java @@ -306,8 +306,8 @@ void createHandle (int index) { GTK4.gtk_box_append(boxHandle, imageHandle); GTK4.gtk_box_append(boxHandle, labelHandle); - GTK.gtk_widget_hide(imageHandle); - GTK.gtk_widget_hide(labelHandle); + gtk_widget_hide(imageHandle); + gtk_widget_hide(labelHandle); } else { labelHandle = GTK.gtk_label_new_with_mnemonic(null); if (labelHandle == 0) error(SWT.ERROR_NO_HANDLES); @@ -1316,7 +1316,7 @@ void _setImage (Image image) { } if (GTK.GTK4) { - GTK.gtk_widget_show(imageHandle); + gtk_widget_show(imageHandle); long pixbuf = ImageList.createPixbuf(image); long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf); OS.g_object_unref(pixbuf); @@ -1327,7 +1327,7 @@ void _setImage (Image image) { } else { if(GTK.GTK4) { GTK4.gtk_image_clear(imageHandle); - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } else { GTK3.gtk_image_set_from_surface(imageHandle, 0); } @@ -1429,7 +1429,7 @@ public void setText (String string) { byte [] buffer = Converter.wcsToMbcs (chars, true); if (GTK.GTK4) { - GTK.gtk_widget_show(labelHandle); + gtk_widget_show(labelHandle); GTK.gtk_label_set_text_with_mnemonic(labelHandle, buffer); } else { GTK.gtk_label_set_text_with_mnemonic(labelHandle, buffer); @@ -1547,9 +1547,9 @@ void showWidget (int index) { } } } else { - if (handle != 0) GTK.gtk_widget_show (handle); - if (labelHandle != 0) GTK.gtk_widget_show (labelHandle); - if (imageHandle != 0) GTK.gtk_widget_show (imageHandle); + if (handle != 0) gtk_widget_show (handle); + if (labelHandle != 0) gtk_widget_show (labelHandle); + if (imageHandle != 0) gtk_widget_show (imageHandle); GTK3.gtk_toolbar_insert(parent.handle, handle, index); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java index e6a8a2fb342..3ec7d860b1d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java @@ -836,7 +836,7 @@ public void setVisible (boolean visible) { if (visible) { if ((style & SWT.BALLOON) != 0) { configure (); - GTK.gtk_widget_show (handle); + gtk_widget_show (handle); } else { long vboxHandle = parent.vboxHandle; StringBuilder string = new StringBuilder (text); @@ -854,7 +854,7 @@ public void setVisible (boolean visible) { } } else { if ((style & SWT.BALLOON) != 0) { - GTK.gtk_widget_hide (handle); + gtk_widget_hide (handle); } else { long vboxHandle = parent.vboxHandle; byte[] buffer = Converter.wcsToMbcs("", true); @@ -866,7 +866,7 @@ public void setVisible (boolean visible) { @Override long timerProc (long widget) { if ((style & SWT.BALLOON) != 0) { - GTK.gtk_widget_hide (handle); + gtk_widget_hide (handle); } return 0; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java index 6bcf48ba782..038041ca256 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java @@ -839,7 +839,7 @@ public boolean open () { Rectangle bounds = display.getBoundsInPixels(); GTK3.gtk_window_move (overlay, bounds.x, bounds.y); GTK3.gtk_window_resize (overlay, bounds.width, bounds.height); - GTK.gtk_widget_show (overlay); + gtk_widget_show (overlay); /* Tracker behaves like a Dialog with its own OS event loop. */ Display display = this.display; 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 1c872174a01..073f3882754 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 @@ -926,13 +926,13 @@ void createItem (TreeColumn column, int index) { GTK4.gtk_box_append(boxHandle, imageHandle); GTK4.gtk_box_append(boxHandle, labelHandle); - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } else { GTK3.gtk_container_add (boxHandle, imageHandle); GTK3.gtk_container_add (boxHandle, labelHandle); - GTK.gtk_widget_show (boxHandle); - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (boxHandle); + gtk_widget_show (labelHandle); } column.labelHandle = labelHandle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java index 3898fc2518d..ec2d754fa9a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java @@ -607,14 +607,14 @@ public void setImage (Image image) { } else { GTK3.gtk_image_set_from_surface(imageHandle, headerImageList.getSurface(imageIndex)); } - GTK.gtk_widget_show(imageHandle); + gtk_widget_show(imageHandle); } else { if (GTK.GTK4) { GTK4.gtk_image_clear(imageHandle); } else { GTK3.gtk_image_set_from_surface(imageHandle, 0); } - GTK.gtk_widget_hide(imageHandle); + gtk_widget_hide(imageHandle); } } @@ -681,9 +681,9 @@ public void setText (String string) { byte [] buffer = Converter.wcsToMbcs (chars, true); GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer); if (string.length () != 0) { - GTK.gtk_widget_show (labelHandle); + gtk_widget_show (labelHandle); } else { - GTK.gtk_widget_hide (labelHandle); + gtk_widget_hide (labelHandle); } } 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 13d5a7efaf9..92c3f16aafb 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 @@ -2759,4 +2759,14 @@ void notifyDisposalTracker() { } } +void gtk_widget_hide(long widget) { + if (GTK.GTK4) GTK.gtk_widget_set_visible(widget, false); + else GTK3.gtk_widget_hide(widget); +} + +void gtk_widget_show(long widget) { + if (GTK.GTK4) GTK.gtk_widget_set_visible(widget, true); + else GTK3.gtk_widget_show(widget); +} + }