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

Made GTK2 window access explicitly guarded in scroll/selection update code paths to keep GTK3 using gtk_widget_get_window.

Browse Source 
Applied the same explicit GTK3/GTK2 window guards in render paths to keep direct GTK2 field access isolated.
This commit is contained in:
deepend
2026-01-29 22:07:58 -07:00
parent 1584764809
commit aa0b271aa9
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1642,7 +1642,8 @@ gtk_xtext_scrolldown_timeout (GtkXText * xtext)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#else #endif
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -1684,7 +1685,8 @@ gtk_xtext_scrollup_timeout (GtkXText * xtext)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#else #endif
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -1735,7 +1737,8 @@ gtk_xtext_selection_update (GtkXText * xtext, GdkEventMotion * event, int p_y, g
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#else #endif
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -4029,7 +4032,8 @@ gtk_xtext_render_ents (GtkXText * xtext, textentry * enta, textentry * entb)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#else #endif
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -4126,7 +4130,8 @@ gtk_xtext_render_page (GtkXText * xtext)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#else #endif
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)