sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility/Icon: Make Icon a RefCounted object

Browse Source
This commit is contained in:
Lynix
2017-01-19 21:59:34 +01:00
parent 439f8d0033
commit e4b6f8e126
5 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Nazara/Utility/Window.cpp
View File

@@ -408,23 +408,13 @@ namespace Nz
m_impl->SetFocus();
}
void Window::SetIcon(const Icon& icon)
void Window::SetIcon(IconRef icon)
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Window not created");
return;
}
NazaraAssert(m_impl, "Window not created");
NazaraAssert(icon && icon.IsValid(), "Invalid icon");
if (!icon.IsValid())
{
NazaraError("Icon is not valid");
return;
}
#endif
m_impl->SetIcon(icon);
m_icon = std::move(icon);
m_impl->SetIcon(*m_icon);
}
void Window::SetMaximumSize(const Vector2i& maxSize)