# HG changeset patch # User Eli Gottlieb # Date 1274993075 14400 # Node ID 83f9b95da263f9261ac36ab71e291688e4fef5cf # Parent 4435e014eacc32ce3e105094dd6153f99027cf82 Added the standard headers and footers that make SDL_shape.h and SDL_shape.c integrate properly into the build. diff -r 4435e014eacc -r 83f9b95da263 include/SDL_shape.h --- a/include/SDL_shape.h Tue May 25 00:23:41 2010 -0400 +++ b/include/SDL_shape.h Thu May 27 16:44:35 2010 -0400 @@ -20,8 +20,22 @@ eligottlieb@gmail.com */ -struct SDL_Shaped_Window; -typedef struct SDL_Shaped_Window SDL_Shaped_Window; +#ifndef _SDL_shape_h +#define _SDL_shape_h + +#include "SDL_stdinc.h" +#include "SDL_pixels.h" +#include "SDL_rect.h" +#include "SDL_surface.h" +#include "SDL_video.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +extern "C" { +/* *INDENT-ON* */ +#endif /** * \brief Create a shaped window with the specified position, dimensions, and flags. @@ -45,7 +59,15 @@ */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); -extern DECLSPE SDL_bool SDLCALL SDL_WindowIsShaped(const SDL_Window *window); +extern DECLSPEC SDL_bool SDLCALL SDL_WindowIsShaped(const SDL_Window *window); extern DECLSPEC int SDLCALL SDL_SelectShapeRenderer(const SDL_Window *window); -extern DECLSPEC void SDLCALL SDL_DestroyShapedWindow(const SDL_Shaped_Window *window); +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +} +/* *INDENT-ON* */ +#endif +#include "close_code.h" + +#endif /* _SDL_shape_h */ diff -r 4435e014eacc -r 83f9b95da263 src/video/SDL_shape.c --- a/src/video/SDL_shape.c Tue May 25 00:23:41 2010 -0400 +++ b/src/video/SDL_shape.c Thu May 27 16:44:35 2010 -0400 @@ -19,28 +19,21 @@ Eli Gottlieb eligottlieb@gmail.com */ +#include "SDL_config.h" +#include "SDL.h" +#include "SDL_video.h" +#include "SDL_sysvideo.h" #include "SDL_shape.h" -struct SDL_Shaped_Window { - SDL_Window *window; - SDL_Surface *shape_mask; -} - -SDL_Shaped_Window * SDLCALL SDL_CreateShapedWindow(const char *title, - unsigned int x,unsigned int y, - unsigned int w,unsigned int h, - Uint32 flags) { - //TODO: Fill in stub of SDL_CreatedShapedWindow +SDL_Window* SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) { return NULL; } -int SDLCALL SDL_PresentShape(const SDL_Shaped_Window *window) { - //TODO: Fill in stub of SDL_PresentShape - return -1; +SDL_bool SDL_WindowIsShaped(const SDL_Window *window) { + return SDL_FALSE; } -void SDLCALL SDL_DestroyShapedWindow(const SDL_Shaped_Window *window) { - //TODO: Fill in stub of SDL_DestroyShapedWindow - return; +int SDL_SelectShapeRenderer(const SDL_Window *window) { + return -1; }