adw: clean up implementation

1 files changed, 7 insertions, 7 deletions

diff --git a/adw/src/dialog.cpp b/adw/src/dialog.cpp
index 3fe9752..c6d5e2b 100644
--- a/adw/src/dialog.cpp
+++ b/adw/src/dialog.cpp
@@ -8,6 +8,7 @@
 #include <glibmm/wrap.h>
 
 #include <gtkmm/init.h>
+#include <gtkmm/object.h>
 #include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
@@ -27,7 +28,7 @@ namespace turns::adw
   {
     if (!gtype_)
     {
-      class_init_func_ = &Dialog::Class::class_init_function;
+      class_init_func_ = &class_init_function;
       register_derived_type(adw_dialog_get_type());
     }
     return *this;
@@ -35,13 +36,13 @@ namespace turns::adw
 
   auto Dialog::Class::class_init_function(void * gclass, void * data) -> void
   {
-    auto const klass = static_cast<AdwDialogClass *>(gclass);
-    Gtk::Widget_Class::class_init_function(klass, data);
+    auto const klass = static_cast<BaseClassType *>(gclass);
+    CppClassParent::class_init_function(klass, data);
   }
 
   auto Dialog::Class::wrap_new(GObject * object) -> Glib::ObjectBase *
   {
-    return new Dialog(ADW_DIALOG(object));
+    return Gtk::manage(new Dialog(ADW_DIALOG(object)));
   }
 
   auto Dialog::get_type() -> GType
@@ -60,8 +61,7 @@ namespace turns::adw
   }
 
   Dialog::Dialog(AdwDialog * gobj)
-      : Glib::ObjectBase{nullptr}
-      , Gtk::Widget(GTK_WIDGET(gobj))
+      : Gtk::Widget(GTK_WIDGET(gobj))
   {
   }
 
@@ -82,6 +82,6 @@ namespace Glib
 {
   auto wrap(AdwDialog * object, bool copy) -> Glib::RefPtr<turns::adw::Dialog>
   {
-    return Glib::make_refptr_for_instance<turns::adw::Dialog>(dynamic_cast<turns::adw::Dialog *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::Dialog *>(Glib::wrap_auto(G_OBJECT(object), copy)));
   }
 }  // namespace Glib
\ No newline at end of file