Bug 546743 - [GTK] Remove Platform.lock (Part 2)

Clean up after automated locking function removal:

* Remove duplicate @category dbus comments in OS.java
* Fix Java errors due to renamed native functions.
* Fix C errors due to mismatched NO_* macro signtures (in os.h, cairo.h).

Fix the last uses of Platform.lock in Display.sleep and Display.post.

Remove the Platform.lock field itself and the Lock implementation.

Change-Id: Ie892cc90f50ae37697a2788e1ee60012e5b1304e
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>

15 files changed, 409 insertions, 617 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h
index 49fbeb2a8f..3670783b22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h
@@ -26,9 +26,9 @@
 #ifdef CAIRO_HAS_XLIB_SURFACE
 #include <cairo-xlib.h>
 #else
-#define NO__1cairo_1xlib_1surface_1create
-#define NO__1cairo_1xlib_1surface_1get_1height
-#define NO__1cairo_1xlib_1surface_1get_1width 
+#define NO_cairo_1xlib_1surface_1create
+#define NO_cairo_1xlib_1surface_1get_1height
+#define NO_cairo_1xlib_1surface_1get_1width
 #endif
 #include <string.h>
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Lock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Lock.java
deleted file mode 100644
index 971795e6e8..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Lock.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal;
-
-/**
- * Instances of this represent a recursive monitor.  Note that this
- * is an empty implementation which does not actually perform locking.
- */
-public class Lock {
-
-/**
- * Locks the monitor and returns the lock count. If
- * the lock is owned by another thread, wait until
- * the lock is released.
- *
- * @return the lock count
- */
-public int lock() {
-	return 0;
-}
-
-/**
- * Unlocks the monitor. If the current thread is not
- * the monitor owner, do nothing.
- */
-public void unlock() {
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
index 8dd0365dcd..06cf11fdb2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
@@ -16,7 +16,6 @@ package org.eclipse.swt.internal;
 
 public class Platform {
 	public static final String PLATFORM = "cocoa"; //$NON-NLS-1$
-	public static final Lock lock = new Lock ();
 
 public static boolean isLoadable () {
 	return Library.isLoadable ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index a21cea01b2..7d2cd84f73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -44,27 +44,27 @@
 #define NO_RTLD_1GLOBAL
 #define NO_RTLD_1LAZY
 #define NO_RTLD_1NOW
-#define NO__1dlclose
-#define NO__1dlopen
-#define NO__1dlsym
-
-#define NO__1gtk_1enumerate_1printers
-#define NO__1gtk_1printer_1get_1name
-#define NO__1gtk_1printer_1is_1default
-#define NO__1gtk_1print_1job_1get_1surface
-#define NO__1gtk_1print_1unix_1dialog_1get_1current_1page
-#define NO__1gtk_1print_1unix_1dialog_1get_1selected_1printer
-#define NO__1gtk_1print_1unix_1dialog_1get_1settings
-#define NO__1gtk_1print_1unix_1dialog_1set_1settings
-#define NO__1gtk_1print_1unix_1dialog_1get_1page_1setup
-#define NO__1gtk_1print_1unix_1dialog_1set_1page_1setup
-#define NO__1gtk_1printer_1get_1backend
-#define NO__1gtk_1print_1unix_1dialog_1new
-#define NO__1gtk_1print_1job_1new
-#define NO__1gtk_1print_1job_1send
-#define NO__1gtk_1print_1unix_1dialog_1set_1current_1page
-#define NO__1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup
-#define NO__1gtk_1print_1unix_1dialog_1set_1manual_1capabilities
+#define NO_dlclose
+#define NO_dlopen
+#define NO_dlsym
+
+#define NO_gtk_1enumerate_1printers
+#define NO_gtk_1printer_1get_1name
+#define NO_gtk_1printer_1is_1default
+#define NO_gtk_1print_1job_1get_1surface
+#define NO_gtk_1print_1unix_1dialog_1get_1current_1page
+#define NO_gtk_1print_1unix_1dialog_1get_1selected_1printer
+#define NO_gtk_1print_1unix_1dialog_1get_1settings
+#define NO_gtk_1print_1unix_1dialog_1set_1settings
+#define NO_gtk_1print_1unix_1dialog_1get_1page_1setup
+#define NO_gtk_1print_1unix_1dialog_1set_1page_1setup
+#define NO_gtk_1printer_1get_1backend
+#define NO_gtk_1print_1unix_1dialog_1new
+#define NO_gtk_1print_1job_1new
+#define NO_gtk_1print_1job_1send
+#define NO_gtk_1print_1unix_1dialog_1set_1current_1page
+#define NO_gtk_1print_1unix_1dialog_1set_1embed_1page_1setup
+#define NO_gtk_1print_1unix_1dialog_1set_1manual_1capabilities
 
 // map realpath to a similar function in win32
 #define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
@@ -103,16 +103,16 @@
 #if defined(GDK_WINDOWING_X11)
 #if !GTK_CHECK_VERSION(3,96,0)
 #include <gtk/gtkx.h>
-#define NO__1gdk_1x11_1surface_1get_1xid
-#define NO__1gdk_1x11_1surface_1lookup_1for_1display
+#define NO_gdk_1x11_1surface_1get_1xid
+#define NO_gdk_1x11_1surface_1lookup_1for_1display
 #else
-#define NO__1gdk_1x11_1get_1default_1xdisplay
-#define NO__1gdk_1x11_1window_1get_1xid
-#define NO__1gdk_1x11_1window_1lookup_1for_1display
-#define NO__1GTK_1IS_1PLUG
-#define NO__1gtk_1plug_1new
-#define NO__1gtk_1socket_1get_1id
-#define NO__1gtk_1socket_1new
+#define NO_gdk_1x11_1get_1default_1xdisplay
+#define NO_gdk_1x11_1window_1get_1xid
+#define NO_gdk_1x11_1window_1lookup_1for_1display
+#define NO_GTK_1IS_1PLUG
+#define NO_gtk_1plug_1new
+#define NO_gtk_1socket_1get_1id
+#define NO_gtk_1socket_1new
 #endif
 #if !GTK_CHECK_VERSION(3,96,0)
 #include <gdk/gdkx.h>
@@ -132,39 +132,39 @@
 #define NO_X_1EVENT_1WINDOW
 
 /* X functions */
-#define NO__1XCheckIfEvent
-#define NO__1XDefaultScreen
-#define NO__1XDefaultRootWindow
-#define NO__1XFree
-#define NO__1XGetWindowProperty
-#define NO__1XQueryPointer
-#define NO__1XKeysymToKeycode
-#define NO__1XSendEvent
-#define NO__1XSetInputFocus
-#define NO__1XSetErrorHandler
-#define NO__1XSetIOErrorHandler
-#define NO__1XSetTransientForHint
-#define NO__1XSynchronize
-#define NO__1XWarpPointer
-#define NO__1GDK_1PIXMAP_1XID
-#define NO__1gdk_1x11_1display_1error_1trap_1pop_1ignored
-#define NO__1gdk_1x11_1display_1error_1trap_1push
-#define NO__1gdk_1x11_1display_1get_1xdisplay
-#define NO__1gdk_1x11_1display_1utf8_1to_1compound_1text
-#define NO__1gdk_1x11_1drawable_1get_1xdisplay
-#define NO__1gdk_1x11_1drawable_1get_1xid
-#define NO__1gdk_1x11_1get_1default_1xdisplay
-#define NO__1gdk_1x11_1screen_1get_1window_1manager_1name
-#define NO__1gdk_1x11_1screen_1lookup_1visual
-#define NO__1gdk_1x11_1visual_1get_1xvisual
-#define NO__1gdk_1x11_1window_1get_1xid
-#define NO__1gdk_1x11_1window_1lookup_1for_1display
-#define NO__1gdk_window_lookup
-#define NO__1gdk_window_add_filter
-#define NO__1GTK_1IS_1PLUG
-#define NO__1gtk_1plug_1new
-#define NO__1gtk_1socket_1get_1id
-#define NO__1gtk_1socket_1new
+#define NO_XCheckIfEvent
+#define NO_XDefaultScreen
+#define NO_XDefaultRootWindow
+#define NO_XFree
+#define NO_XGetWindowProperty
+#define NO_XQueryPointer
+#define NO_XKeysymToKeycode
+#define NO_XSendEvent
+#define NO_XSetInputFocus
+#define NO_XSetErrorHandler
+#define NO_XSetIOErrorHandler
+#define NO_XSetTransientForHint
+#define NO_XSynchronize
+#define NO_XWarpPointer
+#define NO_GDK_1PIXMAP_1XID
+#define NO_gdk_1x11_1display_1error_1trap_1pop_1ignored
+#define NO_gdk_1x11_1display_1error_1trap_1push
+#define NO_gdk_1x11_1display_1get_1xdisplay
+#define NO_gdk_1x11_1display_1utf8_1to_1compound_1text
+#define NO_gdk_1x11_1drawable_1get_1xdisplay
+#define NO_gdk_1x11_1drawable_1get_1xid
+#define NO_gdk_1x11_1get_1default_1xdisplay
+#define NO_gdk_1x11_1screen_1get_1window_1manager_1name
+#define NO_gdk_1x11_1screen_1lookup_1visual
+#define NO_gdk_1x11_1visual_1get_1xvisual
+#define NO_gdk_1x11_1window_1get_1xid
+#define NO_gdk_1x11_1window_1lookup_1for_1display
+#define NO_gdk_window_lookup
+#define NO_gdk_window_add_filter
+#define NO_GTK_1IS_1PLUG
+#define NO_gtk_1plug_1new
+#define NO_gtk_1socket_1get_1id
+#define NO_gtk_1socket_1new
 #define NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J
 #define NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I
 #define NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I
@@ -224,161 +224,161 @@
 #define NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ
 
 // No GtkClipboard on GTK4
-#define NO__1gtk_1clipboard_1clear
-#define NO__1gtk_1clipboard_1get
-#define NO__1gtk_1clipboard_1set_1can_1store
-#define NO__1gtk_1clipboard_1set_1with_1owner
-#define NO__1gtk_1clipboard_1store
-#define NO__1gtk_1clipboard_1wait_1for_1contents
+#define NO_gtk_1clipboard_1clear
+#define NO_gtk_1clipboard_1get
+#define NO_gtk_1clipboard_1set_1can_1store
+#define NO_gtk_1clipboard_1set_1with_1owner
+#define NO_gtk_1clipboard_1store
+#define NO_gtk_1clipboard_1wait_1for_1contents
 
 // No GtkStatusIcon on GTK4
-#define NO__1gtk_1status_1icon_1get_1geometry
-#define NO__1gtk_1status_1icon_1get_1visible
-#define NO__1gtk_1status_1icon_1new
-#define NO__1gtk_1status_1icon_1position_1menu_1func
-#define NO__1gtk_1status_1icon_1set_1from_1pixbuf
-#define NO__1gtk_1status_1icon_1set_1tooltip_1text
-#define NO__1gtk_1status_1icon_1set_1visible
+#define NO_gtk_1status_1icon_1get_1geometry
+#define NO_gtk_1status_1icon_1get_1visible
+#define NO_gtk_1status_1icon_1new
+#define NO_gtk_1status_1icon_1position_1menu_1func
+#define NO_gtk_1status_1icon_1set_1from_1pixbuf
+#define NO_gtk_1status_1icon_1set_1tooltip_1text
+#define NO_gtk_1status_1icon_1set_1visible
 
 // No GtkTargetList on GTK4
-#define NO__1gtk_1target_1list_1new
-#define NO__1gtk_1target_1list_1unref
+#define NO_gtk_1target_1list_1new
+#define NO_gtk_1target_1list_1unref
 
 // No GdkScreen on GTK4, including parameter casts
-#define NO__1gtk_1widget_1get_1screen
-#define NO__1gtk_1style_1context_1add_1provider_1for_1screen
-#define NO__1gdk_1device_1warp__IIII
-#define NO__1gdk_1device_1warp__JJII
-#define NO__1gdk_1screen_1get_1default
-#define NO__1gdk_1screen_1get_1monitor_1at_1point
-#define NO__1gdk_1screen_1get_1monitor_1at_1window
-#define NO__1gdk_1screen_1get_1monitor_1geometry
-#define NO__1gdk_1screen_1get_1monitor_1scale_1factor
-#define NO__1gdk_1screen_1get_1monitor_1workarea
-#define NO__1gdk_1screen_1get_1n_1monitors
-#define NO__1gdk_1screen_1get_1primary_1monitor
-#define NO__1gdk_1screen_1get_1resolution
-#define NO__1gdk_1screen_1get_1system_1visual
-#define NO__1gdk_1screen_1get_1window_1stack
-#define NO__1gdk_1screen_1is_1composited
+#define NO_gtk_1widget_1get_1screen
+#define NO_gtk_1style_1context_1add_1provider_1for_1screen
+#define NO_gdk_1device_1warp__IIII
+#define NO_gdk_1device_1warp__JJII
+#define NO_gdk_1screen_1get_1default
+#define NO_gdk_1screen_1get_1monitor_1at_1point
+#define NO_gdk_1screen_1get_1monitor_1at_1window
+#define NO_gdk_1screen_1get_1monitor_1geometry
+#define NO_gdk_1screen_1get_1monitor_1scale_1factor
+#define NO_gdk_1screen_1get_1monitor_1workarea
+#define NO_gdk_1screen_1get_1n_1monitors
+#define NO_gdk_1screen_1get_1primary_1monitor
+#define NO_gdk_1screen_1get_1resolution
+#define NO_gdk_1screen_1get_1system_1visual
+#define NO_gdk_1screen_1get_1window_1stack
+#define NO_gdk_1screen_1is_1composited
 
 // Miscellaneous functions removed from GTK4
-#define NO__1gtk_1misc_1set_1alignment
-#define NO__1gdk_1test_1simulate_1button
-#define NO__1gdk_1test_1simulate_1key
-#define NO__1gdk_1atom_1name
-#define NO__1gdk_1cairo_1create
+#define NO_gtk_1misc_1set_1alignment
+#define NO_gdk_1test_1simulate_1button
+#define NO_gdk_1test_1simulate_1key
+#define NO_gdk_1atom_1name
+#define NO_gdk_1cairo_1create
 #define NO_gdk_1threads_1leave
-#define NO__1gdk_1selection_1owner_1set
-#define NO__1gdk_1selection_1owner_1get
-#define NO__1gdk_1visual_1get_1depth
-#define NO__1gtk_1widget_1style_1get__I_3B_3II
-#define NO__1gtk_1widget_1style_1get__J_3B_3IJ
-#define NO__1gtk_1widget_1style_1get__I_3B_3JI
-#define NO__1gtk_1widget_1style_1get__J_3B_3JJ
-#define NO__1gtk_1css_1provider_1load_1from_1data__I_3BI_3I
-#define NO__1gtk_1css_1provider_1load_1from_1data__J_3BJ_3J
-#define NO__1gdk_1pixbuf_1get_1from_1window
+#define NO_gdk_1selection_1owner_1set
+#define NO_gdk_1selection_1owner_1get
+#define NO_gdk_1visual_1get_1depth
+#define NO_gtk_1widget_1style_1get__I_3B_3II
+#define NO_gtk_1widget_1style_1get__J_3B_3IJ
+#define NO_gtk_1widget_1style_1get__I_3B_3JI
+#define NO_gtk_1widget_1style_1get__J_3B_3JJ
+#define NO_gtk_1css_1provider_1load_1from_1data__I_3BI_3I
+#define NO_gtk_1css_1provider_1load_1from_1data__J_3BJ_3J
+#define NO_gdk_1pixbuf_1get_1from_1window
 
 // Some GtkContainer functions don't exist on GTK4
-#define NO__1gtk_1container_1propagate_1draw
-#define NO__1gtk_1container_1set_1border_1width
-#define NO__1gtk_1container_1get_1border_1width
+#define NO_gtk_1container_1propagate_1draw
+#define NO_gtk_1container_1set_1border_1width
+#define NO_gtk_1container_1get_1border_1width
 
 /**
  * Some gtk_drag_* functions exist on both versions,
  * but with different signatures. Define them in both GTK4
  * and GTK3.
  */
-#define NO__1gtk_1drag_1begin_1with_1coordinates__IIIIIII
-#define NO__1gtk_1drag_1begin_1with_1coordinates__JJIIJII
-#define NO__1gtk_1drag_1get_1data__IIII
-#define NO__1gtk_1drag_1get_1data__JJJI
+#define NO_gtk_1drag_1begin_1with_1coordinates__IIIIIII
+#define NO_gtk_1drag_1begin_1with_1coordinates__JJIIJII
+#define NO_gtk_1drag_1get_1data__IIII
+#define NO_gtk_1drag_1get_1data__JJJI
 
 // Some gtk_drag_* functions were removed in GTK4
-#define NO__1gtk_1drag_1begin
-#define NO__1gtk_1drag_1dest_1set
-#define NO__1gtk_1drag_1dest_1find_1target
-#define NO__1gtk_1drag_1finish
-#define NO__1gtk_1drag_1set_1icon_1surface
+#define NO_gtk_1drag_1begin
+#define NO_gtk_1drag_1dest_1set
+#define NO_gtk_1drag_1dest_1find_1target
+#define NO_gtk_1drag_1finish
+#define NO_gtk_1drag_1set_1icon_1surface
 
 // Some sizing functions are not available on GTK4
-#define NO__1gtk_1window_1set_1geometry_1hints
+#define NO_gtk_1window_1set_1geometry_1hints
 
 // No GdkWindow on GTK4, this includes parameter casting
-#define NO__1gtk_1widget_1set_1has_1window
-#define NO__1gtk_1widget_1get_1has_1window
-#define NO__1gtk_1im_1context_1set_1client_1window
-#define NO__1gtk_1widget_1set_1parent_1window
-#define NO__1gdk_1cairo_1set_1source_1window
-#define NO__1gdk_1device_1grab
-#define NO__1gdk_1display_1get_1monitor_1at_1window
-#define NO__1gdk_1get_1default_1root_1window
-#define NO__1gdk_1property_1get
-#define NO__1gdk_1window_1begin_1draw_1frame
-#define NO__1gdk_1window_1create_1similar_1surface
-#define NO__1gdk_1window_1destroy
-#define NO__1gdk_1window_1end_1draw_1frame
-#define NO__1gdk_1window_1focus
-#define NO__1gdk_1window_1get_1children
-#define NO__1gdk_1window_1get_1device_1position
-#define NO__1gdk_1window_1get_1display
-#define NO__1gdk_1window_1set_1events
-#define NO__1gdk_1window_1get_1events
-#define NO__1gdk_1window_1get_1frame_1extents
-#define NO__1gdk_1window_1get_1height
-#define NO__1gdk_1window_1get_1width
-#define NO__1gdk_1window_1get_1origin
-#define NO__1gdk_1window_1get_1parent
-#define NO__1gdk_1window_1get_1root_1origin
-#define NO__1gdk_1window_1get_1state
-#define NO__1gdk_1window_1get_1user_1data
-#define NO__1gdk_1window_1get_1visible_1region
-#define NO__1gdk_1window_1show
-#define NO__1gdk_1window_1hide
-#define NO__1gdk_1window_1invalidate_1rect
-#define NO__1gdk_1window_1invalidate_1region
-#define NO__1gdk_1window_1raise
-#define NO__1gdk_1window_1lower
-#define NO__1gdk_1window_1move
-#define NO__1gdk_1window_1move_1resize
-#define NO__1gdk_1window_1new
-#define NO__1gdk_1window_1process_1updates
-#define NO__1gdk_1window_1resize
-#define NO__1gdk_1window_1restack
-#define NO__1gdk_1window_1set_1cursor
-#define NO__1gdk_1window_1set_1decorations
-#define NO__1gdk_1window_1set_1functions
-#define NO__1gdk_1window_1set_1override_1redirect
-#define NO__1gdk_1window_1set_1user_1data
-#define NO__1gdk_1window_1show_1unraised
-#define NO__1gdk_1device_1get_1window_1at_1position
-#define NO__1gdk_1window_1set_1background_1pattern
-#define NO__1gdk_1event_1get_1window
+#define NO_gtk_1widget_1set_1has_1window
+#define NO_gtk_1widget_1get_1has_1window
+#define NO_gtk_1im_1context_1set_1client_1window
+#define NO_gtk_1widget_1set_1parent_1window
+#define NO_gdk_1cairo_1set_1source_1window
+#define NO_gdk_1device_1grab
+#define NO_gdk_1display_1get_1monitor_1at_1window
+#define NO_gdk_1get_1default_1root_1window
+#define NO_gdk_1property_1get
+#define NO_gdk_1window_1begin_1draw_1frame
+#define NO_gdk_1window_1create_1similar_1surface
+#define NO_gdk_1window_1destroy
+#define NO_gdk_1window_1end_1draw_1frame
+#define NO_gdk_1window_1focus
+#define NO_gdk_1window_1get_1children
+#define NO_gdk_1window_1get_1device_1position
+#define NO_gdk_1window_1get_1display
+#define NO_gdk_1window_1set_1events
+#define NO_gdk_1window_1get_1events
+#define NO_gdk_1window_1get_1frame_1extents
+#define NO_gdk_1window_1get_1height
+#define NO_gdk_1window_1get_1width
+#define NO_gdk_1window_1get_1origin
+#define NO_gdk_1window_1get_1parent
+#define NO_gdk_1window_1get_1root_1origin
+#define NO_gdk_1window_1get_1state
+#define NO_gdk_1window_1get_1user_1data
+#define NO_gdk_1window_1get_1visible_1region
+#define NO_gdk_1window_1show
+#define NO_gdk_1window_1hide
+#define NO_gdk_1window_1invalidate_1rect
+#define NO_gdk_1window_1invalidate_1region
+#define NO_gdk_1window_1raise
+#define NO_gdk_1window_1lower
+#define NO_gdk_1window_1move
+#define NO_gdk_1window_1move_1resize
+#define NO_gdk_1window_1new
+#define NO_gdk_1window_1process_1updates
+#define NO_gdk_1window_1resize
+#define NO_gdk_1window_1restack
+#define NO_gdk_1window_1set_1cursor
+#define NO_gdk_1window_1set_1decorations
+#define NO_gdk_1window_1set_1functions
+#define NO_gdk_1window_1set_1override_1redirect
+#define NO_gdk_1window_1set_1user_1data
+#define NO_gdk_1window_1show_1unraised
+#define NO_gdk_1device_1get_1window_1at_1position
+#define NO_gdk_1window_1set_1background_1pattern
+#define NO_gdk_1event_1get_1window
 
 // GdkDragContext removals
-#define NO__1gdk_1drag_1context_1get_1dest_1window
-#define NO__1gdk_1drag_1context_1list_1targets
-#define NO__1gdk_1drag_1status
+#define NO_gdk_1drag_1context_1get_1dest_1window
+#define NO_gdk_1drag_1context_1list_1targets
+#define NO_gdk_1drag_1status
 
 // Some widgets have removed access to their GdkWindows in GTK4
-#define NO__1gtk_1text_1view_1get_1window
-#define NO__1gtk_1tree_1view_1get_1bin_1window
+#define NO_gtk_1text_1view_1get_1window
+#define NO_gtk_1tree_1view_1get_1bin_1window
 
 // Event related functions removed in GTK4
-#define NO__1gdk_1event_1free
-#define NO__1gdk_1event_1get
-#define NO__1gdk_1event_1peek
-#define NO__1gdk_1event_1put
+#define NO_gdk_1event_1free
+#define NO_gdk_1event_1get
+#define NO_gdk_1event_1peek
+#define NO_gdk_1event_1put
 #define NO_GDK_1EVENT_1TYPE
 #define NO_GDK_1EVENT_1WINDOW
 
 // GdkCursor removals
-#define NO__1gdk_1cursor_1new_1for_1display
-#define NO__1gdk_1cursor_1new_1from_1pixbuf
-#define NO__1gdk_1display_1supports_1cursor_1color
-#define NO__1gdk_1cursor_1new_1from_1name__I_3B
-#define NO__1gdk_1cursor_1new_1from_1name__J_3B
+#define NO_gdk_1cursor_1new_1for_1display
+#define NO_gdk_1cursor_1new_1from_1pixbuf
+#define NO_gdk_1display_1supports_1cursor_1color
+#define NO_gdk_1cursor_1new_1from_1name__I_3B
+#define NO_gdk_1cursor_1new_1from_1name__J_3B
 
 #else
 
@@ -387,96 +387,96 @@
  * but with different signatures. Define them in both GTK4
  * and GTK3.
  */
-#define NO__1gtk_1drag_1begin_1with_1coordinates__IIIIII
-#define NO__1gtk_1drag_1begin_1with_1coordinates__JJJIII
-#define NO__1gtk_1drag_1get_1data__III
-#define NO__1gtk_1drag_1get_1data__JJJ
+#define NO_gtk_1drag_1begin_1with_1coordinates__IIIIII
+#define NO_gtk_1drag_1begin_1with_1coordinates__JJJIII
+#define NO_gtk_1drag_1get_1data__III
+#define NO_gtk_1drag_1get_1data__JJJ
 
 // No GdkSurface on GTK3
-#define NO__1gtk_1widget_1set_1has_1surface
-#define NO__1gtk_1widget_1get_1has_1surface
-#define NO__1gtk_1widget_1set_1parent_1surface
-#define NO__1gdk_1surface_1create_1similar_1surface
-#define NO__1gdk_1surface_1destroy
-#define NO__1gdk_1surface_1focus
-#define NO__1gdk_1device_1get_1surface_1at_1position
-#define NO__1gdk_1surface_1lower
-#define NO__1gdk_1surface_1raise
-#define NO__1gdk_1surface_1get_1children
-#define NO__1gdk_1surface_1get_1user_1data
-#define NO__1gdk_1surface_1get_1origin
-#define NO__1gdk_1surface_1invalidate_1rect
-#define NO__1gdk_1surface_1get_1display
-#define NO__1gdk_1surface_1set_1cursor
-#define NO__1gdk_1surface_1new_1child
-#define NO__1gdk_1surface_1set_1user_1data
-#define NO__1gdk_1surface_1restack
-#define NO__1gdk_1surface_1show_1unraised
-#define NO__1gdk_1surface_1show
-#define NO__1gdk_1surface_1get_1device_1position
-#define NO__1gdk_1display_1get_1monitor_1at_1surface
-#define NO__1gdk_1surface_1get_1frame_1extents
-#define NO__1gdk_1surface_1get_1width
-#define NO__1gdk_1surface_1get_1height
-#define NO__1gdk_1surface_1get_1state
-#define NO__1gdk_1surface_1resize
-#define NO__1gdk_1surface_1move
-#define NO__1gdk_1surface_1move_1resize
-#define NO__1gdk_1surface_1hide
-#define NO__1gdk_1surface_1set_1decorations
-#define NO__1gdk_1surface_1set_1functions
-#define NO__1gdk_1surface_1get_1root_1origin
-#define NO__1gdk_1surface_1invalidate_1region
-#define NO__1gdk_1event_1get_1surface
+#define NO_gtk_1widget_1set_1has_1surface
+#define NO_gtk_1widget_1get_1has_1surface
+#define NO_gtk_1widget_1set_1parent_1surface
+#define NO_gdk_1surface_1create_1similar_1surface
+#define NO_gdk_1surface_1destroy
+#define NO_gdk_1surface_1focus
+#define NO_gdk_1device_1get_1surface_1at_1position
+#define NO_gdk_1surface_1lower
+#define NO_gdk_1surface_1raise
+#define NO_gdk_1surface_1get_1children
+#define NO_gdk_1surface_1get_1user_1data
+#define NO_gdk_1surface_1get_1origin
+#define NO_gdk_1surface_1invalidate_1rect
+#define NO_gdk_1surface_1get_1display
+#define NO_gdk_1surface_1set_1cursor
+#define NO_gdk_1surface_1new_1child
+#define NO_gdk_1surface_1set_1user_1data
+#define NO_gdk_1surface_1restack
+#define NO_gdk_1surface_1show_1unraised
+#define NO_gdk_1surface_1show
+#define NO_gdk_1surface_1get_1device_1position
+#define NO_gdk_1display_1get_1monitor_1at_1surface
+#define NO_gdk_1surface_1get_1frame_1extents
+#define NO_gdk_1surface_1get_1width
+#define NO_gdk_1surface_1get_1height
+#define NO_gdk_1surface_1get_1state
+#define NO_gdk_1surface_1resize
+#define NO_gdk_1surface_1move
+#define NO_gdk_1surface_1move_1resize
+#define NO_gdk_1surface_1hide
+#define NO_gdk_1surface_1set_1decorations
+#define NO_gdk_1surface_1set_1functions
+#define NO_gdk_1surface_1get_1root_1origin
+#define NO_gdk_1surface_1invalidate_1region
+#define NO_gdk_1event_1get_1surface
 
 // No GdkClipboard on GTK3
-#define NO__1gdk_1clipboard_1set_1content
-#define NO__1gdk_1display_1get_1clipboard
-#define NO__1gdk_1display_1get_1primary_1clipboard
+#define NO_gdk_1clipboard_1set_1content
+#define NO_gdk_1display_1get_1clipboard
+#define NO_gdk_1display_1get_1primary_1clipboard
 
 // No GtkSnapshot on GTK3
-#define NO__1gtk_1snapshot_1append_1cairo
-#define NO__1gtk_1widget_1snapshot_1child
+#define NO_gtk_1snapshot_1append_1cairo
+#define NO_gtk_1widget_1snapshot_1child
 
 // No Graphene library on GTK3
-#define NO__1graphene_1rect_1alloc
-#define NO__1graphene_1rect_1free
-#define NO__1graphene_1rect_1init
+#define NO_graphene_1rect_1alloc
+#define NO_graphene_1rect_1free
+#define NO_graphene_1rect_1init
 
 // Miscellaneous functions not present on GTK3
-#define NO__1gdk_1device_1warp__III
-#define NO__1gdk_1device_1warp__JII
-#define NO__1gdk_1display_1get_1keymap
-#define NO__1gtk_1widget_1measure
-#define NO__1gtk_1style_1context_1add_1provider_1for_1display
-#define NO__1gtk_1widget_1get_1first_1child
-#define NO__1gtk_1widget_1get_1next_1sibling
-#define NO__1gtk_1css_1provider_1load_1from_1data__I_3BI
-#define NO__1gtk_1css_1provider_1load_1from_1data__J_3BJ
-#define NO__1gdk_1display_1is_1composited
-#define NO__1gtk_1gesture_1multi_1press_1new
-#define NO__1gtk_1style_1context_1get_1margin
+#define NO_gdk_1device_1warp__III
+#define NO_gdk_1device_1warp__JII
+#define NO_gdk_1display_1get_1keymap
+#define NO_gtk_1widget_1measure
+#define NO_gtk_1style_1context_1add_1provider_1for_1display
+#define NO_gtk_1widget_1get_1first_1child
+#define NO_gtk_1widget_1get_1next_1sibling
+#define NO_gtk_1css_1provider_1load_1from_1data__I_3BI
+#define NO_gtk_1css_1provider_1load_1from_1data__J_3BJ
+#define NO_gdk_1display_1is_1composited
+#define NO_gtk_1gesture_1multi_1press_1new
+#define NO_gtk_1style_1context_1get_1margin
 
 // GdkCursor API changes from GTK3 -> GTK4
-#define NO__1gdk_1cursor_1new_1from_1name___3BI
-#define NO__1gdk_1cursor_1new_1from_1name___3BJ
-#define NO__1gdk_1cursor_1new_1from_1texture
-#define NO__1gtk_1widget_1set_1cursor
+#define NO_gdk_1cursor_1new_1from_1name___3BI
+#define NO_gdk_1cursor_1new_1from_1name___3BJ
+#define NO_gdk_1cursor_1new_1from_1texture
+#define NO_gtk_1widget_1set_1cursor
 
 // No GdkTexture on GTK3
-#define NO__1gdk_1texture_1new_1for_1pixbuf
+#define NO_gdk_1texture_1new_1for_1pixbuf
 
 // GtkEventController related functions for GTK4
-#define NO__1gtk_1event_1controller_1key_1new
-#define NO__1gtk_1event_1controller_1motion_1new
-#define NO__1gtk_1event_1controller_1scroll_1new
-#define NO__1gtk_1widget_1add_1controller
+#define NO_gtk_1event_1controller_1key_1new
+#define NO_gtk_1event_1controller_1motion_1new
+#define NO_gtk_1event_1controller_1scroll_1new
+#define NO_gtk_1widget_1add_1controller
 
 // GdkEvent functions which do not exist on GTK3
-#define NO__1gdk_1event_1get_1focus_1in
-#define NO__1gdk_1event_1get_1string
-#define NO__1gdk_1event_1get_1key_1group
-#define NO__1gdk_1event_1get_1crossing_1mode
+#define NO_gdk_1event_1get_1focus_1in
+#define NO_gdk_1event_1get_1string
+#define NO_gdk_1event_1get_1key_1group
+#define NO_gdk_1event_1get_1crossing_1mode
 #endif
 
 #include "os_custom.h"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
index 6fef2cf06e..9b0d2da25e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
@@ -21,7 +21,7 @@
 
 JavaVM *cached_jvm = NULL;
 
-JNIEXPORT void JNICALL OS_NATIVE(_1cachejvmptr)
+JNIEXPORT void JNICALL OS_NATIVE(cachejvmptr)
 	(JNIEnv *env, jclass that)
 {
 	/* cache the JavaVM pointer */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java
deleted file mode 100644
index aff4e47255..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal;
-
-/**
- * Instances of this represent a recursive monitor.
- */
-public class Lock {
-	int count, waitCount;
-	Thread owner;
-
-/**
- * Locks the monitor and returns the lock count. If
- * the lock is owned by another thread, wait until
- * the lock is released.
- *
- * @return the lock count
- */
-public int lock() {
-	synchronized (this) {
-		Thread current = Thread.currentThread();
-		if (owner != current) {
-			waitCount++;
-			while (count > 0) {
-				try {
-					wait();
-				} catch (InterruptedException e) {
-					/* Wait forever, just like synchronized blocks */
-				}
-			}
-			--waitCount;
-			owner = current;
-		}
-		return ++count;
-	}
-}
-
-/**
- * Unlocks the monitor. If the current thread is not
- * the monitor owner, do nothing.
- */
-public void unlock() {
-	synchronized (this) {
-		Thread current = Thread.currentThread();
-		if (owner == current) {
-			if (--count == 0) {
-				owner = null;
-				if (waitCount > 0) notifyAll();
-			}
-		}
-	}
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Platform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Platform.java
index 37f4d3a111..3b6c5e7258 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Platform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Platform.java
@@ -17,7 +17,6 @@ package org.eclipse.swt.internal;
 
 public class Platform {
 	public static final String PLATFORM = "gtk"; //$NON-NLS-1$
-	public static final Lock lock = new Lock ();
 
 public static boolean isLoadable () {
 	return Library.isLoadable ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index e3b317aca5..5611bbc433 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -2129,7 +2129,6 @@ public static final native long g_dbus_proxy_call_finish(long proxy, long res, l
  * @param error cast=(GError **)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_node_info_new_for_xml(byte[] xml_data, long [] error);
 
 /**
@@ -2143,7 +2142,6 @@ public static final native long g_dbus_node_info_new_for_xml(byte[] xml_data, lo
  * @param user_data_free_func cast=(GDestroyNotify)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native int g_bus_own_name(int bus_type, byte[] name, int flags, long bus_acquired_handler, long name_acquired_handler, long name_lost_handler, long  user_data, long user_data_free_func);
 
 /**
@@ -2159,7 +2157,6 @@ public static final native int g_bus_own_name(int bus_type, byte[] name, int fla
  * @param user_data cast=(gpointer)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_dbus_connection_call(long connection, byte [] bus_name, byte [] object_path, byte [] interface_name, byte [] method_name, long param, long reply_type, int flag, int timeout, long cancellable, long callback, long user_data);
 
 /**
@@ -2182,7 +2179,6 @@ public static final native long g_dbus_connection_call_finish(long proxy, long r
  * @param error cast=(GError **)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_connection_call_sync(long connection, byte [] bus_name, byte [] object_path, byte [] interface_name, byte [] method_name, long param, long reply_type, int flag, int timeout, long cancellable, long [] error);
 
 /**
@@ -2191,14 +2187,12 @@ public static final native long g_dbus_connection_call_sync(long connection, byt
  * @param error cast=(GError **)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native boolean g_dbus_connection_close_sync(long connection, long cancellable, long [] error);
 
 /**
  * @param connection cast=(GDBusConnection *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native boolean g_dbus_connection_is_closed(long connection);
 
 /**
@@ -2209,7 +2203,6 @@ public static final native boolean g_dbus_connection_is_closed(long connection);
  * @param user_data cast=(gpointer)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_dbus_connection_new_for_address(byte[] address, int flags, long observer, long cancellable, long callback, long user_data);
 
 /**
@@ -2217,7 +2210,6 @@ public static final native void g_dbus_connection_new_for_address(byte[] address
  * @param error cast=(GError **)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_connection_new_for_address_finish(long result, long [] error);
 
 /**
@@ -2230,7 +2222,6 @@ public static final native long g_dbus_connection_new_for_address_finish(long re
  * @param error cast=(GError **)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native int g_dbus_connection_register_object(long connection, byte[] object_path, long interface_info, long [] vtable, long user_data, long user_data_free_func, long [] error);
 
 /**
@@ -2238,7 +2229,6 @@ public static final native int g_dbus_connection_register_object(long connection
  * @param name cast=(const gchar *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_node_info_lookup_interface(long info, byte [] name);
 
 /**
@@ -2246,7 +2236,6 @@ public static final native long g_dbus_node_info_lookup_interface(long info, byt
  * @param parameters cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_dbus_method_invocation_return_value(long invocation, long parameters);
 
 /**
@@ -2258,47 +2247,40 @@ public static final native void g_dbus_method_invocation_return_value(long invoc
  * @param error cast=(GError **)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_server_new_sync(long address, int flags, long guid, long observer, long cancellable, long [] error);
 
 /**
  * @param server cast=(GDBusServer *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_dbus_server_start(long server);
 
 /**
  * @param server cast=(GDBusServer *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_dbus_server_stop(long server);
 
 /**
  * @param server cast=(GDBusServer *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_server_get_client_address(long server);
 
 /**
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_auth_observer_new();
 
 /**
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_dbus_generate_guid();
 
 /**
  * @param type cast=(const GVariantType *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_builder_new(long type);
 
 /**
@@ -2306,35 +2288,30 @@ public static final native long g_variant_builder_new(long type);
  * @param value cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_variant_builder_add_value(long builder, long value);
 
 /**
  * @param type cast=(GVariantType *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_variant_type_free(long type);
 
 /**
  * @param type cast=(const gchar *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_type_new(byte [] type);
 
 /**
  * @param builder cast=(GVariantBuilder *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_builder_end(long builder);
 
 /**
  * @param builder cast=(GVariantBuilder *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_variant_builder_unref(long builder);
 
 /**
@@ -2367,7 +2344,6 @@ public static final native long g_variant_new (byte[] format_string, byte[] arg0
  * @param intval cast=(gint32)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_int32(int intval);
 
 
@@ -2376,7 +2352,6 @@ public static final native long g_variant_new_int32(int intval);
  * @category gdbus
  * @return int
  */
-/* @category gdbus */
 public static final native int g_variant_get_int32(long gvariant);
 
 /**
@@ -2384,14 +2359,12 @@ public static final native int g_variant_get_int32(long gvariant);
  * @category gdbus
  * @return guchar
  */
-/* @category gdbus */
 public static final native byte g_variant_get_byte(long gvariant);
 
 /**
  * @param gvariant cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native boolean g_variant_get_boolean(long gvariant);
 
 /**
@@ -2399,14 +2372,12 @@ public static final native boolean g_variant_get_boolean(long gvariant);
  * @param index cast=(gsize)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_get_child_value(long gvariant, int index);
 
 /**
  * @param gvariant cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native double g_variant_get_double(long gvariant);
 
 public static final native long g_variant_new_uint64(long value);
@@ -2415,7 +2386,6 @@ public static final native long g_variant_new_uint64(long value);
  * @param gvariant cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_get_uint64(long gvariant);
 
 /**
@@ -2423,7 +2393,6 @@ public static final native long g_variant_get_uint64(long gvariant);
  * @param length cast=(gsize *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_get_string(long gvariant, long[] length);
 
 /**
@@ -2431,14 +2400,12 @@ public static final native long g_variant_get_string(long gvariant, long[] lengt
  * @return const GVariantType *
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_get_type(long gvariant);
 
 /**
  * @param gvariant cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_get_type_string(long gvariant);
 
 /**
@@ -2446,35 +2413,30 @@ public static final native long g_variant_get_type_string(long gvariant);
  * @param type cast=(const GVariantType *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native boolean g_variant_is_of_type(long gvariant, byte[] type);
 
 /**
  * @param gvariant cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_n_children(long gvariant);
 
 /**
  * @param value cast=(gboolean)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_boolean(boolean value);
 
 /**
  * @param value cast=(gboolean)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_double(double value);
 
 /**
  * @param value cast=(guchar)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_byte(byte value);
 
 /**
@@ -2482,28 +2444,24 @@ public static final native long g_variant_new_byte(byte value);
  * @param length cast=(gsize)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_tuple(long [] items, long length);
 
 /**
  * @param string cast=(const gchar *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_string(byte[] string);
 
 /**
  * @param string cast=(const gchar *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native long g_variant_new_string(long string);
 
 /**
  * @param value cast=(GVariant *)
  * @category gdbus
  */
-/* @category gdbus */
 public static final native void g_variant_unref(long value);
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Lock.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Lock.java
deleted file mode 100644
index 971795e6e8..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Lock.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal;
-
-/**
- * Instances of this represent a recursive monitor.  Note that this
- * is an empty implementation which does not actually perform locking.
- */
-public class Lock {
-
-/**
- * Locks the monitor and returns the lock count. If
- * the lock is owned by another thread, wait until
- * the lock is released.
- *
- * @return the lock count
- */
-public int lock() {
-	return 0;
-}
-
-/**
- * Unlocks the monitor. If the current thread is not
- * the monitor owner, do nothing.
- */
-public void unlock() {
-}
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Platform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Platform.java
index 3f1d620f71..7ae0c40f7a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Platform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/Platform.java
@@ -16,7 +16,6 @@ package org.eclipse.swt.internal;
 
 public class Platform {
 	public static final String PLATFORM = "win32"; //$NON-NLS-1$
-	public static final Lock lock = new Lock ();
 
 public static boolean isLoadable () {
 	return Library.isLoadable ();
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 086f8812f6..c9a363a280 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
@@ -2329,9 +2329,9 @@ long webkit_create_web_view (long web_view, long frame) {
 }
 
 static long webkit_download_started(long webKitDownload) {
-	OS._g_signal_connect(webKitDownload, WebKitGTK.decide_destination, Proc3.getAddress(), DECIDE_DESTINATION);
-	OS._g_signal_connect(webKitDownload, WebKitGTK.failed, Proc3.getAddress(), FAILED);
-	OS._g_signal_connect(webKitDownload, WebKitGTK.finished, Proc2.getAddress(), FINISHED);
+	OS.g_signal_connect(webKitDownload, WebKitGTK.decide_destination, Proc3.getAddress(), DECIDE_DESTINATION);
+	OS.g_signal_connect(webKitDownload, WebKitGTK.failed, Proc3.getAddress(), FAILED);
+	OS.g_signal_connect(webKitDownload, WebKitGTK.finished, Proc2.getAddress(), FINISHED);
 	return 1;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java
index b2a8da2bb4..3d0c378eab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java
@@ -355,7 +355,7 @@ public class GDBus {
 			return Boolean.valueOf(OS.g_variant_get_boolean(gVariant));
 		}
 
-		if (OS._g_variant_is_of_type(gVariant, OS.G_VARIANT_TYPE_IN32)) {
+		if (OS.g_variant_is_of_type(gVariant, OS.G_VARIANT_TYPE_IN32)) {
 			return Integer.valueOf(OS.g_variant_get_int32(gVariant));
 		}
 
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 a3cb964374..2965b08f0b 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
@@ -2226,7 +2226,7 @@ void setBackgroundGdkRGBA (long context, long handle, GdkRGBA rgba) {
 	} else {
 		// GtkEntry and GtkToggleButton needs to be themed separately with different
 		// providers for coherent background. Similar to Tree/Table headers.
-		gtk_css_provider_load_from_css (GTK._gtk_widget_get_style_context(entryHandle), finalCss);
+		gtk_css_provider_load_from_css (GTK.gtk_widget_get_style_context(entryHandle), finalCss);
 		setButtonBackgroundGdkRGBA (rgba);
 	}
 	// Set the background color of the text of the drop down menu.
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 c617cc3355..31e6b79ba2 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
@@ -914,7 +914,7 @@ public void asyncExec (Runnable runnable) {
 		synchronized (idleLock) {
 			if (idleNeeded && idleHandle == 0) {
 				//NOTE: calling unlocked function in OS
-				idleHandle = OS._g_idle_add (idleProc, 0);
+				idleHandle = OS.g_idle_add (idleProc, 0);
 			}
 		}
 		synchronizer.asyncExec (runnable);
@@ -4239,167 +4239,155 @@ long mouseHoverProc (long handle) {
  *
  */
 public boolean post (Event event) {
-	/*
-	* Get the operating system lock before synchronizing on the device
-	* lock so that the device lock will not be held should another
-	* thread already be in the operating system.  This avoids deadlock
-	* should the other thread need the device lock.
-	*/
-	Lock lock = Platform.lock;
-	lock.lock();
-	try {
-		synchronized (Device.class) {
-			if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-			if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
+	synchronized (Device.class) {
+		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+		if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
 
-			int type = event.type;
+		int type = event.type;
 
-			if (type == SWT.MouseMove) {
-				Rectangle loc = DPIUtil.autoScaleUp(event.getBounds());
-				setCursorLocationInPixels(new Point(loc.x, loc.y));
-				return true;
-			}
+		if (type == SWT.MouseMove) {
+			Rectangle loc = DPIUtil.autoScaleUp(event.getBounds());
+			setCursorLocationInPixels(new Point(loc.x, loc.y));
+			return true;
+		}
 
-			long gdkDisplay = GDK.gdk_display_get_default();
-			long gdkSeat = GDK.gdk_display_get_default_seat(gdkDisplay);
-			long gdkKeyboardDevice = GDK.gdk_seat_get_keyboard(gdkSeat);
-			long gdkPointerDevice = GDK.gdk_seat_get_pointer(gdkSeat);
-			long gdkWindow = GDK.gdk_get_default_root_window();
-			long window_list = GDK.gdk_window_get_children(gdkWindow);
-			if (window_list != 0) {
-				long windows = window_list;
-				while (windows != 0) {
-					long curr_window = OS.g_list_data(windows);
-					int state = GDK.gdk_window_get_state(curr_window);
-					if ((state & GDK.GDK_WINDOW_STATE_FOCUSED) != 0) {
-						gdkWindow = curr_window;
-						OS.g_object_ref(gdkWindow);
-						break;
-					}
-					windows = OS.g_list_next(windows);
+		long gdkDisplay = GDK.gdk_display_get_default();
+		long gdkSeat = GDK.gdk_display_get_default_seat(gdkDisplay);
+		long gdkKeyboardDevice = GDK.gdk_seat_get_keyboard(gdkSeat);
+		long gdkPointerDevice = GDK.gdk_seat_get_pointer(gdkSeat);
+		long gdkWindow = GDK.gdk_get_default_root_window();
+		long window_list = GDK.gdk_window_get_children(gdkWindow);
+		if (window_list != 0) {
+			long windows = window_list;
+			while (windows != 0) {
+				long curr_window = OS.g_list_data(windows);
+				int state = GDK.gdk_window_get_state(curr_window);
+				if ((state & GDK.GDK_WINDOW_STATE_FOCUSED) != 0) {
+					gdkWindow = curr_window;
+					OS.g_object_ref(gdkWindow);
+					break;
 				}
-				OS.g_list_free(window_list);
+				windows = OS.g_list_next(windows);
 			}
-			if (gdkWindow == 0) return false;
-			long eventPtr = 0;
-
-			switch (type) {
-				case SWT.KeyDown:
-				case SWT.KeyUp:
-					/* Translate the SWT Event fields to GDK fields
-					 * We need hardware_keycode, GdkModifierType, group to get keyval
-					 * 1) event.character -> hardware_keycode
-					 * 2) event.stateMask -> GdkModifierType(state)
-					 * 3) event.keyCode -> hardware_keycode, GdkModifierType(state) (i.e. SWT.SHIFT)
-					 */
-					int state = type == SWT.KeyDown ? GDK.GDK_KEY_PRESS_MASK : GDK.GDK_KEY_RELEASE_MASK;
-					if (cachedModifierState != 0) {
-						state |= cachedModifierState;
-					}
-					int is_modifier = 1;
-					int modifier = event.stateMask != 0 ? event.stateMask : event.keyCode;
-					switch (modifier) {
-						case SWT.SHIFT: state |= GDK.GDK_SHIFT_MASK; break;
-						case SWT.ALT: state |= GDK.GDK_MOD1_MASK; break;
-						case SWT.CONTROL: state |= GDK.GDK_CONTROL_MASK; break;
-						case SWT.ALT_GR: state |= GDK.GDK_MOD5_MASK; break;
-						default:
-							is_modifier = cachedModifierState == 0 ? 0 : 1;
-					}
-
-					// Save the modifier state pressed until it is released
-					if (is_modifier == 1 && type == SWT.KeyDown) {
-						cachedModifierState = state & (~GDK.GDK_KEY_PRESS_MASK | ~GDK.GDK_KEY_RELEASE_MASK);
-					} else {
-						cachedModifierState = 0;
-					}
+			OS.g_list_free(window_list);
+		}
+		if (gdkWindow == 0) return false;
+		long eventPtr = 0;
+
+		switch (type) {
+			case SWT.KeyDown:
+			case SWT.KeyUp:
+				/* Translate the SWT Event fields to GDK fields
+				 * We need hardware_keycode, GdkModifierType, group to get keyval
+				 * 1) event.character -> hardware_keycode
+				 * 2) event.stateMask -> GdkModifierType(state)
+				 * 3) event.keyCode -> hardware_keycode, GdkModifierType(state) (i.e. SWT.SHIFT)
+				 */
+				int state = type == SWT.KeyDown ? GDK.GDK_KEY_PRESS_MASK : GDK.GDK_KEY_RELEASE_MASK;
+				if (cachedModifierState != 0) {
+					state |= cachedModifierState;
+				}
+				int is_modifier = 1;
+				int modifier = event.stateMask != 0 ? event.stateMask : event.keyCode;
+				switch (modifier) {
+					case SWT.SHIFT: state |= GDK.GDK_SHIFT_MASK; break;
+					case SWT.ALT: state |= GDK.GDK_MOD1_MASK; break;
+					case SWT.CONTROL: state |= GDK.GDK_CONTROL_MASK; break;
+					case SWT.ALT_GR: state |= GDK.GDK_MOD5_MASK; break;
+					default:
+						is_modifier = cachedModifierState == 0 ? 0 : 1;
+				}
 
-					long gdkKeymap = GDK.gdk_keymap_get_for_display(gdkDisplay);
-					int hardware_keycode = 0;
-					int raw_keyval = untranslateKey(event.keyCode);
-					if (raw_keyval == 0) raw_keyval = event.character;
-
-					long [] keys_list = new long [1];
-					int [] n_keys = new int [1];
-					int [] keyval = new int [1], effective_group = new int [1], level = new int [1], consumed_modifiers = new int[1];
-					int final_keyval = raw_keyval;
-
-					if (GDK.gdk_keymap_get_entries_for_keyval(gdkKeymap, raw_keyval, keys_list, n_keys)) {
-						GdkKeymapKey key_entry = new GdkKeymapKey ();
-						if (n_keys[0] > 0) {
-							OS.memmove(key_entry, keys_list[0], GdkKeymapKey.sizeof);
-							hardware_keycode = key_entry.keycode;
-						}
-						OS.g_free(keys_list[0]);
+				// Save the modifier state pressed until it is released
+				if (is_modifier == 1 && type == SWT.KeyDown) {
+					cachedModifierState = state & (~GDK.GDK_KEY_PRESS_MASK | ~GDK.GDK_KEY_RELEASE_MASK);
+				} else {
+					cachedModifierState = 0;
+				}
 
-						GDK.gdk_keymap_translate_keyboard_state(gdkKeymap, hardware_keycode, state, 0, keyval, effective_group, level, consumed_modifiers);
-						if (is_modifier == 1) final_keyval = keyval[0];
+				long gdkKeymap = GDK.gdk_keymap_get_for_display(gdkDisplay);
+				int hardware_keycode = 0;
+				int raw_keyval = untranslateKey(event.keyCode);
+				if (raw_keyval == 0) raw_keyval = event.character;
+
+				long [] keys_list = new long [1];
+				int [] n_keys = new int [1];
+				int [] keyval = new int [1], effective_group = new int [1], level = new int [1], consumed_modifiers = new int[1];
+				int final_keyval = raw_keyval;
+
+				if (GDK.gdk_keymap_get_entries_for_keyval(gdkKeymap, raw_keyval, keys_list, n_keys)) {
+					GdkKeymapKey key_entry = new GdkKeymapKey ();
+					if (n_keys[0] > 0) {
+						OS.memmove(key_entry, keys_list[0], GdkKeymapKey.sizeof);
+						hardware_keycode = key_entry.keycode;
 					}
+					OS.g_free(keys_list[0]);
 
-					/* Construct GdkEventKey */
-					eventPtr = GDK.gdk_event_new(type == SWT.KeyDown ? GDK.GDK_KEY_PRESS : GDK.GDK_KEY_RELEASE);
-					GdkEventKey newKeyEvent = new GdkEventKey ();
-					newKeyEvent.type = type == SWT.KeyDown ? GDK.GDK_KEY_PRESS : GDK.GDK_KEY_RELEASE;
-					newKeyEvent.window = gdkWindow;
-					newKeyEvent.send_event = 1;
-					newKeyEvent.time = GDK.GDK_CURRENT_TIME;
-					newKeyEvent.keyval = final_keyval;
-					newKeyEvent.state = state;
-					newKeyEvent.hardware_keycode = (short) hardware_keycode;
-					newKeyEvent.group = (byte) effective_group[0];
-					newKeyEvent.is_modifier = is_modifier;
-
-					OS.memmove(eventPtr, newKeyEvent, GdkEventKey.sizeof);
-					GDK.gdk_event_set_device (eventPtr, gdkKeyboardDevice);
-					if (GTK.GTK4) {
-						long display = GDK.gdk_display_get_default();
-						GDK.gdk_display_put_event(display, eventPtr);
-					} else {
-						GDK.gdk_event_put (eventPtr);
-					}
-					if (GTK.GTK4) {
-						OS.g_object_unref(eventPtr);
-					} else {
-						GDK.gdk_event_free (eventPtr);
-					}
-					return true;
-				case SWT.MouseDown:
-				case SWT.MouseUp:
-					int[] x = new int[1], y = new int[1], mask = new int[1];
-					gdkWindow = GDK.gdk_device_get_window_at_position(gdkPointerDevice, x, y);
-					// Under Wayland or some window managers, gdkWindow is not known to GDK and null is returned,
-					// cannot post mouse events as it will lead to crash
-					if (gdkWindow == 0) return false;
-					OS.g_object_ref(gdkWindow);
+					GDK.gdk_keymap_translate_keyboard_state(gdkKeymap, hardware_keycode, state, 0, keyval, effective_group, level, consumed_modifiers);
+					if (is_modifier == 1) final_keyval = keyval[0];
+				}
 
-					/* Construct GdkEventButton */
-					eventPtr = GDK.gdk_event_new(type == SWT.MouseDown ? GDK.GDK_BUTTON_PRESS : GDK.GDK_BUTTON_RELEASE);
-					GdkEventButton newButtonEvent = new GdkEventButton ();
-					newButtonEvent.type = type == SWT.MouseDown ? GDK.GDK_BUTTON_PRESS : GDK.GDK_BUTTON_RELEASE;
-					newButtonEvent.window = gdkWindow;
-					newButtonEvent.send_event = 1;
-					newButtonEvent.time = GDK.GDK_CURRENT_TIME;
-					newButtonEvent.x = x[0];
-					newButtonEvent.y = y[0];
-					newButtonEvent.state = mask[0];
-					newButtonEvent.button = event.button;
-					newButtonEvent.device = gdkPointerDevice;
-
-					OS.memmove(eventPtr, newButtonEvent, GdkEventButton.sizeof);
-					GDK.gdk_event_set_device(eventPtr, gdkPointerDevice);
-
-					GDK.gdk_event_put(eventPtr);
-					if (GTK.GTK4) {
-						OS.g_object_unref(eventPtr);
-					} else {
-						GDK.gdk_event_free (eventPtr);
-					}
-					return true;
-			}
-			return false;
+				/* Construct GdkEventKey */
+				eventPtr = GDK.gdk_event_new(type == SWT.KeyDown ? GDK.GDK_KEY_PRESS : GDK.GDK_KEY_RELEASE);
+				GdkEventKey newKeyEvent = new GdkEventKey ();
+				newKeyEvent.type = type == SWT.KeyDown ? GDK.GDK_KEY_PRESS : GDK.GDK_KEY_RELEASE;
+				newKeyEvent.window = gdkWindow;
+				newKeyEvent.send_event = 1;
+				newKeyEvent.time = GDK.GDK_CURRENT_TIME;
+				newKeyEvent.keyval = final_keyval;
+				newKeyEvent.state = state;
+				newKeyEvent.hardware_keycode = (short) hardware_keycode;
+				newKeyEvent.group = (byte) effective_group[0];
+				newKeyEvent.is_modifier = is_modifier;
+
+				OS.memmove(eventPtr, newKeyEvent, GdkEventKey.sizeof);
+				GDK.gdk_event_set_device (eventPtr, gdkKeyboardDevice);
+				if (GTK.GTK4) {
+					long display = GDK.gdk_display_get_default();
+					GDK.gdk_display_put_event(display, eventPtr);
+				} else {
+					GDK.gdk_event_put (eventPtr);
+				}
+				if (GTK.GTK4) {
+					OS.g_object_unref(eventPtr);
+				} else {
+					GDK.gdk_event_free (eventPtr);
+				}
+				return true;
+			case SWT.MouseDown:
+			case SWT.MouseUp:
+				int[] x = new int[1], y = new int[1], mask = new int[1];
+				gdkWindow = GDK.gdk_device_get_window_at_position(gdkPointerDevice, x, y);
+				// Under Wayland or some window managers, gdkWindow is not known to GDK and null is returned,
+				// cannot post mouse events as it will lead to crash
+				if (gdkWindow == 0) return false;
+				OS.g_object_ref(gdkWindow);
+
+				/* Construct GdkEventButton */
+				eventPtr = GDK.gdk_event_new(type == SWT.MouseDown ? GDK.GDK_BUTTON_PRESS : GDK.GDK_BUTTON_RELEASE);
+				GdkEventButton newButtonEvent = new GdkEventButton ();
+				newButtonEvent.type = type == SWT.MouseDown ? GDK.GDK_BUTTON_PRESS : GDK.GDK_BUTTON_RELEASE;
+				newButtonEvent.window = gdkWindow;
+				newButtonEvent.send_event = 1;
+				newButtonEvent.time = GDK.GDK_CURRENT_TIME;
+				newButtonEvent.x = x[0];
+				newButtonEvent.y = y[0];
+				newButtonEvent.state = mask[0];
+				newButtonEvent.button = event.button;
+				newButtonEvent.device = gdkPointerDevice;
+
+				OS.memmove(eventPtr, newButtonEvent, GdkEventButton.sizeof);
+				GDK.gdk_event_set_device(eventPtr, gdkPointerDevice);
+
+				GDK.gdk_event_put(eventPtr);
+				if (GTK.GTK4) {
+					OS.g_object_unref(eventPtr);
+				} else {
+					GDK.gdk_event_free (eventPtr);
+				}
+				return true;
 		}
-	} finally {
-		lock.unlock();
+		return false;
 	}
 }
 
@@ -5547,17 +5535,8 @@ public boolean sleep () {
 					*/
 					if (timeout [0] < 0) timeout [0] = 50;
 
-					/* Exit the OS lock to allow other threads to enter GTK */
-					Lock lock = Platform.lock;
-					int count = lock.lock ();
-					for (int i = 0; i < count; i++) lock.unlock ();
-					try {
-						wake = false;
-						OS.Call (poll, fds, nfds, timeout [0]);
-					} finally {
-						for (int i = 0; i < count; i++) lock.lock ();
-						lock.unlock ();
-					}
+					wake = false;
+					OS.Call (poll, fds, nfds, timeout [0]);
 				}
 			}
 			OS.g_main_context_check (context, max_priority [0], fds, nfds);
@@ -5844,7 +5823,7 @@ public void syncExec (Runnable runnable) {
 		synchronized (idleLock) {
 			if (idleNeeded && idleHandle == 0) {
 				//NOTE: calling unlocked function in OS
-				idleHandle = OS._g_idle_add (idleProc, 0);
+				idleHandle = OS.g_idle_add (idleProc, 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 49c2d66139..3f0aa8ee5a 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
@@ -2044,7 +2044,7 @@ public TreeItem getTopItem () {
 	 */
 	long vAdjustment;
 	vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle);
-	currentAdjustment = GTK._gtk_adjustment_get_value(vAdjustment);
+	currentAdjustment = GTK.gtk_adjustment_get_value(vAdjustment);
 	TreeItem item = null;
 	if (cachedAdjustment == currentAdjustment) {
 		item = _getCachedTopItem();