adw: clean up wrap functions

8 files changed, 40 insertions, 32 deletions

diff --git a/adw/src/actionrow.cpp b/adw/src/actionrow.cpp
index e8cfc7d..9f79cee 100644
--- a/adw/src/actionrow.cpp
+++ b/adw/src/actionrow.cpp
@@ -201,8 +201,8 @@ namespace turns::adw
 
 namespace Glib
 {
-  auto wrap(AdwActionRow * object, bool copy) -> Glib::RefPtr<turns::adw::ActionRow>
+  auto wrap(AdwActionRow * object, bool copy) -> turns::adw::ActionRow *
   {
-    return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::ActionRow *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return dynamic_cast<turns::adw::ActionRow *>(Glib::wrap_auto(G_OBJECT(object), copy));
   }
 }  // namespace Glib
\ No newline at end of file
diff --git a/adw/src/breakpoint.cpp b/adw/src/breakpoint.cpp
index dd930a3..ed1c7f0 100644
--- a/adw/src/breakpoint.cpp
+++ b/adw/src/breakpoint.cpp
@@ -10,6 +10,7 @@
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/wrap.h>
+#include <gtkmm/buildable.h>
 
 #include <glib-object.h>
 
@@ -102,7 +103,8 @@ namespace turns::adw
     if (!gtype_)
     {
       class_init_func_ = &class_init_function;
-      gtype_ = adw_breakpoint_get_type();
+      register_derived_type(adw_breakpoint_get_type());
+      Gtk::Buildable::add_interface(get_type());
     }
     return *this;
   }
diff --git a/adw/src/preferencesdialog.cpp b/adw/src/preferencesdialog.cpp
index 10419fe..b949003 100644
--- a/adw/src/preferencesdialog.cpp
+++ b/adw/src/preferencesdialog.cpp
@@ -25,7 +25,7 @@ namespace turns::adw
   namespace
   {
     auto constinit _class = PreferencesDialog::Class{};
-  }
+  }  // namespace
 
   auto PreferencesDialog::Class::init() -> Glib::Class const &
   {
@@ -83,9 +83,8 @@ namespace turns::adw
 
 namespace Glib
 {
-  auto wrap(AdwPreferencesDialog * object, bool copy) -> Glib::RefPtr<turns::adw::PreferencesDialog>
+  auto wrap(AdwPreferencesDialog * object, bool copy) -> turns::adw::PreferencesDialog *
   {
-    return Glib::make_refptr_for_instance<turns::adw::PreferencesDialog>(
-        dynamic_cast<turns::adw::PreferencesDialog *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return dynamic_cast<turns::adw::PreferencesDialog *>(Glib::wrap_auto(G_OBJECT(object), copy));
   }
 }  // namespace Glib
\ No newline at end of file
diff --git a/adw/src/preferencespage.cpp b/adw/src/preferencespage.cpp
index 8467e29..64ae62c 100644
--- a/adw/src/preferencespage.cpp
+++ b/adw/src/preferencespage.cpp
@@ -75,8 +75,8 @@ namespace turns::adw
 
 namespace Glib
 {
-  auto wrap(AdwPreferencesPage * object, bool copy) -> Glib::RefPtr<turns::adw::PreferencesPage>
+  auto wrap(AdwPreferencesPage * object, bool copy) -> turns::adw::PreferencesPage *
   {
-    return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::PreferencesPage *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return dynamic_cast<turns::adw::PreferencesPage *>(Glib::wrap_auto(G_OBJECT(object), copy));
   }
 }  // namespace Glib
\ No newline at end of file
diff --git a/adw/src/preferencesrow.cpp b/adw/src/preferencesrow.cpp
index 039da96..a6f5368 100644
--- a/adw/src/preferencesrow.cpp
+++ b/adw/src/preferencesrow.cpp
@@ -99,8 +99,8 @@ namespace turns::adw
 
 namespace Glib
 {
-  auto wrap(AdwPreferencesRow * object, bool copy) -> Glib::RefPtr<turns::adw::PreferencesRow>
+  auto wrap(AdwPreferencesRow * object, bool copy) -> turns::adw::PreferencesRow *
   {
-    return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::PreferencesRow *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return dynamic_cast<turns::adw::PreferencesRow *>(Glib::wrap_auto(G_OBJECT(object), copy));
   }
 }  // namespace Glib
\ No newline at end of file
diff --git a/adw/src/switchrow.cpp b/adw/src/switchrow.cpp
index 3bd4a89..d7dd9dd 100644
--- a/adw/src/switchrow.cpp
+++ b/adw/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>
@@ -25,7 +26,7 @@ namespace turns::adw
     if (!gtype_)
     {
       class_init_func_ = &class_init_function;
-      gtype_ = adw_switch_row_get_type();
+      register_derived_type(adw_switch_row_get_type());
     }
     return *this;
   }
@@ -71,9 +72,8 @@ namespace turns::adw
 
 namespace Glib
 {
-  auto wrap(AdwSwitchRow * object, bool copy) -> Glib::RefPtr<turns::adw::SwitchRow>
+  auto wrap(AdwSwitchRow * object, bool copy) -> turns::adw::SwitchRow *
   {
-    return Glib::make_refptr_for_instance<turns::adw::SwitchRow>(
-        dynamic_cast<turns::adw::SwitchRow *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return dynamic_cast<turns::adw::SwitchRow *>(Glib::wrap_auto(G_OBJECT(object), copy));
   }
 }  // namespace Glib
\ No newline at end of file
diff --git a/adw/src/toast.cpp b/adw/src/toast.cpp
index c830496..1267221 100644
--- a/adw/src/toast.cpp
+++ b/adw/src/toast.cpp
@@ -31,7 +31,7 @@ namespace turns::adw
     if (!gtype_)
     {
       class_init_func_ = &class_init_function;
-      gtype_ = adw_toast_get_type();
+      register_derived_type(adw_toast_get_type());
     }
     return *this;
   }
@@ -53,29 +53,34 @@ namespace turns::adw
   {
   }
 
-  auto Toast::get_type() -> GType
+  Toast::Toast(Glib::ConstructParams const & params)
+      : Glib::Object{params}
   {
-    return _class.init().get_type();
   }
 
-  auto Toast::get_base_type() -> GType
+  Toast::Toast(BaseObjectType * gobj)
+      : Glib::Object((GObject *)gobj)
   {
-    return adw_toast_get_type();
   }
 
-  auto Toast::dismiss() -> void
+  auto Toast::create(Glib::ustring const & title) -> Glib::RefPtr<Toast>
   {
-    return adw_toast_dismiss(gobj());
+    return Glib::make_refptr_for_instance(new Toast{title});
   }
 
-  Toast::Toast(Glib::ConstructParams const & params)
-      : Glib::Object{params}
+  auto Toast::get_type() -> GType
   {
+    return _class.init().get_type();
   }
 
-  Toast::Toast(BaseObjectType * gobj)
-      : Glib::Object((GObject *)gobj)
+  auto Toast::get_base_type() -> GType
   {
+    return adw_toast_get_type();
+  }
+
+  auto Toast::dismiss() -> void
+  {
+    return adw_toast_dismiss(gobj());
   }
 
 }  // namespace turns::adw
diff --git a/adw/src/toastoverlay.cpp b/adw/src/toastoverlay.cpp
index d785e60..c50c62d 100644
--- a/adw/src/toastoverlay.cpp
+++ b/adw/src/toastoverlay.cpp
@@ -10,7 +10,9 @@
 #include <glibmm/ustring.h>
 #include <glibmm/utility.h>
 #include <glibmm/variant.h>
+#include <glibmm/wrap.h>
 
+#include <gtkmm/object.h>
 #include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
@@ -30,7 +32,7 @@ namespace turns::adw
     if (!gtype_)
     {
       class_init_func_ = &class_init_function;
-      gtype_ = adw_toast_overlay_get_type();
+      register_derived_type(adw_toast_overlay_get_type());
     }
     return *this;
   }
@@ -56,9 +58,10 @@ namespace turns::adw
     return adw_toast_overlay_get_type();
   }
 
-  auto ToastOverlay::add(Toast && toast) -> void
+  auto ToastOverlay::add(Glib::RefPtr<struct Toast> const & toast) -> void
   {
-    adw_toast_overlay_add_toast(gobj(), toast.gobj_copy());
+    // Take a copy since the overlay will take ownership of the toast.
+    adw_toast_overlay_add_toast(Glib::unwrap(this), Glib::unwrap_copy(toast));
   }
 
   ToastOverlay::ToastOverlay(Glib::ConstructParams const & params)
@@ -81,9 +84,8 @@ namespace turns::adw
 
 namespace Glib
 {
-  auto wrap(AdwToastOverlay * object, bool copy) -> Glib::RefPtr<turns::adw::ToastOverlay>
+  auto wrap(AdwToastOverlay * object, bool copy) -> turns::adw::ToastOverlay *
   {
-    return Glib::make_refptr_for_instance<turns::adw::ToastOverlay>(
-        dynamic_cast<turns::adw::ToastOverlay *>(Glib::wrap_auto(G_OBJECT(object), copy)));
+    return dynamic_cast<turns::adw::ToastOverlay *>(Glib::wrap_auto(G_OBJECT(object), copy));
   }
 }  // namespace Glib
\ No newline at end of file