adw: extract class definitions

1 files changed, 9 insertions, 18 deletions

diff --git a/adw/include/adwaitamm/preferencespage.hpp b/adw/include/adwaitamm/preferencespage.hpp
index 7e7e9ed..311796f 100644
--- a/adw/include/adwaitamm/preferencespage.hpp
+++ b/adw/include/adwaitamm/preferencespage.hpp
@@ -13,31 +13,20 @@
 
 #include <glib-object.h>
 
-using AdwPreferencesPage = struct _AdwPreferencesPage;
-using AdwPreferencesPageClass = struct _AdwPreferencesPageClass;
+#define _ADWAITA_INSIDE
+#include <adw-preferences-page.h>
+#undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
   struct PreferencesPage : Gtk::Widget,
                            helpers::gobj_mixin<PreferencesPage, AdwPreferencesPage>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GtkWidgetClass;
-      using BaseClassType = AdwPreferencesPageClass;
-      using BaseObjectType = AdwPreferencesPage;
-      using CppClassParent = struct Gtk::Widget_Class;
-      using CppObjectType = PreferencesPage;
 
-      auto init() -> Glib::Class const &;
-      auto static class_init_function(void * gclass, void * data) -> void;
-      auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
-    };
-
-    using BaseObjectType = Class::BaseObjectType;
-    using BaseClassType = Class::BaseClassType;
-    using CppObjectType = Class::CppObjectType;
-    using CppClassType = Class;
+    using BaseObjectType = AdwPreferencesPage;
+    using BaseClassType = AdwPreferencesPageClass;
+    using CppObjectType = PreferencesPage;
+    using CppClassType = struct PreferencesPage_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -53,6 +42,8 @@ namespace Adwaita
     auto static get_base_type() -> GType;
 
   protected:
+    friend PreferencesPage_Class;
+
     explicit PreferencesPage(Glib::ConstructParams const & params);
     explicit PreferencesPage(BaseObjectType * gobj);
   };