X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcontainer.cpp;h=ced7326de4979b91e67d4d16dfe97694101d4837;hb=89b8b0c60579d8ef0cf9a13521e7bf7c7864883f;hp=da491f617b8366ff71bacf1bba6b0ebda26a3bef;hpb=86caae9cadd6e1877a4e6226533521ef0d1c6389;p=architektonas

diff --git a/src/container.cpp b/src/container.cpp
index da491f6..ced7326 100644
--- a/src/container.cpp
+++ b/src/container.cpp
@@ -56,11 +56,18 @@ Container & Container::operator=(const Container & from)
 
 	// Small problem with this approach: if the copied object goes out of scope,
 	// all of the objects we copied in here will be deleted. D'oh!
-	for(uint i=0; i<from.objects.size(); i++)
+	// For this COPY constructor to be meaningful, we have to actually COPY the
+	// objects in this Container, not just MOVE a copy of the POINTER! D-:
+	std::vector<Object *>::const_iterator i;
+
+//	for(uint i=0; i<from.objects.size(); i++)
+	for(i=from.objects.begin(); i!=from.objects.end(); i++)
 	{
-		Object * object = from.objects[i];
+//		Object * object = from.objects[i];
+		Object * object = (*i)->Copy();
 
-		// Need to copy the object here...
+		// Need to actually COPY the object here, not copy the pointer only!!
+		// (which we do now, above :-P)
 
 		objects.push_back(object);
 	}
@@ -73,8 +80,10 @@ Container & Container::operator=(const Container & from)
 {
 	QRectF boundary;
 
+//int a=1;
 	for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
 	{
+//printf("Containter::Draw item #%i [%X]...\n", a++, *i);
 		(*i)->Draw(painter);
 		boundary = boundary.united((*i)->Extents());
 	}