From 4b188192f8ba4a31035b54a0b442348e8b3d0818 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Sun, 22 Feb 2026 15:27:28 -0700
Subject: [PATCH] Removed GTK2 compatibility shims from fe-gtk.h by deleting
 the local HAVE_GTK3 fallback derivation, deleting GTK2 no-op wrappers for
 expansion APIs, and making InputStyle GTK3-only.

Simplified the Windows theme block in fe-gtk.c from a GTK3-conditional compile guard to a direct Windows guard (#ifdef G_OS_WIN32), matching the GTK3-only codebase direction.

Simplified native file chooser guards in gtkutil.c from WIN32 && HAVE_GTK3 to #ifdef WIN32, removing remaining GTK3 compatibility-condition clutter in that file.
---
 src/fe-gtk/fe-gtk.c  |  2 +-
 src/fe-gtk/fe-gtk.h  | 20 --------------------
 src/fe-gtk/gtkutil.c |  4 ++--
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 83b692cd..7967bde6 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -673,7 +673,7 @@ fe_apply_theme_to_toplevel (GtkWidget *window)
 	if (!window)
 		return;
 
-#if defined(G_OS_WIN32) && HAVE_GTK3
+#ifdef G_OS_WIN32
 	{
 		GtkStyleContext *context = gtk_widget_get_style_context (window);
 		gboolean dark = fe_dark_mode_is_enabled ();
diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h
index 626bfb2a..779f8d80 100644
--- a/src/fe-gtk/fe-gtk.h
+++ b/src/fe-gtk/fe-gtk.h
@@ -32,22 +32,6 @@
 #include <gtk/gtk.h>
 #include <cairo.h>
 
-#ifndef HAVE_GTK3
-#if GTK_MAJOR_VERSION >= 3
-#define HAVE_GTK3 1
-#else
-#define HAVE_GTK3 0
-#endif
-#endif
-
-#if !HAVE_GTK3
-/* GtkWidget expansion APIs were introduced in GTK3. Keep GTK2 builds
- * source-compatible by accepting the calls as no-ops.
- */
-#define gtk_widget_set_hexpand(widget, expand) G_STMT_START { (void) (widget); (void) (expand); } G_STMT_END
-#define gtk_widget_set_vexpand(widget, expand) G_STMT_START { (void) (widget); (void) (expand); } G_STMT_END
-#endif
-
 #ifdef HAVE_GTK_MAC
 #include <gtkosxapplication.h>
 #endif
@@ -64,14 +48,10 @@
 #define flag_b flag_wid[7]
 #define NUM_FLAG_WIDS 8
 
-#if HAVE_GTK3
 typedef struct _input_style
 {
 	PangoFontDescription *font_desc;
 } InputStyle;
-#else
-typedef GtkStyle InputStyle;
-#endif
 
 #ifdef HAVE_GTK_MAC
 extern GtkosxApplication *osx_app;
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 396cac6f..ff96ecf8 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -686,7 +686,7 @@ gtkutil_file_req_response (GtkWidget *dialog, gint res, struct file_req *freq)
 	gtk_widget_destroy (dialog);
 }
 
-#if defined (WIN32) && HAVE_GTK3
+#ifdef WIN32
 static gboolean
 gtkutil_native_dialog_unref_idle (gpointer native)
 {
@@ -730,7 +730,7 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
 
 	xdir = get_xdir ();
 
-#if defined (WIN32) && HAVE_GTK3
+#ifdef WIN32
 	{
 		GtkFileChooserNative *native = gtk_file_chooser_native_new (
 			title,