Mercurial > sdl-ios-xcode

changeset 4769:83f9b95da263

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added the standard headers and footers that make SDL_shape.h and SDL_shape.c integrate properly into the build.
author Eli Gottlieb <eligottlieb@gmail.com>
date Thu, 27 May 2010 16:44:35 -0400
parents 4435e014eacc
children cf7976fd3258
files include/SDL_shape.h src/video/SDL_shape.c
diffstat 2 files changed, 35 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- 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 */
--- 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;
 }