diff options
| author | Sven Gothel <[email protected]> | 2010-11-22 12:51:52 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-22 12:51:52 +0100 |
| commit | a3f593158b25f78027504129c343b9aab433183d (patch) | |
| tree | 78b1ce61415becc29d7505228b768fc84f48c824 /make/config | |
| parent | 350b35a202fcc268b9d732b305418b2e76746501 (diff) | |
NativeWindow/Windows: Fix CreateDummyWindow gluegen and usage
NativeWindow+JOGL/Windows: Complete Opaque types
Diffstat (limited to 'make/config')
| -rw-r--r-- | make/config/jogl/gl-desktop.cfg | 9 | ||||
| -rw-r--r-- | make/config/jogl/gl3-desktop.cfg | 9 | ||||
| -rw-r--r-- | make/config/nativewindow/win32-CustomJavaCode.java | 4 | ||||
| -rw-r--r-- | make/config/nativewindow/win32-lib.cfg | 8 |
4 files changed, 19 insertions, 11 deletions
diff --git a/make/config/jogl/gl-desktop.cfg b/make/config/jogl/gl-desktop.cfg index ce2fefe2f..a91f5ac5b 100644 --- a/make/config/jogl/gl-desktop.cfg +++ b/make/config/jogl/gl-desktop.cfg @@ -13,18 +13,19 @@ GLHeader GL/glext.h # Directives needed when processing wglext.h on Windows and other platforms # Opaque boolean BOOL -ReturnsString wglGetExtensionsStringARB -ReturnsString wglGetExtensionsStringEXT Opaque long HANDLE +Opaque long PROC +Opaque long HINSTANCE +Opaque long HWND Opaque long HBITMAP Opaque long HDC Opaque long HGDIOBJ Opaque long HGLRC Opaque long HPBUFFERARB Opaque long HPBUFFEREXT -Opaque boolean BOOL -Opaque long PROC Opaque long void ** +ReturnsString wglGetExtensionsStringARB +ReturnsString wglGetExtensionsStringEXT # XID needs to be treated as a long for 32/64 bit compatibility Opaque long XID diff --git a/make/config/jogl/gl3-desktop.cfg b/make/config/jogl/gl3-desktop.cfg index 19eef4270..96e59aa05 100644 --- a/make/config/jogl/gl3-desktop.cfg +++ b/make/config/jogl/gl3-desktop.cfg @@ -12,18 +12,19 @@ GLHeader GL3/gl3ext.h # Directives needed when processing wglext.h on Windows and other platforms # Opaque boolean BOOL -ReturnsString wglGetExtensionsStringARB -ReturnsString wglGetExtensionsStringEXT Opaque long HANDLE +Opaque long PROC +Opaque long HINSTANCE +Opaque long HWND Opaque long HBITMAP Opaque long HDC Opaque long HGDIOBJ Opaque long HGLRC Opaque long HPBUFFERARB Opaque long HPBUFFEREXT -Opaque boolean BOOL -Opaque long PROC Opaque long void ** +ReturnsString wglGetExtensionsStringARB +ReturnsString wglGetExtensionsStringEXT # # Directives needed when processing cglext.h on MacOSX and other platforms diff --git a/make/config/nativewindow/win32-CustomJavaCode.java b/make/config/nativewindow/win32-CustomJavaCode.java index cd5b00b79..54a7fa53a 100644 --- a/make/config/nativewindow/win32-CustomJavaCode.java +++ b/make/config/nativewindow/win32-CustomJavaCode.java @@ -17,6 +17,10 @@ return hInstance; } + public static long CreateDummyWindow(int x, int y, int width, int height) { + return CreateDummyWindow0(getModuleHandle(), x, y, width, height); + } + public static Point GetRelativeLocation(long src_win, long dest_win, int src_x, int src_y) { return (Point) GetRelativeLocation0(src_win, dest_win, src_x, src_y); } diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg index b7535b5e1..46c4f2f92 100644 --- a/make/config/nativewindow/win32-lib.cfg +++ b/make/config/nativewindow/win32-lib.cfg @@ -8,16 +8,16 @@ JavaClass GDI Style AllStatic Opaque boolean BOOL -Opaque long HINSTANCE Opaque long HANDLE +Opaque long PROC +Opaque long HINSTANCE +Opaque long HWND Opaque long HBITMAP Opaque long HDC Opaque long HGDIOBJ Opaque long HGLRC Opaque long HPBUFFERARB Opaque long HPBUFFEREXT -Opaque boolean BOOL -Opaque long PROC Opaque long void ** Import javax.media.nativewindow.util.Point @@ -33,5 +33,7 @@ CustomCCode #include <stddef.h> Include ../intptr.cfg +CustomCCode extern HWND CreateDummyWindow0( HINSTANCE hInstance, int x, int y, int width, int height ) ; + IncludeAs CustomJavaCode GDI win32-CustomJavaCode.java |