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

7
include/Nazara/Utility/Window.hpp
View File

@@ -15,18 +15,18 @@
#include <Nazara/Core/String.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Cursor.hpp>
#include <Nazara/Utility/CursorController.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <Nazara/Utility/EventHandler.hpp>
#include <Nazara/Utility/Icon.hpp>
#include <Nazara/Utility/VideoMode.hpp>
#include <Nazara/Utility/WindowHandle.hpp>
#include <queue>
namespace Nz
{
class Cursor;
class Image;
class Icon;
class WindowImpl;
class NAZARA_UTILITY_API Window
@@ -86,7 +86,7 @@ namespace Nz
inline void SetCursor(SystemCursor systemCursor);
void SetEventListener(bool listener);
void SetFocus();
void SetIcon(const Icon& icon);
void SetIcon(IconRef icon);
void SetMaximumSize(const Vector2i& maxSize);
void SetMaximumSize(int width, int height);
void SetMinimumSize(const Vector2i& minSize);
@@ -126,6 +126,7 @@ namespace Nz
CursorController m_cursorController;
CursorRef m_cursor;
EventHandler m_eventHandler;
IconRef m_icon;
Mutex m_eventMutex;
Mutex m_eventConditionMutex;
bool m_asyncWindow;