From f10ed46035e52ee6175c4ffecbe42a0faff1a1d4 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Mon, 10 Oct 2016 22:15:12 +0200
Subject: [PATCH] Fix merge error

Former-commit-id: a608db04b5bf3f90567c87ef7fd709f71633b276 [formerly 74ea59dd0272dec9654a9545f019158a7ed1356c] [formerly a335e611a60e5dbc9331711433760ebe9fea9fc8 [formerly 4b23e4dc222a578292bc57b390438c6affe2145b]]
Former-commit-id: 45c8278e5496526640f9dc380ff9753dda6db0cb [formerly 6b2c2790026867f1870991200ac9bbe546b99a62]
Former-commit-id: 2fb15f949bf0fa1d20c222aeb64fe88a738132d5
---
 include/Nazara/Utility/Window.inl | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/include/Nazara/Utility/Window.inl b/include/Nazara/Utility/Window.inl
index 4eedf2d9e..08b23fc04 100644
--- a/include/Nazara/Utility/Window.inl
+++ b/include/Nazara/Utility/Window.inl
@@ -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)