Fix merge error

Former-commit-id: a608db04b5bf3f90567c87ef7fd709f71633b276 [formerly 74ea59dd0272dec9654a9545f019158a7ed1356c] [formerly a335e611a60e5dbc9331711433760ebe9fea9fc8 [formerly 4b23e4dc222a578292bc57b390438c6affe2145b]]
Former-commit-id: 45c8278e5496526640f9dc380ff9753dda6db0cb [formerly 6b2c2790026867f1870991200ac9bbe546b99a62]
Former-commit-id: 2fb15f949bf0fa1d20c222aeb64fe88a738132d5
This commit is contained in:
Lynix 2016-10-10 22:15:12 +02:00
parent 05dd93c549
commit f10ed46035
1 changed files with 0 additions and 20 deletions

View File

@ -80,26 +80,6 @@ namespace Nz
return m_eventHandler;
}
inline void Window::EnableCloseOnQuit(bool closeOnQuit)
{
m_closeOnQuit = closeOnQuit;
}
inline void Window::EnableEventPolling(bool enable)
{
m_eventPolling = enable;
if (!m_eventPolling)
{
while (!m_events.empty())
m_events.pop();
}
}
inline EventHandler& Nz::Window::GetEventHandler()
{
return m_eventHandler;
}
inline bool Window::IsOpen(bool checkClosed)
{
if (!m_impl)