gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 01:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge back with main branch

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@35814 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-11-21 20:58:07 +00:00
parent aae0f7748c
commit 25d6855dc0
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/win32/w32_GLcontext.m
View file

@ -284,6 +284,13 @@ static Win32GLContext *currentGLContext;
}
}
- (void *)CGLContextObj
{
// FIXME: Until we have a wrapper library
// return the underlying context directly
return (void*)wgl_context;
}
- (void)clearDrawable
{
[self _detach];
@ -327,7 +334,21 @@ static Win32GLContext *currentGLContext;
}
- (id)initWithFormat:(NSOpenGLPixelFormat *)aFormat
- (id)initWithCGLContextObj: (void *)context
{
self = [super init];
if (!self)
{
return nil;
}
// FIXME: Need to set the pixelFormat ivar
wgl_context = context;
return self;
}
- (id)initWithFormat:(NSOpenGLPixelFormat *)aFormat
shareContext:(NSOpenGLContext *)share
{
NSDebugMLLog(@"WGL", @"will init with format %@", aFormat);