From eebab76f71a32ed52f2ae1618be2f951a43745fa Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 26 Jun 2006 14:29:50 +0000 Subject: [PATCH] Whoops, forgot to indent --- include/SDL_compat.h | 2 +- src/SDL.c | 3 ++- src/video/win32/SDL_win32window.c | 42 ++++++++++++++++++++----------- src/video/win32/SDL_win32window.h | 6 +++-- test/testwm2.c | 3 +-- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/include/SDL_compat.h b/include/SDL_compat.h index 4de8457d9..4ab256f16 100644 --- a/include/SDL_compat.h +++ b/include/SDL_compat.h @@ -153,7 +153,7 @@ extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface * surface, int flags, extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface * surface, const SDL_Color * colors, int firstcolor, int ncolors); -extern DECLSPEC int SDLCALL SDL_GetWMInfo(struct SDL_SysWMinfo * info); +extern DECLSPEC int SDLCALL SDL_GetWMInfo(struct SDL_SysWMinfo *info); extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void); extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y); extern DECLSPEC SDL_Overlay *SDLCALL SDL_CreateYUVOverlay(int width, diff --git a/src/SDL.c b/src/SDL.c index ed44165ae..3acd4780c 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -348,7 +348,8 @@ _DllMainCRTStartup(HANDLE hModule, } #endif /* building DLL with Watcom C */ -void SDL_SetModuleHandle(void *hInst) +void +SDL_SetModuleHandle(void *hInst) { /* FIXME: Do we still need this? */ } diff --git a/src/video/win32/SDL_win32window.c b/src/video/win32/SDL_win32window.c index fd003deae..ee3da90cc 100644 --- a/src/video/win32/SDL_win32window.c +++ b/src/video/win32/SDL_win32window.c @@ -26,59 +26,73 @@ #include "SDL_win32video.h" -int WIN32_CreateWindow(_THIS, SDL_Window * window) +int +WIN32_CreateWindow(_THIS, SDL_Window * window) { } -int WIN32_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) +int +WIN32_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) { } -void WIN32_SetWindowTitle(_THIS, SDL_Window * window) +void +WIN32_SetWindowTitle(_THIS, SDL_Window * window) { } -void WIN32_SetWindowPosition(_THIS, SDL_Window * window) +void +WIN32_SetWindowPosition(_THIS, SDL_Window * window) { } -void WIN32_SetWindowSize(_THIS, SDL_Window * window) +void +WIN32_SetWindowSize(_THIS, SDL_Window * window) { } -void WIN32_ShowWindow(_THIS, SDL_Window * window) +void +WIN32_ShowWindow(_THIS, SDL_Window * window) { } -void WIN32_HideWindow(_THIS, SDL_Window * window) +void +WIN32_HideWindow(_THIS, SDL_Window * window) { } -void WIN32_RaiseWindow(_THIS, SDL_Window * window) +void +WIN32_RaiseWindow(_THIS, SDL_Window * window) { } -void WIN32_MaximizeWindow(_THIS, SDL_Window * window) +void +WIN32_MaximizeWindow(_THIS, SDL_Window * window) { } -void WIN32_MinimizeWindow(_THIS, SDL_Window * window) +void +WIN32_MinimizeWindow(_THIS, SDL_Window * window) { } -void WIN32_RestoreWindow(_THIS, SDL_Window * window) +void +WIN32_RestoreWindow(_THIS, SDL_Window * window) { } -void WIN32_SetWindowGrab(_THIS, SDL_Window * window) +void +WIN32_SetWindowGrab(_THIS, SDL_Window * window) { } -void WIN32_DestroyWindow(_THIS, SDL_Window * window) +void +WIN32_DestroyWindow(_THIS, SDL_Window * window) { } -SDL_bool WIN32_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) +SDL_bool +WIN32_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) { } diff --git a/src/video/win32/SDL_win32window.h b/src/video/win32/SDL_win32window.h index 761d42672..d0a021068 100644 --- a/src/video/win32/SDL_win32window.h +++ b/src/video/win32/SDL_win32window.h @@ -28,7 +28,8 @@ #include "SDL_win32video.h" extern int WIN32_CreateWindow(_THIS, SDL_Window * window); -extern int WIN32_CreateWindowFrom(_THIS, SDL_Window * window, const void *data); +extern int WIN32_CreateWindowFrom(_THIS, SDL_Window * window, + const void *data); extern void WIN32_SetWindowTitle(_THIS, SDL_Window * window); extern void WIN32_SetWindowPosition(_THIS, SDL_Window * window); extern void WIN32_SetWindowSize(_THIS, SDL_Window * window); @@ -40,7 +41,8 @@ extern void WIN32_MinimizeWindow(_THIS, SDL_Window * window); extern void WIN32_RestoreWindow(_THIS, SDL_Window * window); extern void WIN32_SetWindowGrab(_THIS, SDL_Window * window); extern void WIN32_DestroyWindow(_THIS, SDL_Window * window); -extern SDL_bool WIN32_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info); +extern SDL_bool WIN32_GetWindowWMInfo(_THIS, SDL_Window * window, + SDL_SysWMinfo * info); #endif /* _SDL_win32window_h */ diff --git a/test/testwm2.c b/test/testwm2.c index a580357e7..b982460fc 100644 --- a/test/testwm2.c +++ b/test/testwm2.c @@ -45,8 +45,7 @@ main(int argc, char *argv[]) window_h = atoi(argv[argc]); --argc; } else { - fprintf(stderr, - "Usage: %s [-width] [-height]\n", argv[0]); + fprintf(stderr, "Usage: %s [-width] [-height]\n", argv[0]); quit(1); } }