Skip to content

Commit e60f6db

Browse files
committed
[GTK] Remove unused and deprecated bindings
Reduces build warnings for gtk4 port.
1 parent dfd19fc commit e60f6db

File tree

4 files changed

+0
-56
lines changed

4 files changed

+0
-56
lines changed

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,26 +2399,6 @@ JNIEXPORT void JNICALL GDK_NATIVE(gdk_1surface_1set_1cursor)
23992399
}
24002400
#endif
24012401

2402-
#ifndef NO_gdk_1surface_1set_1input_1region
2403-
JNIEXPORT void JNICALL GDK_NATIVE(gdk_1surface_1set_1input_1region)
2404-
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
2405-
{
2406-
GDK_NATIVE_ENTER(env, that, gdk_1surface_1set_1input_1region_FUNC);
2407-
gdk_surface_set_input_region((GdkSurface *)arg0, (cairo_region_t *)arg1);
2408-
GDK_NATIVE_EXIT(env, that, gdk_1surface_1set_1input_1region_FUNC);
2409-
}
2410-
#endif
2411-
2412-
#ifndef NO_gdk_1surface_1set_1opaque_1region
2413-
JNIEXPORT void JNICALL GDK_NATIVE(gdk_1surface_1set_1opaque_1region)
2414-
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
2415-
{
2416-
GDK_NATIVE_ENTER(env, that, gdk_1surface_1set_1opaque_1region_FUNC);
2417-
gdk_surface_set_opaque_region((GdkSurface *)arg0, (cairo_region_t *)arg1);
2418-
GDK_NATIVE_EXIT(env, that, gdk_1surface_1set_1opaque_1region_FUNC);
2419-
}
2420-
#endif
2421-
24222402
#ifndef NO_gdk_1text_1property_1to_1utf8_1list_1for_1display
24232403
JNIEXPORT jint JNICALL GDK_NATIVE(gdk_1text_1property_1to_1utf8_1list_1for_1display)
24242404
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
@@ -3142,18 +3122,6 @@ JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1x11_1surface_1get_1xid)
31423122
}
31433123
#endif
31443124

3145-
#ifndef NO_gdk_1x11_1surface_1lookup_1for_1display
3146-
JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1x11_1surface_1lookup_1for_1display)
3147-
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
3148-
{
3149-
jlong rc = 0;
3150-
GDK_NATIVE_ENTER(env, that, gdk_1x11_1surface_1lookup_1for_1display_FUNC);
3151-
rc = (jlong)gdk_x11_surface_lookup_for_display((GdkDisplay *)arg0, (Window)arg1);
3152-
GDK_NATIVE_EXIT(env, that, gdk_1x11_1surface_1lookup_1for_1display_FUNC);
3153-
return rc;
3154-
}
3155-
#endif
3156-
31573125
#ifndef NO_gdk_1x11_1window_1get_1xid
31583126
JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1x11_1window_1get_1xid)
31593127
(JNIEnv *env, jclass that, jlong arg0)

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
#if !GTK_CHECK_VERSION(4,0,0)
6060
#include <gtk/gtkx.h>
6161
#define NO_gdk_1x11_1surface_1get_1xid
62-
#define NO_gdk_1x11_1surface_1lookup_1for_1display
6362
#else
6463
#define NO_gdk_1x11_1get_1default_1xdisplay
6564
#define NO_gdk_1x11_1window_1get_1xid
@@ -286,8 +285,6 @@
286285
#define NO_gdk_1surface_1get_1root_1origin
287286
#define NO_gdk_1surface_1invalidate_1region
288287
#define NO_gdk_1event_1get_1surface
289-
#define NO_gdk_1surface_1set_1input_1region
290-
#define NO_gdk_1surface_1set_1opaque_1region
291288

292289
// No GdkToplevel on GTK3
293290
#define NO_gdk_1toplevel_1present

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ typedef enum {
179179
gdk_1surface_1new_1popup_FUNC,
180180
gdk_1surface_1new_1toplevel_FUNC,
181181
gdk_1surface_1set_1cursor_FUNC,
182-
gdk_1surface_1set_1input_1region_FUNC,
183-
gdk_1surface_1set_1opaque_1region_FUNC,
184182
gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC,
185183
gdk_1texture_1new_1for_1pixbuf_FUNC,
186184
gdk_1texture_1new_1from_1file_FUNC,
@@ -236,7 +234,6 @@ typedef enum {
236234
gdk_1x11_1screen_1get_1window_1manager_1name_FUNC,
237235
gdk_1x11_1screen_1lookup_1visual_FUNC,
238236
gdk_1x11_1surface_1get_1xid_FUNC,
239-
gdk_1x11_1surface_1lookup_1for_1display_FUNC,
240237
gdk_1x11_1window_1get_1xid_FUNC,
241238
gdk_1x11_1window_1lookup_1for_1display_FUNC,
242239
} GDK_FUNCS;

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,6 @@ public class GDK extends OS {
285285
*/
286286
/* [GTK3 only, if-def'd in os.h] */
287287
public static final native long gdk_x11_window_lookup_for_display(long gdkdisplay, long xid);
288-
/**
289-
* @param gdkdisplay cast=(GdkDisplay *)
290-
* @param xid cast=(Window)
291-
*/
292-
/* [GTK4 only, if-def'd in os.h] */
293-
public static final native long gdk_x11_surface_lookup_for_display(long gdkdisplay, long xid);
294288
/**
295289
* @method flags=dynamic
296290
* @param atom_name cast=(const gchar *),flags=no_out critical
@@ -352,18 +346,6 @@ public class GDK extends OS {
352346
*/
353347
/* [GTK4 only, if-def'd in os.h] */
354348
public static final native int gdk_surface_get_height(long surface);
355-
/**
356-
* @param surface cast=(GdkSurface *)
357-
* @param region cast=(cairo_region_t *)
358-
*/
359-
/* [GTK4 only, if-def'd in os.h] */
360-
public static final native void gdk_surface_set_input_region(long surface, long region);
361-
/**
362-
* @param surface cast=(GdkSurface *)
363-
* @param region cast=(cairo_region_t *)
364-
*/
365-
/* [GTK4 only, if-def'd in os.h] */
366-
public static final native void gdk_surface_set_opaque_region(long surface, long region);
367349
/**
368350
* @param cairo cast=(cairo_t *)
369351
* @param pixbuf cast=(const GdkPixbuf *)

0 commit comments

Comments
 (0)