pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 731 - No mechanism to extract the NSView for 3d library

Browse source
This commit is contained in:
Sam Lantinga 2013-05-20 22:05:49 -07:00
parent 2f9ac5db94
commit 97fba74bda
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL_syswm.h
View file

@ -82,6 +82,7 @@ struct SDL_SysWMinfo;
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#else #else
typedef struct _NSWindow NSWindow; typedef struct _NSWindow NSWindow;
typedef struct _NSView NSView;
#endif #endif
#endif #endif
@ -187,6 +188,7 @@ struct SDL_SysWMinfo
struct struct
{ {
NSWindow *window; /* The Cocoa window */ NSWindow *window; /* The Cocoa window */
NSView *view; /* The Cocoa view */
} cocoa; } cocoa;
#endif #endif
#if defined(SDL_VIDEO_DRIVER_UIKIT) #if defined(SDL_VIDEO_DRIVER_UIKIT)

1
src/video/cocoa/SDL_cocoawindow.m
View file

@ -1131,6 +1131,7 @@ Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
if (info->version.major <= SDL_MAJOR_VERSION) { if (info->version.major <= SDL_MAJOR_VERSION) {
info->subsystem = SDL_SYSWM_COCOA; info->subsystem = SDL_SYSWM_COCOA;
info->info.cocoa.window = nswindow; info->info.cocoa.window = nswindow;
info->info.cocoa.view = [nswindow contentView];
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d\n",