diff src/video/SDL_shape_internals.h @ 4839:05d172e92b52

Merging branches. Will begin correcting mistakes introduced by merging.
author Eli Gottlieb <eligottlieb@gmail.com>
date Mon, 09 Aug 2010 15:41:33 -0400
parents 2e446923c9fb
children 14870d46ee2d
line wrap: on
line diff
--- a/src/video/SDL_shape_internals.h	Mon Aug 09 15:37:20 2010 -0400
+++ b/src/video/SDL_shape_internals.h	Mon Aug 09 15:41:33 2010 -0400
@@ -51,10 +51,12 @@
 	SDL_ShapeKind kind;
 	SDL_ShapeUnion data;
 } SDL_ShapeTree;
+	
+typedef void(*SDL_TraversalFunction)(SDL_ShapeTree*,void*);
 
 extern void SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb);
-extern SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape,SDL_bool invert);
-extern void SDL_TraverseShapeTree(SDL_ShapeTree *tree,void(*function)(SDL_ShapeTree*,void*),void* closure);
+extern SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape);
+extern void SDL_TraverseShapeTree(SDL_ShapeTree *tree,SDL_TraversalFunction function,void* closure);
 extern void SDL_FreeShapeTree(SDL_ShapeTree** shapeTree);
 
 /* Ends C function definitions when using C++ */