From 41371ccae6e14ecde375272bd6b7d92760118973 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 7 Mar 2021 18:23:23 +0000 Subject: [PATCH 1/5] buildable: Remove "class" macro --- gtk/gtkbuildable.h | 1 - 1 file changed, 1 deletion(-) diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h index b446b570b9..030badc7f0 100644 --- a/gtk/gtkbuildable.h +++ b/gtk/gtkbuildable.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS #define GTK_TYPE_BUILDABLE (gtk_buildable_get_type ()) #define GTK_BUILDABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUILDABLE, GtkBuildable)) -#define GTK_BUILDABLE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_BUILDABLE, GtkBuildableIface)) #define GTK_IS_BUILDABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUILDABLE)) #define GTK_BUILDABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_BUILDABLE, GtkBuildableIface)) From 0cfe3d45f5ffabc1ef30c066de65ec7dfcb82870 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 7 Mar 2021 18:25:07 +0000 Subject: [PATCH 2/5] celleditable: Remove class cast check macro --- gtk/gtkcelleditable.h | 1 - 1 file changed, 1 deletion(-) diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h index dfd3a51e35..3d0e2fcbf7 100644 --- a/gtk/gtkcelleditable.h +++ b/gtk/gtkcelleditable.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #define GTK_TYPE_CELL_EDITABLE (gtk_cell_editable_get_type ()) #define GTK_CELL_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditable)) -#define GTK_CELL_EDITABLE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface)) #define GTK_IS_CELL_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_EDITABLE)) #define GTK_CELL_EDITABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface)) From 6234ccc974a46014a4109fea5ea91ccf8737fa8a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 7 Mar 2021 18:25:55 +0000 Subject: [PATCH 3/5] orientable: Remove class macros --- gtk/gtkorientable.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h index 4044e30dce..cda1357c06 100644 --- a/gtk/gtkorientable.h +++ b/gtk/gtkorientable.h @@ -32,12 +32,9 @@ G_BEGIN_DECLS #define GTK_TYPE_ORIENTABLE (gtk_orientable_get_type ()) #define GTK_ORIENTABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ORIENTABLE, GtkOrientable)) -#define GTK_ORIENTABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ORIENTABLE, GtkOrientableIface)) #define GTK_IS_ORIENTABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ORIENTABLE)) -#define GTK_IS_ORIENTABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_ORIENTABLE)) #define GTK_ORIENTABLE_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_ORIENTABLE, GtkOrientableIface)) - typedef struct _GtkOrientable GtkOrientable; /* Dummy typedef */ typedef struct _GtkOrientableIface GtkOrientableIface; From 70fbfd8ede970c1e7ec2640c72ee745d1b92f8e3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 7 Mar 2021 18:26:31 +0000 Subject: [PATCH 4/5] treesortable: Remove class check macro --- gtk/gtktreesortable.h | 1 - 1 file changed, 1 deletion(-) diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h index a0579829da..be64f89301 100644 --- a/gtk/gtktreesortable.h +++ b/gtk/gtktreesortable.h @@ -31,7 +31,6 @@ G_BEGIN_DECLS #define GTK_TYPE_TREE_SORTABLE (gtk_tree_sortable_get_type ()) #define GTK_TREE_SORTABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortable)) -#define GTK_TREE_SORTABLE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface)) #define GTK_IS_TREE_SORTABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SORTABLE)) #define GTK_TREE_SORTABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface)) From 676ea489cc97b55df83620dbeb208f4a4aacb04d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 7 Mar 2021 18:34:53 +0000 Subject: [PATCH 5/5] docs: Remove invalid macros --- docs/reference/gtk/gtk4-sections.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 7f20d98ae2..e2843f9046 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -631,7 +631,6 @@ GTK_BUILDABLE GTK_IS_BUILDABLE GTK_TYPE_BUILDABLE gtk_buildable_get_type -GTK_BUILDABLE_CLASS GTK_BUILDABLE_GET_IFACE @@ -3557,7 +3556,6 @@ gtk_tree_sortable_has_default_sort_func GTK_TREE_SORTABLE GTK_IS_TREE_SORTABLE GTK_TYPE_TREE_SORTABLE -GTK_TREE_SORTABLE_CLASS GTK_TREE_SORTABLE_GET_IFACE gtk_tree_sortable_get_type @@ -4055,7 +4053,6 @@ gtk_cell_editable_remove_widget GTK_CELL_EDITABLE GTK_IS_CELL_EDITABLE GTK_TYPE_CELL_EDITABLE -GTK_CELL_EDITABLE_CLASS GTK_CELL_EDITABLE_GET_IFACE gtk_cell_editable_get_type @@ -5555,9 +5552,7 @@ gtk_orientable_set_orientation GtkOrientableIface GTK_IS_ORIENTABLE -GTK_IS_ORIENTABLE_CLASS GTK_ORIENTABLE -GTK_ORIENTABLE_CLASS GTK_ORIENTABLE_GET_IFACE GTK_TYPE_ORIENTABLE