Imported Upstream version 1.5+repack1

67 files changed, 127 insertions, 82 deletions

diff --git a/include/SFML/Audio.hpp b/include/SFML/Audio.hpp
index 574d4d2..9a83a73 100755
--- a/include/SFML/Audio.hpp
+++ b/include/SFML/Audio.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/AudioResource.hpp b/include/SFML/Audio/AudioResource.hpp
index c0dbdb2..410466d 100755
--- a/include/SFML/Audio/AudioResource.hpp
+++ b/include/SFML/Audio/AudioResource.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/Listener.hpp b/include/SFML/Audio/Listener.hpp
index c6679b3..95227ca 100755
--- a/include/SFML/Audio/Listener.hpp
+++ b/include/SFML/Audio/Listener.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
index 2820c2a..de74995 100755
--- a/include/SFML/Audio/Music.hpp
+++ b/include/SFML/Audio/Music.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/Sound.hpp b/include/SFML/Audio/Sound.hpp
index cced19e..691d633 100755
--- a/include/SFML/Audio/Sound.hpp
+++ b/include/SFML/Audio/Sound.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -160,6 +160,16 @@ public :
     void SetPosition(const Vector3f& Position);

 

     ////////////////////////////////////////////////////////////

+    /// Make the sound's position relative to the listener's

+    /// position, or absolute.

+    /// The default value is false (absolute)

+    ///

+    /// \param Relative : True to set the position relative, false to set it absolute

+    ///

+    ////////////////////////////////////////////////////////////

+    void SetRelativeToListener(bool Relative);

+

+    ////////////////////////////////////////////////////////////

     /// Set the minimum distance - closer than this distance,

     /// the listener will hear the sound at its maximum volume.

     /// The default minimum distance is 1.0

@@ -228,6 +238,15 @@ public :
     Vector3f GetPosition() const;

 

     ////////////////////////////////////////////////////////////

+    /// Tell if the sound's position is relative to the listener's

+    /// position, or if it's absolute

+    ///

+    /// \return True if the position is relative, false if it's absolute

+    ///

+    ////////////////////////////////////////////////////////////

+    bool IsRelativeToListener() const;

+

+    ////////////////////////////////////////////////////////////

     /// Get the minimum distance

     ///

     /// \return Minimum distance for the sound

diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp
index f9194b2..af459f4 100755
--- a/include/SFML/Audio/SoundBuffer.hpp
+++ b/include/SFML/Audio/SoundBuffer.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/SoundBufferRecorder.hpp b/include/SFML/Audio/SoundBufferRecorder.hpp
index 1629f3b..e949a1c 100755
--- a/include/SFML/Audio/SoundBufferRecorder.hpp
+++ b/include/SFML/Audio/SoundBufferRecorder.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/SoundRecorder.hpp b/include/SFML/Audio/SoundRecorder.hpp
index f62d9c3..551a4b9 100755
--- a/include/SFML/Audio/SoundRecorder.hpp
+++ b/include/SFML/Audio/SoundRecorder.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Audio/SoundStream.hpp b/include/SFML/Audio/SoundStream.hpp
index 8cc2024..6df0c57 100755
--- a/include/SFML/Audio/SoundStream.hpp
+++ b/include/SFML/Audio/SoundStream.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -53,11 +53,13 @@ public :
     using Sound::SetPitch;

     using Sound::SetVolume;

     using Sound::SetPosition;

+    using Sound::SetRelativeToListener;

     using Sound::SetMinDistance;

     using Sound::SetAttenuation;

     using Sound::GetPitch;

     using Sound::GetVolume;

     using Sound::GetPosition;

+    using Sound::IsRelativeToListener;

     using Sound::GetMinDistance;

     using Sound::GetAttenuation;

 

diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
index 86800e4..91d052f 100755
--- a/include/SFML/Config.hpp
+++ b/include/SFML/Config.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -49,6 +49,11 @@
     // MacOS

     #define SFML_SYSTEM_MACOS

 

+#elif defined(__FreeBSD__)

+

+    // FreeBSD

+    #define SFML_SYSTEM_FREEBSD

+

 #else

 

     // Unsupported system

diff --git a/include/SFML/Graphics.hpp b/include/SFML/Graphics.hpp
index c6282c5..ea4d846 100755
--- a/include/SFML/Graphics.hpp
+++ b/include/SFML/Graphics.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Color.hpp b/include/SFML/Graphics/Color.hpp
index 1898e4d..5f4d4d7 100755
--- a/include/SFML/Graphics/Color.hpp
+++ b/include/SFML/Graphics/Color.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Drawable.hpp b/include/SFML/Graphics/Drawable.hpp
index 3586047..a93ec57 100755
--- a/include/SFML/Graphics/Drawable.hpp
+++ b/include/SFML/Graphics/Drawable.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Font.hpp b/include/SFML/Graphics/Font.hpp
index 293954e..866b974 100755
--- a/include/SFML/Graphics/Font.hpp
+++ b/include/SFML/Graphics/Font.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Glyph.hpp b/include/SFML/Graphics/Glyph.hpp
index 602cfef..ec1b886 100755
--- a/include/SFML/Graphics/Glyph.hpp
+++ b/include/SFML/Graphics/Glyph.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Image.hpp b/include/SFML/Graphics/Image.hpp
index e950ec3..2a32271 100755
--- a/include/SFML/Graphics/Image.hpp
+++ b/include/SFML/Graphics/Image.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -161,9 +161,10 @@ public :
     /// \param DestX :      X coordinate of the destination position

     /// \param DestY :      Y coordinate of the destination position

     /// \param SourceRect : Sub-rectangle of the source image to copy (empty by default - entire image)

+    /// \param ApplyAlpha : Should the copy take in account the source transparency? (false by default)

     ///

     ////////////////////////////////////////////////////////////

-    void Copy(const Image& Source, unsigned int DestX, unsigned int DestY, const IntRect& SourceRect = IntRect(0, 0, 0, 0));

+    void Copy(const Image& Source, unsigned int DestX, unsigned int DestY, const IntRect& SourceRect = IntRect(0, 0, 0, 0), bool ApplyAlpha = false);

 

     ////////////////////////////////////////////////////////////

     /// Create the image from the current contents of the

diff --git a/include/SFML/Graphics/Matrix3.hpp b/include/SFML/Graphics/Matrix3.hpp
index 2d1ea74..eeea1b0 100755
--- a/include/SFML/Graphics/Matrix3.hpp
+++ b/include/SFML/Graphics/Matrix3.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Matrix3.inl b/include/SFML/Graphics/Matrix3.inl
index 658157c..73c78b7 100755
--- a/include/SFML/Graphics/Matrix3.inl
+++ b/include/SFML/Graphics/Matrix3.inl
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFGE - Simple and Fast Game Engine

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/PostFX.hpp b/include/SFML/Graphics/PostFX.hpp
index 7890a42..c875377 100755
--- a/include/SFML/Graphics/PostFX.hpp
+++ b/include/SFML/Graphics/PostFX.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Rect.hpp b/include/SFML/Graphics/Rect.hpp
index b8e693d..5decd3c 100755
--- a/include/SFML/Graphics/Rect.hpp
+++ b/include/SFML/Graphics/Rect.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Rect.inl b/include/SFML/Graphics/Rect.inl
index 8391119..6c5962d 100755
--- a/include/SFML/Graphics/Rect.inl
+++ b/include/SFML/Graphics/Rect.inl
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/RenderTarget.hpp b/include/SFML/Graphics/RenderTarget.hpp
index 93131f3..ea303d9 100755
--- a/include/SFML/Graphics/RenderTarget.hpp
+++ b/include/SFML/Graphics/RenderTarget.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp
index 91f78ad..7c09044 100755
--- a/include/SFML/Graphics/RenderWindow.hpp
+++ b/include/SFML/Graphics/RenderWindow.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Shape.hpp b/include/SFML/Graphics/Shape.hpp
index 0db529a..37fb3c4 100755
--- a/include/SFML/Graphics/Shape.hpp
+++ b/include/SFML/Graphics/Shape.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/Sprite.hpp b/include/SFML/Graphics/Sprite.hpp
index c7aa348..d5d835e 100755
--- a/include/SFML/Graphics/Sprite.hpp
+++ b/include/SFML/Graphics/Sprite.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/String.hpp b/include/SFML/Graphics/String.hpp
index a7f4718..b0ca81b 100755
--- a/include/SFML/Graphics/String.hpp
+++ b/include/SFML/Graphics/String.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Graphics/View.hpp b/include/SFML/Graphics/View.hpp
index 4ef9ef6..d5e401a 100755
--- a/include/SFML/Graphics/View.hpp
+++ b/include/SFML/Graphics/View.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network.hpp b/include/SFML/Network.hpp
index fe1730a..6ec13d3 100755
--- a/include/SFML/Network.hpp
+++ b/include/SFML/Network.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/Ftp.hpp b/include/SFML/Network/Ftp.hpp
index 673b904..f2f1bd3 100755
--- a/include/SFML/Network/Ftp.hpp
+++ b/include/SFML/Network/Ftp.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/Http.hpp b/include/SFML/Network/Http.hpp
index 3e02531..54e5c1f 100755
--- a/include/SFML/Network/Http.hpp
+++ b/include/SFML/Network/Http.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -315,12 +315,13 @@ public :
     /// not return instantly; use a thread if you don't want to block your

     /// application.

     ///

-    /// \param Req : Request to send

+    /// \param Req :     Request to send

+    /// \param Timeout : Maximum time to wait, in seconds (0 by default, means no timeout)

     ///

     /// \return Server's response

     ///

     ////////////////////////////////////////////////////////////

-    Response SendRequest(const Request& Req);

+    Response SendRequest(const Request& Req, float Timeout = 0.f);

 

 private :

 

diff --git a/include/SFML/Network/IPAddress.hpp b/include/SFML/Network/IPAddress.hpp
index 8373315..638dc47 100755
--- a/include/SFML/Network/IPAddress.hpp
+++ b/include/SFML/Network/IPAddress.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -123,10 +123,12 @@ public :
     /// distant website ; as a consequence, this function may be

     /// very slow -- use it as few as possible !

     ///

+    /// \param Timeout : Maximum time to wait, in seconds (0 by default : no timeout)

+    ///

     /// \return Public IP address

     ///

     ////////////////////////////////////////////////////////////

-    static IPAddress GetPublicAddress();

+    static IPAddress GetPublicAddress(float Timeout = 0.f);

 

     ////////////////////////////////////////////////////////////

     /// Comparison operator ==

diff --git a/include/SFML/Network/Packet.hpp b/include/SFML/Network/Packet.hpp
index 3add17f..9c5463f 100755
--- a/include/SFML/Network/Packet.hpp
+++ b/include/SFML/Network/Packet.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/Selector.hpp b/include/SFML/Network/Selector.hpp
index 3ab7dfa..588a72c 100755
--- a/include/SFML/Network/Selector.hpp
+++ b/include/SFML/Network/Selector.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/Selector.inl b/include/SFML/Network/Selector.inl
index 326c994..40ac948 100755
--- a/include/SFML/Network/Selector.inl
+++ b/include/SFML/Network/Selector.inl
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/SelectorBase.hpp b/include/SFML/Network/SelectorBase.hpp
index 433e789..4b9e915 100755
--- a/include/SFML/Network/SelectorBase.hpp
+++ b/include/SFML/Network/SelectorBase.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/SocketHelper.hpp b/include/SFML/Network/SocketHelper.hpp
index 36126db..166ce60 100755
--- a/include/SFML/Network/SocketHelper.hpp
+++ b/include/SFML/Network/SocketHelper.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/SocketTCP.hpp b/include/SFML/Network/SocketTCP.hpp
index 452b304..964686a 100755
--- a/include/SFML/Network/SocketTCP.hpp
+++ b/include/SFML/Network/SocketTCP.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/SocketUDP.hpp b/include/SFML/Network/SocketUDP.hpp
index ba43762..37df3f7 100755
--- a/include/SFML/Network/SocketUDP.hpp
+++ b/include/SFML/Network/SocketUDP.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -100,11 +100,12 @@ public :
     /// \param MaxSize :      Maximum number of bytes to read

     /// \param SizeReceived : Number of bytes received

     /// \param Address :      Address of the computer which sent the data

+    /// \param Port :         Port on which the remote computer sent the data

     ///

     /// \return Status code

     ///

     ////////////////////////////////////////////////////////////

-    Socket::Status Receive(char* Data, std::size_t MaxSize, std::size_t& SizeReceived, IPAddress& Address);

+    Socket::Status Receive(char* Data, std::size_t MaxSize, std::size_t& SizeReceived, IPAddress& Address, unsigned short& Port);

 

     ////////////////////////////////////////////////////////////

     /// Send a packet of data

@@ -124,11 +125,12 @@ public :
     ///

     /// \param PacketToReceive : Packet to fill with received data

     /// \param Address :         Address of the computer which sent the packet

+    /// \param Port :            Port on which the remote computer sent the data

     ///

     /// \return Status code

     ///

     ////////////////////////////////////////////////////////////

-    Socket::Status Receive(Packet& PacketToReceive, IPAddress& Address);

+    Socket::Status Receive(Packet& PacketToReceive, IPAddress& Address, unsigned short& Port);

 

     ////////////////////////////////////////////////////////////

     /// Close the socket

diff --git a/include/SFML/Network/Sockets.hpp b/include/SFML/Network/Sockets.hpp
index b611e85..1359cb9 100755
--- a/include/SFML/Network/Sockets.hpp
+++ b/include/SFML/Network/Sockets.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Network/Win32/SocketHelper.hpp b/include/SFML/Network/Win32/SocketHelper.hpp
index d7851b4..6199c0a 100755
--- a/include/SFML/Network/Win32/SocketHelper.hpp
+++ b/include/SFML/Network/Win32/SocketHelper.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System.hpp b/include/SFML/System.hpp
index 6350210..f2b6844 100755
--- a/include/SFML/System.hpp
+++ b/include/SFML/System.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Clock.hpp b/include/SFML/System/Clock.hpp
index 4b3cf9a..76c0055 100755
--- a/include/SFML/System/Clock.hpp
+++ b/include/SFML/System/Clock.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Lock.hpp b/include/SFML/System/Lock.hpp
index f1176fa..6f84f73 100755
--- a/include/SFML/System/Lock.hpp
+++ b/include/SFML/System/Lock.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Mutex.hpp b/include/SFML/System/Mutex.hpp
index 7e096ae..536c537 100755
--- a/include/SFML/System/Mutex.hpp
+++ b/include/SFML/System/Mutex.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/NonCopyable.hpp b/include/SFML/System/NonCopyable.hpp
index 338653d..3ac6719 100755
--- a/include/SFML/System/NonCopyable.hpp
+++ b/include/SFML/System/NonCopyable.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Randomizer.hpp b/include/SFML/System/Randomizer.hpp
index dd453c1..8ed27cd 100755
--- a/include/SFML/System/Randomizer.hpp
+++ b/include/SFML/System/Randomizer.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Sleep.hpp b/include/SFML/System/Sleep.hpp
index 8cc23f5..2d0ebca 100755
--- a/include/SFML/System/Sleep.hpp
+++ b/include/SFML/System/Sleep.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -36,7 +36,7 @@ namespace sf
     ////////////////////////////////////////////////////////////

     /// Make the current thread sleep for a given time

     ///

-    /// \param Duration : Time to sleep, in seconds

+    /// \param Duration : Time to sleep, in seconds (must be >= 0)

     ///

     ////////////////////////////////////////////////////////////

     void SFML_API Sleep(float Duration);

diff --git a/include/SFML/System/Thread.hpp b/include/SFML/System/Thread.hpp
index 016dab7..1cfe1e6 100755
--- a/include/SFML/System/Thread.hpp
+++ b/include/SFML/System/Thread.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Unicode.hpp b/include/SFML/System/Unicode.hpp
index f7208e8..f807fb3 100755
--- a/include/SFML/System/Unicode.hpp
+++ b/include/SFML/System/Unicode.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -275,9 +275,9 @@ private :
     static const std::locale& GetDefaultLocale();

 

     ////////////////////////////////////////////////////////////

-    // Static data member

+    // Static member data

     ////////////////////////////////////////////////////////////

-    static const char   UTF8TrailingBytes[256]; ///< Lookup table to find the length of an UTF-8 sequence

+    static const int    UTF8TrailingBytes[256]; ///< Lookup table to find the length of an UTF-8 sequence

     static const Uint32 UTF8Offsets[6];         ///< Magic values to subtract during UTF-8 conversions

     static const Uint8  UTF8FirstBytes[7];      ///< First bytes for UTF-8 sequences

 };

diff --git a/include/SFML/System/Unicode.inl b/include/SFML/System/Unicode.inl
index 2dbb3a2..a169811 100755
--- a/include/SFML/System/Unicode.inl
+++ b/include/SFML/System/Unicode.inl
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -104,7 +104,7 @@ inline Out Unicode::UTF8ToUTF16(In Begin, In End, Out Output, Uint16 Replacement
     while (Begin < End)

     {

         Uint32 c = 0;

-        int TrailingBytes = UTF8TrailingBytes[*Begin];

+        int TrailingBytes = UTF8TrailingBytes[static_cast<int>(*Begin)];

         if (Begin + TrailingBytes < End)

         {

             // First decode the UTF-8 character

@@ -165,7 +165,7 @@ inline Out Unicode::UTF8ToUTF32(In Begin, In End, Out Output, Uint32 Replacement
     while (Begin < End)

     {

         Uint32 c = 0;

-        int TrailingBytes = UTF8TrailingBytes[*Begin];

+        int TrailingBytes = UTF8TrailingBytes[static_cast<int>(*Begin)];

         if (Begin + TrailingBytes < End)

         {

             // First decode the UTF-8 character

@@ -424,7 +424,7 @@ inline std::size_t Unicode::GetUTF8Length(In Begin, In End)
     std::size_t Length = 0;

     while (Begin < End)

     {

-        int NbBytes = UTF8TrailingBytes[*Begin];

+        int NbBytes = UTF8TrailingBytes[static_cast<int>(*Begin)];

         if (Begin + NbBytes < End)

             ++Length;

 

diff --git a/include/SFML/System/Vector2.hpp b/include/SFML/System/Vector2.hpp
index f6a18ab..0a5267c 100755
--- a/include/SFML/System/Vector2.hpp
+++ b/include/SFML/System/Vector2.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Vector2.inl b/include/SFML/System/Vector2.inl
index 05f686c..febd493 100755
--- a/include/SFML/System/Vector2.inl
+++ b/include/SFML/System/Vector2.inl
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Vector3.hpp b/include/SFML/System/Vector3.hpp
index 0174c3f..6ab4b84 100755
--- a/include/SFML/System/Vector3.hpp
+++ b/include/SFML/System/Vector3.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Vector3.inl b/include/SFML/System/Vector3.inl
index 234a01c..8594601 100755
--- a/include/SFML/System/Vector3.inl
+++ b/include/SFML/System/Vector3.inl
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Win32/Mutex.hpp b/include/SFML/System/Win32/Mutex.hpp
index 6d84cc5..3cf5f9d 100755
--- a/include/SFML/System/Win32/Mutex.hpp
+++ b/include/SFML/System/Win32/Mutex.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/System/Win32/Thread.hpp b/include/SFML/System/Win32/Thread.hpp
index c1a0ac9..f44dfe1 100755
--- a/include/SFML/System/Win32/Thread.hpp
+++ b/include/SFML/System/Win32/Thread.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window.hpp b/include/SFML/Window.hpp
index a73ff1b..3a516a0 100755
--- a/include/SFML/Window.hpp
+++ b/include/SFML/Window.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/Context.hpp b/include/SFML/Window/Context.hpp
index 2335afb..fede21c 100755
--- a/include/SFML/Window/Context.hpp
+++ b/include/SFML/Window/Context.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp
index dd9814e..142fff5 100755
--- a/include/SFML/Window/Event.hpp
+++ b/include/SFML/Window/Event.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
diff --git a/include/SFML/Window/Input.hpp b/include/SFML/Window/Input.hpp
index 4156db2..fbac66a 100755
--- a/include/SFML/Window/Input.hpp
+++ b/include/SFML/Window/Input.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/OpenGL.hpp b/include/SFML/Window/OpenGL.hpp
index 56e2623..fcd4868 100755
--- a/include/SFML/Window/OpenGL.hpp
+++ b/include/SFML/Window/OpenGL.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

@@ -27,10 +27,22 @@
 

 

 ////////////////////////////////////////////////////////////

+/// Headers

+////////////////////////////////////////////////////////////

+#include <SFML/Config.hpp>

+

+

+////////////////////////////////////////////////////////////

 /// This file just includes the OpenGL (GL and GLU) headers,

 /// which have actually different paths on each system

 ////////////////////////////////////////////////////////////

-#if defined(SFML_SYSTEM_WINDOWS) || defined(SFML_SYSTEM_LINUX)

+#if defined(SFML_SYSTEM_WINDOWS)

+

+    #include <windows.h>

+    #include <GL/gl.h>

+    #include <GL/glu.h>

+

+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)

 

     #include <GL/gl.h>

     #include <GL/glu.h>

@@ -44,3 +56,4 @@
 

 

 #endif // SFML_OPENGL_HPP

+

diff --git a/include/SFML/Window/VideoMode.hpp b/include/SFML/Window/VideoMode.hpp
index 955f016..b439e64 100755
--- a/include/SFML/Window/VideoMode.hpp
+++ b/include/SFML/Window/VideoMode.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp
index 1506b3f..cc56cf7 100755
--- a/include/SFML/Window/Window.hpp
+++ b/include/SFML/Window/Window.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/WindowHandle.hpp b/include/SFML/Window/WindowHandle.hpp
index 356a798..852036c 100755
--- a/include/SFML/Window/WindowHandle.hpp
+++ b/include/SFML/Window/WindowHandle.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -42,14 +42,14 @@ namespace sf
     // Windows defines a void* handle (HWND)
     typedef void* WindowHandle;
 
-#elif defined(SFML_SYSTEM_LINUX)
+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
 
     // Unix - X11 defines an unsigned integer handle (Window)
     typedef unsigned long WindowHandle;
 
 #elif defined(SFML_SYSTEM_MACOS)
 
-    // OSX - A GrafPort struct defined as WindowRef
+    // Mac OS X defines a void* handle (NSWindow)
 	typedef void* WindowHandle;
 
 #endif
diff --git a/include/SFML/Window/WindowListener.hpp b/include/SFML/Window/WindowListener.hpp
index 244f6fe..e085880 100755
--- a/include/SFML/Window/WindowListener.hpp
+++ b/include/SFML/Window/WindowListener.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/WindowSettings.hpp b/include/SFML/Window/WindowSettings.hpp
index 05e8962..78f9ecd 100755
--- a/include/SFML/Window/WindowSettings.hpp
+++ b/include/SFML/Window/WindowSettings.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.

diff --git a/include/SFML/Window/WindowStyle.hpp b/include/SFML/Window/WindowStyle.hpp
index 159b999..9fcc2e7 100755
--- a/include/SFML/Window/WindowStyle.hpp
+++ b/include/SFML/Window/WindowStyle.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////

 //

 // SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)

+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)

 //

 // This software is provided 'as-is', without any express or implied warranty.

 // In no event will the authors be held liable for any damages arising from the use of this software.