comparison src/video/win32/SDL_win32video.c @ 4862:7b1d35d98294

Merged Eli's Google Summer of Code work from SDL-gsoc2010-shaped_windows
author Sam Lantinga <slouken@libsdl.org>
date Sun, 22 Aug 2010 13:45:56 -0700
parents 518d1679d2d0 7a602fd2121f
children 716b2cbf4c9e
comparison
equal deleted inserted replaced
4764:102675835e08 4862:7b1d35d98294
26 #include "SDL_mouse.h" 26 #include "SDL_mouse.h"
27 #include "../SDL_sysvideo.h" 27 #include "../SDL_sysvideo.h"
28 #include "../SDL_pixels_c.h" 28 #include "../SDL_pixels_c.h"
29 29
30 #include "SDL_win32video.h" 30 #include "SDL_win32video.h"
31 #include "SDL_win32shape.h"
31 #include "SDL_d3drender.h" 32 #include "SDL_d3drender.h"
32 #include "SDL_gdirender.h" 33 #include "SDL_gdirender.h"
33 #include "SDL_gapirender.h" 34 #include "SDL_gapirender.h"
34 35
35 /* Initialization/Query functions */ 36 /* Initialization/Query functions */
178 device->MinimizeWindow = WIN_MinimizeWindow; 179 device->MinimizeWindow = WIN_MinimizeWindow;
179 device->RestoreWindow = WIN_RestoreWindow; 180 device->RestoreWindow = WIN_RestoreWindow;
180 device->SetWindowGrab = WIN_SetWindowGrab; 181 device->SetWindowGrab = WIN_SetWindowGrab;
181 device->DestroyWindow = WIN_DestroyWindow; 182 device->DestroyWindow = WIN_DestroyWindow;
182 device->GetWindowWMInfo = WIN_GetWindowWMInfo; 183 device->GetWindowWMInfo = WIN_GetWindowWMInfo;
184
185 device->shape_driver.CreateShaper = Win32_CreateShaper;
186 device->shape_driver.SetWindowShape = Win32_SetWindowShape;
187 device->shape_driver.ResizeWindowShape = Win32_ResizeWindowShape;
188
183 #ifdef SDL_VIDEO_OPENGL_WGL 189 #ifdef SDL_VIDEO_OPENGL_WGL
184 device->GL_LoadLibrary = WIN_GL_LoadLibrary; 190 device->GL_LoadLibrary = WIN_GL_LoadLibrary;
185 device->GL_GetProcAddress = WIN_GL_GetProcAddress; 191 device->GL_GetProcAddress = WIN_GL_GetProcAddress;
186 device->GL_UnloadLibrary = WIN_GL_UnloadLibrary; 192 device->GL_UnloadLibrary = WIN_GL_UnloadLibrary;
187 device->GL_CreateContext = WIN_GL_CreateContext; 193 device->GL_CreateContext = WIN_GL_CreateContext;