From 1540a645fcbfff758be00c16b8ce7a377a65fc9b Mon Sep 17 00:00:00 2001
From: Richard Cohen <richard@daijobu.co.uk>
Date: Mon, 12 Jun 2023 19:55:04 +0100
Subject: [PATCH] Refactor: DECLARE_FINAL GncEmbeddedWindow < GtkBox

---
 gnucash/gnome-utils/gnc-embedded-window.c |  2 +-
 gnucash/gnome-utils/gnc-embedded-window.h | 29 +++--------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/gnucash/gnome-utils/gnc-embedded-window.c b/gnucash/gnome-utils/gnc-embedded-window.c
index eb2f657966..b367b7abe0 100644
--- a/gnucash/gnome-utils/gnc-embedded-window.c
+++ b/gnucash/gnome-utils/gnc-embedded-window.c
@@ -206,7 +206,7 @@ gnc_embedded_window_class_init (GncEmbeddedWindowClass *klass)
         g_signal_new ("page_changed",
                       G_OBJECT_CLASS_TYPE (object_class),
                       G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET (GncEmbeddedWindowClass, page_changed),
+                      0,
                       NULL, NULL,
                       g_cclosure_marshal_VOID__OBJECT,
                       G_TYPE_NONE, 1,
diff --git a/gnucash/gnome-utils/gnc-embedded-window.h b/gnucash/gnome-utils/gnc-embedded-window.h
index 86774b174f..c5c2e14a69 100644
--- a/gnucash/gnome-utils/gnc-embedded-window.h
+++ b/gnucash/gnome-utils/gnc-embedded-window.h
@@ -44,42 +44,19 @@ G_BEGIN_DECLS
 
 /* type macros */
 #define GNC_TYPE_EMBEDDED_WINDOW            (gnc_embedded_window_get_type ())
-#define GNC_EMBEDDED_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_EMBEDDED_WINDOW, GncEmbeddedWindow))
-#define GNC_EMBEDDED_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_EMBEDDED_WINDOW, GncEmbeddedWindowClass))
-#define GNC_IS_EMBEDDED_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_EMBEDDED_WINDOW))
-#define GNC_IS_EMBEDDED_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_EMBEDDED_WINDOW))
-#define GNC_EMBEDDED_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_EMBEDDED_WINDOW, GncEmbeddedWindowClass))
+G_DECLARE_FINAL_TYPE (GncEmbeddedWindow, gnc_embedded_window, GNC, EMBEDDED_WINDOW, GtkBox)
 
 /* typedefs & structures */
 
 /** The instance data structure for an embedded window object. */
-typedef struct
+struct _GncEmbeddedWindow
 {
     /** The parent object for an embedded window. */
     GtkBox vbox;
-} GncEmbeddedWindow;
-
-
-/** The class data structure for an embedded window object. */
-typedef struct
-{
-    /** The parent class for an embedded window. */
-    GtkBoxClass vbox;
-
-    /* callbacks */
-    void (*page_changed) (GncEmbeddedWindow *window,
-                          GncPluginPage *page);
-} GncEmbeddedWindowClass;
-
+};
 
 /* function prototypes */
 
-/** Get the type of a gnc embedded window.
- *
- *  @return A GType. */
-GType gnc_embedded_window_get_type (void);
-
-
 /** Create a new gnc embedded window plugin.
  *
  *  @return A pointer to the new object.