From 273cba055cbcb27bc5cf5ec213aaa45e3d04e72f Mon Sep 17 00:00:00 2001
From: LaurentGom <LaurentGom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Mon, 11 Jan 2010 12:46:44 +0000
Subject: [PATCH] Added Style::Default for windows' style Removed unused
 #includes from RenderWindow.cpp

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1345 4e206d99-4929-0410-ac5d-dfc041789085
---
 include/SFML/Graphics/RenderWindow.hpp | 2 +-
 include/SFML/Window/Window.hpp         | 4 ++--
 include/SFML/Window/WindowStyle.hpp    | 4 +++-
 src/SFML/Graphics/RenderWindow.cpp     | 3 ---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp
index 4d95e0a18..0e002921d 100644
--- a/include/SFML/Graphics/RenderWindow.hpp
+++ b/include/SFML/Graphics/RenderWindow.hpp
@@ -72,7 +72,7 @@ public :
     /// \param settings Additional settings for the underlying OpenGL context
     ///
     ////////////////////////////////////////////////////////////
-    RenderWindow(VideoMode mode, const std::string& title, unsigned long style = Style::Resize | Style::Close, const ContextSettings& settings = ContextSettings());
+    RenderWindow(VideoMode mode, const std::string& title, unsigned long style = Style::Default, const ContextSettings& settings = ContextSettings());
 
     ////////////////////////////////////////////////////////////
     /// \brief Construct the window from an existing control
diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp
index d65c34530..03328ef07 100644
--- a/include/SFML/Window/Window.hpp
+++ b/include/SFML/Window/Window.hpp
@@ -86,7 +86,7 @@ public :
     /// \param settings Additional settings for the underlying OpenGL context
     ///
     ////////////////////////////////////////////////////////////
-    Window(VideoMode mode, const std::string& title, unsigned long style = Style::Resize | Style::Close, const ContextSettings& settings = ContextSettings());
+    Window(VideoMode mode, const std::string& title, unsigned long style = Style::Default, const ContextSettings& settings = ContextSettings());
 
     ////////////////////////////////////////////////////////////
     /// \brief Construct the window from an existing control
@@ -126,7 +126,7 @@ public :
     /// \param settings Additional settings for the underlying OpenGL context
     ///
     ////////////////////////////////////////////////////////////
-    void Create(VideoMode mode, const std::string& title, unsigned long style = Style::Resize | Style::Close, const ContextSettings& settings = ContextSettings());
+    void Create(VideoMode mode, const std::string& title, unsigned long style = Style::Default, const ContextSettings& settings = ContextSettings());
 
     ////////////////////////////////////////////////////////////
     /// \brief Create (or recreate) the window from an existing control
diff --git a/include/SFML/Window/WindowStyle.hpp b/include/SFML/Window/WindowStyle.hpp
index 54392e926..d65fcf23e 100644
--- a/include/SFML/Window/WindowStyle.hpp
+++ b/include/SFML/Window/WindowStyle.hpp
@@ -40,7 +40,9 @@ namespace Style
         Titlebar   = 1 << 0, ///< Title bar + fixed border
         Resize     = 1 << 1, ///< Titlebar + resizable border + maximize button
         Close      = 1 << 2, ///< Titlebar + close button
-        Fullscreen = 1 << 3  ///< Fullscreen mode (this flag and all others are mutually exclusive)
+        Fullscreen = 1 << 3, ///< Fullscreen mode (this flag and all others are mutually exclusive)
+
+        Default = Titlebar | Resize | Close ///< Default window style
     };
 }
 
diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/SFML/Graphics/RenderWindow.cpp
index 6e5bd3c0c..d3f77a5b2 100644
--- a/src/SFML/Graphics/RenderWindow.cpp
+++ b/src/SFML/Graphics/RenderWindow.cpp
@@ -26,9 +26,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderWindow.hpp>
-#include <SFML/Graphics/Drawable.hpp>
-#include <SFML/Graphics/Image.hpp>
-#include <iostream>
 
 
 namespace sf