Shaped windows for Cocoa build and testshape runs, but the actual sha…

…ping doesn't work. Something, however, is definitely happening, because we get the backgrounds drawn in two different colors.
libsdl-org · Aug 5, 2010 · 2be3ec9 · 2be3ec9
1 parent 727890d
commit 2be3ec9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/video/cocoa/SDL_cocoashape.m b/src/video/cocoa/SDL_cocoashape.m
@@ -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 @@ int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowS
 	//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 --git a/src/video/x11/SDL_x11shape.c b/src/video/x11/SDL_x11shape.c
@@ -21,7 +21,6 @@
 */
 
 #include "SDL_assert.h"
-#include "SDL_malloc.h"
 #include "SDL_x11video.h"
 #include "SDL_x11shape.h"
 #include "SDL_x11window.h"