From 59cabead531d63f78f1768adec88711087868f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Tue, 3 Nov 2026 11:14:47 +0100
Subject: [PATCH] gtk.cfg: Complete and sort G_DEFINE_* list

Added:
G_DEFINE_ENUM_TYPE
G_DEFINE_ENUM_VALUE
G_DEFINE_EXTENDED_ERROR
G_DEFINE_FLAGS_TYPE
G_DEFINE_POINTER_TYPE
G_DEFINE_POINTER_TYPE_WITH_CODE
---
 cfg/gtk.cfg    | 36 +++++++++++++++++++++---------------
 test/cfg/gtk.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg
index e7119755b3e..024f567c922 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -52,33 +52,39 @@
   <define name="G_STRINGIFY_ARG(contents)" value="#contents"/>
   <define name="G_STRLOC" value="__FILE__ &quot;:&quot; G_STRINGIFY (__LINE__)"/>
   <define name="G_STRFUNC" value="((const char*) (__FUNCTION__))"/>
-  <define name="G_DEFINE_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
-  <define name="G_DEFINE_FINAL_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
   <define name="G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
   <define name="G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
-  <define name="G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_DYNAMIC_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
+  <define name="G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(TypeName, func)" value=""/>
+  <define name="G_DEFINE_AUTO_CLEANUP_FREE_FUNC(TypeName, func, none)" value=""/>
+  <define name="G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE(TypeName,type_name,copy_func,free_func)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName,type_name,copy_func,free_func,_C_)" value=""/>
+  <define name="G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_DYNAMIC_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
+  <define name="G_DEFINE_ENUM_TYPE(TypeName, type_name, ...)" value=""/>
+  <define name="G_DEFINE_ENUM_VALUE(EnumValue, EnumNick)" value=""/>
+  <define name="G_DEFINE_EXTENDED_ERROR(ErrorType, error_type)" value=""/>
+  <define name="G_DEFINE_FINAL_TYPE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
+  <define name="G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_FLAGS_TYPE(TypeName, type_name, ...)" value=""/>
+  <define name="G_DEFINE_INTERFACE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
+  <define name="G_DEFINE_POINTER_TYPE(TypeName, type_name)" value=""/>
+  <define name="G_DEFINE_POINTER_TYPE_WITH_CODE(TypeName, type_name, _C_)" value=""/>
   <define name="G_DEFINE_QUARK(QN,q_n)" value=""/>
+  <define name="G_DEFINE_TYPE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
+  <define name="G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
+  <define name="G_DEFINE_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
   <define name="G_BEGIN_DECLS" value=""/>
   <define name="G_END_DECLS" value=""/>
   <define name="G_ADD_PRIVATE(TypeName)" value=""/>
   <define name="G_PRIVATE_OFFSET(TypeName, field)" value=""/>
   <define name="G_PRIVATE_FIELD(TypeName, inst, field_type, field_name)" value=""/>
   <define name="G_PRIVATE_FIELD_P(TypeName, inst, field_name)" value=""/>
-  <define name="G_DEFINE_INTERFACE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
-  <define name="G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
   <define name="G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init)" value=""/>
-  <define name="G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(TypeName, func)" value=""/>
-  <define name="G_DEFINE_AUTO_CLEANUP_FREE_FUNC(TypeName, func, none)" value=""/>
-  <define name="G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func)" value=""/>
   <define name="MAX(a, b)" value="(((a) &gt; (b)) ? (a) : (b))"/>
   <define name="MIN(a, b)" value="(((a) &lt; (b)) ? (a) : (b))"/>
   <define name="ABS(a)" value="(((a) &lt; 0) ? -(a) : (a))"/>
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 015aa6a6a3d..2612b572638 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -687,3 +687,46 @@ void g_ascii_formatd_format_test(const gchar *format, int i)
     g_ascii_formatd(buf, sizeof(buf), format, s.x);
     g_print("%s", buf);
 }
+
+#define MY_APP_TYPE_WINDOW my_app_window_get_type()
+G_DECLARE_FINAL_TYPE(MyAppWindow, my_app_window, MY_APP, WINDOW, GtkWindow)
+struct _MyAppWindow {
+    GtkWindow parent;
+};
+G_DEFINE_TYPE(MyAppWindow, my_app_window, GTK_TYPE_WINDOW)
+// cppcheck-suppress constParameterPointer
+static void my_app_window_class_init(MyAppWindowClass *class) {
+}
+// cppcheck-suppress constParameterPointer
+static void my_app_window_init(MyAppWindow *window) {
+}
+
+void g_declare_and_define_type_test(void) {
+    // cppcheck-suppress checkLibraryFunction
+    MyAppWindow *window = g_object_new(MY_APP_TYPE_WINDOW, NULL);
+    gtk_widget_show(GTK_WIDGET(window));
+    g_object_unref(window);
+}
+
+#if GLIB_CHECK_VERSION(2, 74, 0)
+typedef enum {
+    MY_ENUM_A,
+    MY_ENUM_B,
+} MyEnum;
+G_DEFINE_ENUM_TYPE (MyEnum, my_enum,
+    G_DEFINE_ENUM_VALUE (MY_ENUM_A, "a"),
+    G_DEFINE_ENUM_VALUE (MY_ENUM_B, "b"))
+typedef enum {
+    MY_FLAGS_A = 1 << 0,
+    MY_FLAGS_B = 1 << 1,
+} MyFlags;
+G_DEFINE_FLAGS_TYPE (MyFlags, my_flags,
+    G_DEFINE_ENUM_VALUE (MY_FLAGS_A, "a"),
+    G_DEFINE_ENUM_VALUE (MY_FLAGS_B, "b"))
+
+int g_define_enum_and_flags_type_test(void) {
+    MyEnum e = MY_ENUM_A;
+    MyFlags f = MY_FLAGS_A;
+    return e + f;
+}
+#endif