deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-10 07:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrapped GTK2-only cursor cleanup with #if !HAVE_GTK3, keeping GTK3 paths on g_object_unref.

Browse Source 
Moved GTK2 pointer/background calls into #if !HAVE_GTK3 blocks, leaving GTK3-compatible implementations in #else.
This commit is contained in:
deepend
2026-01-22 23:28:24 -07:00
parent ae86a8db0f
commit a05c064466
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/fe-gtk/xtext.c
View File

@@ -689,20 +689,20 @@ gtk_xtext_destroy (GtkObject * object)
if (xtext->hand_cursor) if (xtext->hand_cursor)
{ {
#if HAVE_GTK3 #if !HAVE_GTK3
g_object_unref (xtext->hand_cursor);
#else
gdk_cursor_unref (xtext->hand_cursor); gdk_cursor_unref (xtext->hand_cursor);
#else
g_object_unref (xtext->hand_cursor);
#endif #endif
xtext->hand_cursor = NULL; xtext->hand_cursor = NULL;
} }
if (xtext->resize_cursor) if (xtext->resize_cursor)
{ {
#if HAVE_GTK3 #if !HAVE_GTK3
g_object_unref (xtext->resize_cursor);
#else
gdk_cursor_unref (xtext->resize_cursor); gdk_cursor_unref (xtext->resize_cursor);
#else
g_object_unref (xtext->resize_cursor);
#endif #endif
xtext->resize_cursor = NULL; xtext->resize_cursor = NULL;
} }
@@ -732,7 +732,9 @@ gtk_xtext_unrealize (GtkWidget * widget)
static void static void
gtk_xtext_get_pointer (GdkWindow *window, gint *x, gint *y, GdkModifierType *mask) gtk_xtext_get_pointer (GdkWindow *window, gint *x, gint *y, GdkModifierType *mask)
{ {
#if HAVE_GTK3 #if !HAVE_GTK3
gdk_window_get_pointer (window, x, y, mask);
#else
GdkDisplay *display = gdk_window_get_display (window); GdkDisplay *display = gdk_window_get_display (window);
GdkSeat *seat = gdk_display_get_default_seat (display); GdkSeat *seat = gdk_display_get_default_seat (display);
GdkDevice *device = gdk_seat_get_pointer (seat); GdkDevice *device = gdk_seat_get_pointer (seat);
@@ -751,8 +753,6 @@ gtk_xtext_get_pointer (GdkWindow *window, gint *x, gint *y, GdkModifierType *mas
*y = root_y - win_y; *y = root_y - win_y;
if (mask) if (mask)
gdk_device_get_state (device, window, NULL, mask); gdk_device_get_state (device, window, NULL, mask);
#else
gdk_window_get_pointer (window, x, y, mask);
#endif #endif
} }
@@ -821,10 +821,10 @@ gtk_xtext_realize (GtkWidget * widget)
xtext->hand_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_HAND1); xtext->hand_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_HAND1);
xtext->resize_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_LEFT_SIDE); xtext->resize_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_LEFT_SIDE);
#if HAVE_GTK3 #if !HAVE_GTK3
gdk_window_set_background_pattern (widget->window, NULL);
#else
gdk_window_set_back_pixmap (widget->window, NULL, FALSE); gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
#else
gdk_window_set_background_pattern (widget->window, NULL);
#endif #endif
backend_init (xtext); backend_init (xtext);