adw: clean up implementation

1 files changed, 10 insertions, 3 deletions

diff --git a/src/switchrow.cpp b/src/switchrow.cpp
index 8e9508d..3bd4a89 100644
--- a/src/switchrow.cpp
+++ b/src/switchrow.cpp
@@ -7,6 +7,7 @@
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
 #include <glibmm/wrap.h>
+#include <gtkmm/object.h>
 
 #include <adwaita.h>
 #include <gio/gio.h>
@@ -23,14 +24,21 @@ namespace turns::adw
   {
     if (!gtype_)
     {
+      class_init_func_ = &class_init_function;
       gtype_ = adw_switch_row_get_type();
     }
     return *this;
   }
 
+  auto SwitchRow::Class::class_init_function(void * gclass, void * data) -> void
+  {
+    auto const klass = static_cast<BaseClassType *>(gclass);
+    CppClassParent::class_init_function(klass, data);
+  }
+
   auto SwitchRow::Class::wrap_new(GObject * object) -> Glib::ObjectBase *
   {
-    return new SwitchRow(ADW_SWITCH_ROW(object));
+    return Gtk::manage(new SwitchRow(ADW_SWITCH_ROW(object)));
   }
 
   SwitchRow::SwitchRow()
@@ -55,8 +63,7 @@ namespace turns::adw
   }
 
   SwitchRow::SwitchRow(BaseObjectType * gobj)
-      : Glib::ObjectBase{nullptr}
-      , adw::ActionRow(ADW_ACTION_ROW(gobj))
+      : adw::ActionRow(ADW_ACTION_ROW(gobj))
   {
   }