[SCM] Simple and fast multimedia library for C++ branch, debian/repacking, updated. upstream/1.4-141-gdb2f7d6

[Christoph Egger]

The following commit has been merged in the debian/repacking branch:
commit db2f7d63c786edf546b8b2624e771282566025dc
Merge: 2695cc8e0bf6b25e470bb54ab17d192ddc985077 1aeef5ee840e3f7cf07e2a5606fa0306bfdb4a78
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Wed Apr 7 22:05:41 2010 +0200

    Merge commit 'refs/top-bases/debian/repacking' into debian/repacking

diff --combined src/SFML/Window/Linux/WindowImplX11.cpp
index 0346b35,edec19b..f527864
--- a/src/SFML/Window/Linux/WindowImplX11.cpp
+++ b/src/SFML/Window/Linux/WindowImplX11.cpp
@@@ -27,8 -27,8 +27,8 @@@
  ////////////////////////////////////////////////////////////
  #include <SFML/Window/WindowStyle.hpp> // important to be included first (conflict with None)
  #include <SFML/Window/Linux/WindowImplX11.hpp>
 -#include <SFML/Window/glext/glxext.h>
 -#include <SFML/Window/glext/glext.h>
 +#include <GL/glxext.h>
 +#include <GL/glext.h>
  #include <SFML/System/Unicode.hpp>
  #include <X11/keysym.h>
  #include <X11/extensions/Xrandr.h>
@@@ -349,20 -349,11 +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;

-- 
Simple and fast multimedia library for C++