Fixed (?) build problem on X11 and Mac OS X

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@46 232f8b59-042b-4e1e-8c03-345bb8c30851

3 files changed, 14 insertions, 12 deletions

diff --git a/make/gl-impl-CustomJavaCode.java b/make/gl-impl-CustomJavaCode.java
index 31bb91bc1..86fac5b5c 100644
--- a/make/gl-impl-CustomJavaCode.java
+++ b/make/gl-impl-CustomJavaCode.java
@@ -1,6 +1,6 @@
 /** Entry point to C language function: <br> <code> LPVOID glMapBufferARB(GLenum target, GLenum access); </code>    */
 public java.nio.ByteBuffer glMapBufferARB(int target, int access) {
-  final long __addr_ = context.getGLProcAddressTable()._addressof_glMapBufferARB;
+  final long __addr_ = _context.getGLProcAddressTable()._addressof_glMapBufferARB;
   if (__addr_ == 0) {
     throw new GLException("Method \"glMapBufferARB\" not available");
   }
diff --git a/make/gl-impl-macosx.cfg b/make/gl-impl-macosx.cfg
index c5a0ade2f..fad4ac4f9 100644
--- a/make/gl-impl-macosx.cfg
+++ b/make/gl-impl-macosx.cfg
@@ -10,6 +10,7 @@ Include gl-glx-common.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLProcAddressTable
+ContextVariableName _context
 
 CustomCCode #include <inttypes.h>
 
@@ -26,24 +27,24 @@ CustomCCode typedef unsigned int* PUINT;
 
 CustomJavaCode MacOSXGLImpl  public MacOSXGLImpl(MacOSXGLContext context)
 CustomJavaCode MacOSXGLImpl  {
-CustomJavaCode MacOSXGLImpl    this.context = context; 
+CustomJavaCode MacOSXGLImpl    this._context = context; 
 CustomJavaCode MacOSXGLImpl  }
 
 CustomJavaCode MacOSXGLImpl  /** This constructor should be used manually in order to
 CustomJavaCode MacOSXGLImpl      create a GL object that can be used with the Cocoa NSOpenGLView. */
 CustomJavaCode MacOSXGLImpl  public MacOSXGLImpl()
 CustomJavaCode MacOSXGLImpl  {
-CustomJavaCode MacOSXGLImpl    this.context = new MacOSXDummyGLContext(this);
+CustomJavaCode MacOSXGLImpl    this._context = new MacOSXDummyGLContext(this);
 CustomJavaCode MacOSXGLImpl  }
 
 CustomJavaCode MacOSXGLImpl  public boolean isFunctionAvailable(String glFunctionName)
 CustomJavaCode MacOSXGLImpl  {
-CustomJavaCode MacOSXGLImpl    return context.isFunctionAvailable(glFunctionName);
+CustomJavaCode MacOSXGLImpl    return _context.isFunctionAvailable(glFunctionName);
 CustomJavaCode MacOSXGLImpl  }
 
 CustomJavaCode MacOSXGLImpl  public boolean isExtensionAvailable(String glExtensionName)
 CustomJavaCode MacOSXGLImpl  {
-CustomJavaCode MacOSXGLImpl    return context.isExtensionAvailable(glExtensionName);
+CustomJavaCode MacOSXGLImpl    return _context.isExtensionAvailable(glExtensionName);
 CustomJavaCode MacOSXGLImpl  }
 
 CustomJavaCode MacOSXGLImpl  /** Forces a recomputation of which extensions are available.
@@ -51,13 +52,13 @@ CustomJavaCode MacOSXGLImpl      Should only be called if this MacOSXGLImpl is b
 CustomJavaCode MacOSXGLImpl      in conjunction with an NSOpenGLView instead of a GLCanvas. */
 CustomJavaCode MacOSXGLImpl  public void resetGLFunctionAvailability()
 CustomJavaCode MacOSXGLImpl  {
-CustomJavaCode MacOSXGLImpl    if (!(context instanceof MacOSXDummyGLContext)) {
+CustomJavaCode MacOSXGLImpl    if (!(_context instanceof MacOSXDummyGLContext)) {
 CustomJavaCode MacOSXGLImpl      throw new GLException("Should only be called if being used with NSOpenGLView");
 CustomJavaCode MacOSXGLImpl    }
-CustomJavaCode MacOSXGLImpl    ((MacOSXDummyGLContext) context).resetGLFunctionAvailability();
+CustomJavaCode MacOSXGLImpl    ((MacOSXDummyGLContext) _context).resetGLFunctionAvailability();
 CustomJavaCode MacOSXGLImpl  }
 
-CustomJavaCode MacOSXGLImpl  private MacOSXGLContext context;
+CustomJavaCode MacOSXGLImpl  private MacOSXGLContext _context;
 
 CustomJavaCode MacOSXGLImpl  /**
 CustomJavaCode MacOSXGLImpl   * Provides platform-independent access to the wglAllocateMemoryNV /
diff --git a/make/gl-impl-win32.cfg b/make/gl-impl-win32.cfg
index 18c213769..ef23cc13f 100644
--- a/make/gl-impl-win32.cfg
+++ b/make/gl-impl-win32.cfg
@@ -10,6 +10,7 @@ Include gl-glx-common.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLProcAddressTable
+ContextVariableName _context
 
 CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
@@ -35,20 +36,20 @@ CustomCCode typedef int intptr_t;
 CustomCCode #endif
 
 CustomJavaCode WindowsGLImpl  public WindowsGLImpl(WindowsGLContext context) { 
-CustomJavaCode WindowsGLImpl    this.context = context; 
+CustomJavaCode WindowsGLImpl    this._context = context; 
 CustomJavaCode WindowsGLImpl  }
 
 CustomJavaCode WindowsGLImpl  public boolean isFunctionAvailable(String glFunctionName)
 CustomJavaCode WindowsGLImpl  {
-CustomJavaCode WindowsGLImpl    return context.isFunctionAvailable(glFunctionName);
+CustomJavaCode WindowsGLImpl    return _context.isFunctionAvailable(glFunctionName);
 CustomJavaCode WindowsGLImpl  }
 
 CustomJavaCode WindowsGLImpl  public boolean isExtensionAvailable(String glExtensionName)
 CustomJavaCode WindowsGLImpl  {
-CustomJavaCode WindowsGLImpl    return context.isExtensionAvailable(glExtensionName);
+CustomJavaCode WindowsGLImpl    return _context.isExtensionAvailable(glExtensionName);
 CustomJavaCode WindowsGLImpl  }
 
-CustomJavaCode WindowsGLImpl  private WindowsGLContext context;
+CustomJavaCode WindowsGLImpl  private WindowsGLContext _context;
 
 CustomJavaCode WindowsGLImpl   /**
 CustomJavaCode WindowsGLImpl    * Provides platform-independent access to the wglAllocateMemoryNV /