From f3e05fe62b91134ac601520c6f9c44d6d31fcd86 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 11 Nov 2011 06:02:30 +0100 Subject: Revert introduction of NativeSurfaceHolder and NativeWindowHolder interfaces I was too fast introducing these accessors, since they are currently not needed and hence redundant. Complete - 7bc4c218b47033cb66f4eb5e707a86a0a4e60cff Partial in regards to the holder interfaces only: - d8fa00d35a49f4faf5f04aeb7e2bba4e972965f5 - f51e3dad6c4bd1f6d0001cecf6a0f692400ed602 - 46542168d64b37f544f61802693f15b59b224e4e --- .../classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl') diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java index f02649949..3c2b7aed6 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java @@ -52,7 +52,6 @@ import javax.media.nativewindow.DefaultGraphicsScreen; import javax.media.nativewindow.NativeSurface; import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowFactory; -import javax.media.nativewindow.NativeWindowHolder; import javax.media.nativewindow.ProxySurface; import javax.media.nativewindow.macosx.MacOSXGraphicsDevice; import javax.media.opengl.GL; @@ -268,12 +267,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl { final MacOSXJAWTWindow r = (MacOSXJAWTWindow) nwThis; return r.isOffscreenLayerSurface() ? r : null; } else { - // parent surface host, eg. via native parenting w/ NewtCanvasAWT NativeWindow nwParent = nwThis.getParent(); - if(null != nwParent && nwParent instanceof NativeWindowHolder) { - NativeWindowHolder nwh = (NativeWindowHolder) nwParent; - nwParent = nwh.getNativeWindow(); - } if(null != nwParent && nwParent instanceof MacOSXJAWTWindow) { final MacOSXJAWTWindow r = (MacOSXJAWTWindow) nwParent; return r.isOffscreenLayerSurface() ? r : null; -- cgit v1.2.3