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

Utility/Window: Fix destructor inline 

Former-commit-id: f55088c7edd5d14c4626a42fe11b7328fa3526b6 [formerly 6c5f0e4666989e8d57da06da103bc180ac1f0d8d] [formerly 2b8719258209c5c45d0b2d4257332b18f5594c3b [formerly fbc1e2f64d490e340d1b0054e7f9c2cacac18086]]
Former-commit-id: b8b5f64fb182f7b5e1f4a3d270590da1f35be0f1 [formerly ee4b8d9204690c2a33bb94047515e1e64e6fcef3]
Former-commit-id: 6413a1c4026dc7904026c259f7ead483342fcad2
This commit is contained in:
Lynix 2016-09-17 12:08:44 +02:00
parent 9e1b2c69a9
commit 48eb9ee3b5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,11 +55,6 @@ namespace Nz
window.m_impl = nullptr; window.m_impl = nullptr;
} }
inline Window::~Window()
{
Destroy();
}
inline void Window::Close() inline void Window::Close()
{ {
m_closed = true; // The window will be closed at the next non-const IsOpen() call m_closed = true; // The window will be closed at the next non-const IsOpen() call
@ -146,7 +141,7 @@ namespace Nz
{ {
Destroy(); Destroy();
m_closed = window.m_closed; m_closed = window.m_closed;
m_closeOnQuit = window.m_closeOnQuit; m_closeOnQuit = window.m_closeOnQuit;
m_eventPolling = window.m_eventPolling; m_eventPolling = window.m_eventPolling;
m_impl = window.m_impl; m_impl = window.m_impl;

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

@ -29,6 +29,11 @@ namespace Nz
Window* fullscreenWindow = nullptr; Window* fullscreenWindow = nullptr;
} }
Window::~Window()
{
Destroy();
}
bool Window::Create(VideoMode mode, const String& title, UInt32 style) bool Window::Create(VideoMode mode, const String& title, UInt32 style)
{ {
// Si la fenêtre est déjà ouverte, nous conservons sa position // Si la fenêtre est déjà ouverte, nous conservons sa position