adw: clean up implementation

1 files changed, 8 insertions, 9 deletions

diff --git a/adw/src/preferencespage.cpp b/adw/src/preferencespage.cpp
index 475f591..8467e29 100644
--- a/adw/src/preferencespage.cpp
+++ b/adw/src/preferencespage.cpp
@@ -9,6 +9,7 @@
 #include <glibmm/wrap.h>
 
 #include <gtkmm/init.h>
+#include <gtkmm/object.h>
 #include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
@@ -21,13 +22,13 @@ namespace turns::adw
   namespace
   {
     auto constinit _class = PreferencesPage::Class{};
-  }
+  }  // namespace
 
   auto PreferencesPage::Class::init() -> Glib::Class const &
   {
     if (!gtype_)
     {
-      class_init_func_ = &PreferencesPage::Class::class_init_function;
+      class_init_func_ = &class_init_function;
       register_derived_type(adw_preferences_page_get_type());
     }
     return *this;
@@ -35,13 +36,13 @@ namespace turns::adw
 
   auto PreferencesPage::Class::class_init_function(void * gclass, void * data) -> void
   {
-    auto const klass = static_cast<AdwPreferencesPageClass *>(gclass);
-    Gtk::Widget_Class::class_init_function(klass, data);
+    auto const klass = static_cast<BaseClassType *>(gclass);
+    CppClassParent::class_init_function(klass, data);
   }
 
   auto PreferencesPage::Class::wrap_new(GObject * object) -> Glib::ObjectBase *
   {
-    return new PreferencesPage(ADW_PREFERENCES_PAGE(object));
+    return Gtk::manage(new PreferencesPage(ADW_PREFERENCES_PAGE(object)));
   }
 
   auto PreferencesPage::get_type() -> GType
@@ -60,8 +61,7 @@ namespace turns::adw
   }
 
   PreferencesPage::PreferencesPage(AdwPreferencesPage * gobj)
-      : Glib::ObjectBase{nullptr}
-      , Gtk::Widget(GTK_WIDGET(gobj))
+      : Gtk::Widget(GTK_WIDGET(gobj))
   {
   }
 
@@ -77,7 +77,6 @@ namespace Glib
 {
   auto wrap(AdwPreferencesPage * object, bool copy) -> Glib::RefPtr<turns::adw::PreferencesPage>
   {
-    return Glib::make_refptr_for_instance<turns::adw::PreferencesPage>(
-        dynamic_cast<turns::adw::PreferencesPage *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::PreferencesPage *>(Glib::wrap_auto(G_OBJECT(object), copy)));
   }
 }  // namespace Glib
\ No newline at end of file