From e44e801e3a21771e9ffb9741125ab085aac08615 Mon Sep 17 00:00:00 2001 From: deepend Date: Sat, 31 Jan 2026 16:00:49 -0700 Subject: [PATCH] Replaced the GTK3 G_DECLARE_DERIVABLE_TYPE usage in sexy-spell-entry.h with explicit typedefs/macros so the SexySpellEntry instance struct (and priv) remains visible in GTK3 builds. Replaced the GTK3 G_DECLARE_DERIVABLE_TYPE usage with explicit GtkXText typedefs/macros to keep the instance struct visible in GTK3 builds and avoid missing member errors. --- src/fe-gtk/sexy-spell-entry.h | 4 ---- src/fe-gtk/xtext.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/fe-gtk/sexy-spell-entry.h b/src/fe-gtk/sexy-spell-entry.h index 634fc280..abe021d2 100644 --- a/src/fe-gtk/sexy-spell-entry.h +++ b/src/fe-gtk/sexy-spell-entry.h @@ -22,9 +22,6 @@ G_BEGIN_DECLS -#if HAVE_GTK3 -G_DECLARE_DERIVABLE_TYPE (SexySpellEntry, sexy_spell_entry, SEXY, SPELL_ENTRY, GtkEntry) -#else typedef struct _SexySpellEntry SexySpellEntry; typedef struct _SexySpellEntryClass SexySpellEntryClass; @@ -36,7 +33,6 @@ GType sexy_spell_entry_get_type(void); #define SEXY_IS_SPELL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SEXY_TYPE_SPELL_ENTRY)) #define SEXY_IS_SPELL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SEXY_TYPE_SPELL_ENTRY)) #define SEXY_SPELL_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), SEXY_TYPE_SPELL_ENTRY, SexySpellEntryClass)) -#endif typedef struct _SexySpellEntryPriv SexySpellEntryPriv; diff --git a/src/fe-gtk/xtext.h b/src/fe-gtk/xtext.h index a50dfad0..acedb43f 100644 --- a/src/fe-gtk/xtext.h +++ b/src/fe-gtk/xtext.h @@ -27,9 +27,6 @@ #include #include "xtext-color.h" -#if HAVE_GTK3 -G_DECLARE_DERIVABLE_TYPE (GtkXText, gtk_xtext, GTK, XTEXT, GtkWidget) -#else typedef struct _GtkXText GtkXText; typedef struct _GtkXTextClass GtkXTextClass; @@ -41,7 +38,6 @@ typedef struct _GtkXTextClass GtkXTextClass; #define GTK_XTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_XTEXT, GtkXTextClass)) GType gtk_xtext_get_type (void); -#endif #define ATTR_BOLD '\002' #define ATTR_COLOR '\003'