Merge back with main branch

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@35814 72102866-910b-0410-8b05-ffd578937521

Source/win32/w32_GLcontext.m

@@ -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,6 +334,20 @@ static Win32GLContext *currentGLContext;
 }
 
 
+- (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
 {