From 0ad6295ff417d6803c8aaa01c6ccd44e8f0b4b74 Mon Sep 17 00:00:00 2001
From: laurentgom <laurentgom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Wed, 17 Jun 2009 07:55:46 +0000
Subject: [PATCH] Fixed the Linux makefile of the Qt sample

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1145 4e206d99-4929-0410-ac5d-dfc041789085
---
 samples/qt/Makefile                     |  2 +-
 src/SFML/Window/Linux/WindowImplX11.cpp | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/samples/qt/Makefile b/samples/qt/Makefile
index b02aba9bb..43d09cdd4 100644
--- a/samples/qt/Makefile
+++ b/samples/qt/Makefile
@@ -7,7 +7,7 @@ qt: $(OBJ)
 	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system -lQtCore -lQtGui -lX11
 
 %.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4
+	$(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4 -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui
 
 .PHONY: clean mrproper
 
diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp b/src/SFML/Window/Linux/WindowImplX11.cpp
index fa0bd8ef5..edec19b02 100644
--- a/src/SFML/Window/Linux/WindowImplX11.cpp
+++ b/src/SFML/Window/Linux/WindowImplX11.cpp
@@ -349,20 +349,11 @@ WindowImplX11::~WindowImplX11()
     // Close the display
     CloseDisplay();
 }
-
-
+
+
 ////////////////////////////////////////////////////////////
 /// Check if there's an active context on the current thread
-////////////////////
 ////////////////////////////////////////////////////////////
-/// Filter the received events
-/// (only allow those matching a specific window)
-////////////////////////////////////////////////////////////
-Bool CheckEvent(::Display*, XEvent* Event, XPointer UserData)
-{
-    // Just check if the event matches our window
-    return Event->xany.window == reinterpret_cast< ::Window >(UserData);
-}////////////////////////////////////////
 bool WindowImplX11::IsContextActive()
 {
     return glXGetCurrentContext() != NULL;