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

Core: Remove NonCopyable

Browse Source 
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
This commit is contained in:
Lynix
2015-09-24 00:37:21 +02:00
parent b16abf0d09
commit 2fd3872099
39 changed files with 205 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@
#define NAZARA_WINDOW_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Utility/Config.hpp>
@@ -30,7 +29,7 @@ class NzImage;
class NzIcon;
class NzWindowImpl;
class NAZARA_UTILITY_API NzWindow : NzNonCopyable
class NAZARA_UTILITY_API NzWindow
{
friend NzWindowImpl;
friend class NzMouse;
@@ -40,6 +39,8 @@ class NAZARA_UTILITY_API NzWindow : NzNonCopyable
NzWindow();
NzWindow(NzVideoMode mode, const NzString& title, nzUInt32 style = nzWindowStyle_Default);
NzWindow(NzWindowHandle handle);
NzWindow(const NzWindow&) = delete;
NzWindow(NzWindow&&) = delete; ///TODO
virtual ~NzWindow();
void Close();
@@ -89,6 +90,9 @@ class NAZARA_UTILITY_API NzWindow : NzNonCopyable
bool WaitEvent(NzEvent* event);
NzWindow& operator=(const NzWindow&) = delete;
NzWindow& operator=(NzWindow&&) = delete; ///TODO
protected:
virtual bool OnWindowCreated();
virtual void OnWindowDestroy();