From bcbb754da9fdc59e910852194032fe0808884a1e Mon Sep 17 00:00:00 2001
From: remi-k <remi-k@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Fri, 6 Mar 2009 15:23:07 +0000
Subject: [PATCH] Fixed a bug with custom drawables Fixed wrong default color
 in sf.Shape

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1040 4e206d99-4929-0410-ac5d-dfc041789085
---
 python/src/Drawable.cpp     | 21 +++++++++++++++++++--
 python/src/RenderWindow.cpp |  5 ++---
 python/src/Shape.cpp        |  2 +-
 python/src/main.hpp         |  1 -
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/python/src/Drawable.cpp b/python/src/Drawable.cpp
index 4ac64df96..cedc38b43 100644
--- a/python/src/Drawable.cpp
+++ b/python/src/Drawable.cpp
@@ -58,7 +58,12 @@ static int
 PySfDrawable_init(PySfDrawable *self, PyObject *args, PyObject *kwds)
 {
 	self->obj = new CustomDrawable();
-	self->obj->RenderFunction = NULL;
+	if (PyObject_HasAttrString((PyObject *)self, "Render"))
+	{
+		self->obj->RenderFunction = PyObject_GetAttrString((PyObject *)self, "Render");
+	}
+	else
+		self->obj->RenderFunction = NULL;
 	self->obj->RenderWindow = NULL;
 	return 0;
 }
@@ -226,6 +231,18 @@ PySfDrawable_TransformToGlobal(PySfDrawable* self, PyObject *args)
 	return Py_BuildValue("ff", result.x, result.y);
 }
 
+int PySfDrawable_SetAttr(PyObject* self, PyObject *attr_name, PyObject *v)
+{
+	std::string Name(PyString_AsString(attr_name));
+	if (Name == "Render")
+	{
+		Py_CLEAR(((PySfDrawable*)self)->obj->RenderFunction);
+		Py_INCREF(v);
+		((PySfDrawable*)self)->obj->RenderFunction = v;
+	}
+	return PyObject_GenericSetAttr(self, attr_name, v);
+}
+
 static PyMethodDef PySfDrawable_methods[] = {
 	{"TransformToLocal", (PyCFunction)PySfDrawable_TransformToLocal, METH_VARARGS, "TransformToLocal(X, Y)\n\
 Transform a point from global coordinates into local coordinates (ie it applies the inverse of object's center, translation, rotation and scale to the point). Returns a tuple.\n\
@@ -274,7 +291,7 @@ PyTypeObject PySfDrawableType = {
 	0,						/*tp_call*/
 	0,						/*tp_str*/
 	0,						/*tp_getattro*/
-	0,						/*tp_setattro*/
+	PySfDrawable_SetAttr,	/*tp_setattro*/
 	0,						/*tp_as_buffer*/
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
 	"Abstract base class for every object that can be drawn into a render window.", /* tp_doc */
diff --git a/python/src/RenderWindow.cpp b/python/src/RenderWindow.cpp
index 0985201e6..221eee557 100644
--- a/python/src/RenderWindow.cpp
+++ b/python/src/RenderWindow.cpp
@@ -101,10 +101,9 @@ PySfRenderWindow_DrawObject(PySfRenderWindow *RenderWindow, PySfDrawable *Obj)
 	{
 		if (PyObject_HasAttrString((PyObject *)Obj, "Render"))
 		{
-			Py_XDECREF(Obj->obj->RenderWindow);
+			Py_CLEAR(Obj->obj->RenderWindow);
+			Py_INCREF(RenderWindow);
 			Obj->obj->RenderWindow = RenderWindow;
-			Py_XDECREF(Obj->obj->RenderFunction);
-			Obj->obj->RenderFunction = PyObject_GetAttrString((PyObject *)Obj, "Render");
 		}
 		RenderWindow->obj->Draw( *(Obj->obj) );
 		return true;
diff --git a/python/src/Shape.cpp b/python/src/Shape.cpp
index fc4142cdf..89c016ee9 100644
--- a/python/src/Shape.cpp
+++ b/python/src/Shape.cpp
@@ -72,7 +72,7 @@ PySfShape_AddPoint(PySfShape* self, PyObject *args, PyObject *kwds)
 		Col = ColTmp->obj;
 	}
 	else
-		Col = (sf::Color *)&sf::Color::Black;
+		Col = (sf::Color *)&sf::Color::White;
 
 	if (OutlineColTmp)
 	{
diff --git a/python/src/main.hpp b/python/src/main.hpp
index fa65683ba..dc4a5541a 100644
--- a/python/src/main.hpp
+++ b/python/src/main.hpp
@@ -27,7 +27,6 @@
 
 #include <SFML/System.hpp>
 #include <SFML/Window.hpp>
-#include <iostream>
 
 #include <Python.h>
 #include <structmember.h>