adw: extract class definitions

1 files changed, 10 insertions, 21 deletions

diff --git a/adw/include/adwaitamm/dialog.hpp b/adw/include/adwaitamm/dialog.hpp
index 44dde25..eeaeda1 100644
--- a/adw/include/adwaitamm/dialog.hpp
+++ b/adw/include/adwaitamm/dialog.hpp
@@ -15,34 +15,21 @@
 
 #include <glib-object.h>
 
-using AdwDialog = struct _AdwDialog;
-using AdwDialogClass = struct _AdwDialogClass;
+#define _ADWAITA_INSIDE
+#include <adw-dialog.h>
+#undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct Dialog_Class;
-
   struct Dialog : Gtk::Widget,
                   Gtk::ShortcutManager,
                   helpers::gobj_mixin<Dialog, AdwDialog>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GtkWidgetClass;
-      using BaseClassType = AdwDialogClass;
-      using BaseObjectType = AdwDialog;
-      using CppClassParent = struct Gtk::Widget_Class;
-      using CppObjectType = Dialog;
-
-      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 = AdwDialog;
+    using BaseClassType = AdwDialogClass;
+    using CppObjectType = Dialog;
+    using CppClassType = struct Dialog_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -71,6 +58,8 @@ namespace Adwaita
     auto set_title(Glib::ustring const & str) -> void;
 
   protected:
+    friend Dialog_Class;
+
     explicit Dialog(Glib::ConstructParams const & params);
     explicit Dialog(BaseObjectType * gobj);
   };