From c91c7827b2ee21340ba29d3eb2790f7f15b53f7a Mon Sep 17 00:00:00 2001
From: Trass3r <Trass3r@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Sun, 30 Jan 2011 18:18:34 +0000
Subject: [PATCH] sync with sfml changes

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1785 4e206d99-4929-0410-ac5d-dfc041789085
---
 bindings/d/import/dsfml/graphics/shape.d | 28 ++++++++++++------------
 bindings/d/import/dsfml/window/window.d  | 28 ++++++++++++------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/bindings/d/import/dsfml/graphics/shape.d b/bindings/d/import/dsfml/graphics/shape.d
index 3b29abdf..87f40dc4 100644
--- a/bindings/d/import/dsfml/graphics/shape.d
+++ b/bindings/d/import/dsfml/graphics/shape.d
@@ -105,26 +105,26 @@ public:
 	}
 
 	/**
-	 *	Change the width of a shape outline
+	 *	Change the thickness of a shape outline
 	 *
 	 *	Params: 
-	 *		width = New width
+	 *		thickness = New thickness
 	 */
-	void outlineWidth(float width)
+	void outlineThickness(float thickness)
 	{
-		sfShape_SetOutlineWidth(m_ptr, width);
+		sfShape_SetOutlineThickness(m_ptr, thickness);
 	}
 
 	/**
-	 *	Get the width of the shape outline
+	 *	Get the thickness of the shape outline
 	 *
 	 *	Returns:
-	 *		Current outline width
+	 *		Current outline thickness
 	 *
 	 */
-	float outlineWidth() 
+	float outlineThickness() 
 	{
-		return sfShape_GetOutlineWidth(m_ptr);
+		return sfShape_GetOutlineThickness(m_ptr);
 	}
 
 	/**
@@ -229,7 +229,7 @@ public:
 	 *		p2X, p2Y = Position second point
 	 *		thickness = Line thickness
 	 *		col = Color used to draw the line
-	 *		outline = Outline width (0 by default)
+	 *		outline = Outline thickness (0 by default)
 	 *		outlineCol = Color used to draw the outline (black by default)
 	 *	
 	 *	Returns:
@@ -248,7 +248,7 @@ public:
 	 *		left, top = Top-left corner of the rectangle
 	 *		width, height = Size of the rectangle
 	 *		col = Color used to fill the rectangle
-	 *		outline = Outline width (0 by default)
+	 *		outline = Outline thickness (0 by default)
 	 *		outlineCol = Color used to draw the outline (black by default)
 	 *		
 	 *	Returns:
@@ -267,7 +267,7 @@ public:
 	 *		y = Y position of the center	
 	 *		radius = Radius
 	 *		col = Color used to fill the circle
-	 *		outline = Outline width (0 by default)
+	 *		outline = Outline thickness (0 by default)
 	 *		outlineCol = Color used to draw the outline (black by default)
 	 *
 	 *	Returns:
@@ -288,8 +288,8 @@ private:
 		void	function(SFMLClass, float, float, Color, Color)							sfShape_AddPoint;
 		void	function(SFMLClass, int)												sfShape_EnableFill;
 		void	function(SFMLClass, int)												sfShape_EnableOutline;
-		void	function(SFMLClass, float Width)										sfShape_SetOutlineWidth;
-		float	function(SFMLClass)														sfShape_GetOutlineWidth;
+		void	function(SFMLClass, float Width)										sfShape_SetOutlineThickness;
+		float	function(SFMLClass)														sfShape_GetOutlineThickness;
 		uint	function(SFMLClass)														sfShape_GetPointsCount;
 		void	function(SFMLClass, uint Index, float* X, float* Y)						sfShape_GetPointPosition;
 		void	function(SFMLClass, uint Index, float X, float Y)						sfShape_SetPointPosition;
@@ -300,7 +300,7 @@ private:
 	}
 
 	mixin(loadFromSharedLib2("csfml-graphics", "sfShape",
-	"CreateLine", "CreateRectangle", "CreateCircle", "AddPoint", "EnableFill", "EnableOutline", "SetOutlineWidth", "GetOutlineWidth",
+	"CreateLine", "CreateRectangle", "CreateCircle", "AddPoint", "EnableFill", "EnableOutline", "SetOutlineThickness", "GetOutlineThickness",
 	"GetPointsCount", "GetPointPosition", "SetPointPosition", "GetPointColor", "SetPointColor", "GetPointOutlineColor",
 	"SetPointOutlineColor"));
 }
\ No newline at end of file
diff --git a/bindings/d/import/dsfml/window/window.d b/bindings/d/import/dsfml/window/window.d
index d09f7f07..c25fd4d3 100644
--- a/bindings/d/import/dsfml/window/window.d
+++ b/bindings/d/import/dsfml/window/window.d
@@ -208,7 +208,18 @@ public:
 	{
 		sfWindow_Display(m_ptr);
 	}
-	
+
+	/**
+	 *	Enable / disable vertical synchronization
+	 *
+	 *	Params: 
+	 *		enabled : True to enable v-sync, false to deactivate
+	 */
+	void enableVerticalSync(bool enabled)
+	{
+		sfWindow_EnableVerticalSync(m_ptr, enabled);
+	}
+
 @property
 {
 	/**
@@ -254,17 +265,6 @@ public:
 		return sfWindow_GetSettings(m_ptr);
 	}		
 
-	/**
-	 *	Enable / disable vertical synchronization
-	 *
-	 *	Params: 
-	 *		enabled : True to enable v-sync, false to deactivate
-	 */
-	void useVerticalSync(bool enabled)
-	{
-		sfWindow_UseVerticalSync(m_ptr, enabled);
-	}
-
 	/**
 	 *	Show or hide the mouse cursor
 	 *
@@ -427,7 +427,7 @@ private:
 		uint			function(SFMLClass)									sfWindow_GetHeight;
 		ContextSettings	function(SFMLClass Window)							sfWindow_GetSettings;
 		int				function(SFMLClass, Event*)							sfWindow_GetEvent;
-		void			function(SFMLClass, int)							sfWindow_UseVerticalSync;
+		void			function(SFMLClass, int)							sfWindow_EnableVerticalSync;
 		void			function(SFMLClass, int)							sfWindow_ShowMouseCursor;
 		void			function(SFMLClass, uint, uint)						sfWindow_SetCursorPosition;
 		void			function(SFMLClass, int, int)						sfWindow_SetPosition;
@@ -448,7 +448,7 @@ private:
 	}
 
 	mixin(loadFromSharedLib2("csfml-window", "sfWindow",
-	"Create", "CreateFromHandle", "Destroy", "Close", "IsOpened", "GetWidth", "GetHeight", "GetSettings", "GetEvent", "UseVerticalSync",
+	"Create", "CreateFromHandle", "Destroy", "Close", "IsOpened", "GetWidth", "GetHeight", "GetSettings", "GetEvent", "EnableVerticalSync",
 	"ShowMouseCursor", "SetCursorPosition", "SetPosition", "SetSize", "Show", "EnableKeyRepeat", "SetIcon", "SetActive", "Display",
 	"GetInput", "SetFramerateLimit", "GetFrameTime", "SetJoystickThreshold", "WaitEvent", "GetSystemHandle"));
 }
\ No newline at end of file