# HG changeset patch
# User egottlieb
# Date 1280984604 14400
# Node ID 34fb492cefe3392da7397175d4df8b1beb3296c8
# Parent  0c82f20327ec2022be4b619ddcb1f3f00d5ed1fa
Shaped windows for Cocoa build and testshape runs, but the actual shaping doesn't work.  Something, however, is definitely happening, because we get the backgrounds drawn in two different colors.

diff -r 0c82f20327ec -r 34fb492cefe3 src/video/cocoa/SDL_cocoashape.m
--- a/src/video/cocoa/SDL_cocoashape.m	Thu Aug 05 00:53:38 2010 -0400
+++ b/src/video/cocoa/SDL_cocoashape.m	Thu Aug 05 01:03:24 2010 -0400
@@ -20,6 +20,7 @@
     eligottlieb@gmail.com
 */
 
+#include "SDL_assert.h"
 #include "SDL_stdinc.h"
 #include "SDL_cocoavideo.h"
 #include "SDL_shape.h"
@@ -81,6 +82,7 @@
 	//NSRectFill([[((SDL_WindowData*)shaper->window->driverdata)->nswindow contentView] frame]);
 	/* TODO: It looks like Cocoa can set a clipping path based on a list of rectangles.  That's what we get from the
            Windoze shape-calculation code: a list of rectangles.  This will work... I think. */
+	data->shape = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE);
 	NSBezierPath* clipPath = [NSBezierPath bezierPath];
 	
 	SDL_PathConglomeration cong = {clipPath,shaper->window};
diff -r 0c82f20327ec -r 34fb492cefe3 src/video/x11/SDL_x11shape.c
--- a/src/video/x11/SDL_x11shape.c	Thu Aug 05 00:53:38 2010 -0400
+++ b/src/video/x11/SDL_x11shape.c	Thu Aug 05 01:03:24 2010 -0400
@@ -21,7 +21,6 @@
 */
 
 #include "SDL_assert.h"
-#include "SDL_malloc.h"
 #include "SDL_x11video.h"
 #include "SDL_x11shape.h"
 #include "SDL_x11window.h"