diff options
| -rw-r--r-- | include/adwaitamm/application.hpp | 2 | ||||
| -rw-r--r-- | include/adwaitamm/stylemanager.hpp | 6 | ||||
| -rw-r--r-- | src/application.cpp | 4 | ||||
| -rw-r--r-- | src/stylemanager.cpp | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/adwaitamm/application.hpp b/include/adwaitamm/application.hpp index 780c114..afa446b 100644 --- a/include/adwaitamm/application.hpp +++ b/include/adwaitamm/application.hpp @@ -50,7 +50,7 @@ namespace Adwaita auto static create(Glib::ustring const & id = {}, Gio::Application::Flags flags = Gio::Application::Flags::NONE) -> Glib::RefPtr<Application>; - auto get_style_manager() const -> StyleManager *; + auto get_style_manager() const -> Glib::RefPtr<StyleManager>; auto property_style_manager() const -> Glib::PropertyProxy_ReadOnly<StyleManager *>; diff --git a/include/adwaitamm/stylemanager.hpp b/include/adwaitamm/stylemanager.hpp index b735cf0..c81cc40 100644 --- a/include/adwaitamm/stylemanager.hpp +++ b/include/adwaitamm/stylemanager.hpp @@ -44,8 +44,8 @@ namespace Adwaita auto operator=(StyleManager const & other) noexcept -> StyleManager & = delete; auto operator=(StyleManager && other) noexcept -> StyleManager & = delete; - auto static get_default() -> StyleManager *; - auto static for_display(Gdk::Display & display) -> StyleManager *; + auto static get_default() -> Glib::RefPtr<StyleManager>; + auto static for_display(Gdk::Display & display) -> Glib::RefPtr<StyleManager>; auto static get_type() -> GType; auto static get_base_type() -> GType; @@ -73,7 +73,7 @@ namespace Adwaita namespace Glib { - auto wrap(AdwStyleManager * object) -> Adwaita::StyleManager *; + auto wrap(AdwStyleManager * object, bool take_copy = false) -> Glib::RefPtr<Adwaita::StyleManager>; } // namespace Glib #endif
\ No newline at end of file diff --git a/src/application.cpp b/src/application.cpp index ad43017..a0a0cea 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -50,9 +50,9 @@ namespace Adwaita return Glib::RefPtr<Application>(new Application(id, flags)); } - auto Application::get_style_manager() const -> StyleManager * + auto Application::get_style_manager() const -> Glib::RefPtr<StyleManager> { - return Glib::wrap(adw_application_get_style_manager(const_cast<BaseObjectType *>(unwrap(this)))); + return Glib::wrap(adw_application_get_style_manager(const_cast<BaseObjectType *>(unwrap(this))), true); } auto Application::property_style_manager() const -> Glib::PropertyProxy_ReadOnly<StyleManager *> diff --git a/src/stylemanager.cpp b/src/stylemanager.cpp index c79bcbc..60ed211 100644 --- a/src/stylemanager.cpp +++ b/src/stylemanager.cpp @@ -28,14 +28,14 @@ namespace Adwaita auto constinit _class = StyleManager_Class{}; } // namespace - auto StyleManager::get_default() -> StyleManager * + auto StyleManager::get_default() -> Glib::RefPtr<StyleManager> { - return Glib::wrap(adw_style_manager_get_default()); + return Glib::wrap(adw_style_manager_get_default(), true); } - auto StyleManager::for_display(Gdk::Display & display) -> StyleManager * + auto StyleManager::for_display(Gdk::Display & display) -> Glib::RefPtr<StyleManager> { - return Glib::wrap(adw_style_manager_get_for_display(Glib::unwrap(&display))); + return Glib::wrap(adw_style_manager_get_for_display(Glib::unwrap(&display)), true); } auto StyleManager::get_type() -> GType @@ -124,8 +124,8 @@ namespace Adwaita namespace Glib { - auto wrap(AdwStyleManager * object) -> Adwaita::StyleManager * + auto wrap(AdwStyleManager * object, bool take_copy) -> Glib::RefPtr<Adwaita::StyleManager> { - return dynamic_cast<Adwaita::StyleManager *>(Glib::wrap_auto(G_OBJECT(object))); + return Glib::make_refptr_for_instance(dynamic_cast<Adwaita::StyleManager *>(Glib::wrap_auto(G_OBJECT(object), take_copy))); } } // namespace Glib
\ No newline at end of file |