From d6f9dbc493df725d3d574403549de142c5e1222a Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Mon, 24 Oct 2005 19:21:03 +0000 Subject: Merged JSR-231 branch on to the main JOGL trunk. The main trunk now contains the evolving JSR-231 Reference Implementation and the JSR-231 branch is permanently closed. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@401 232f8b59-042b-4e1e-8c03-345bb8c30851 --- make/stub_includes/win32/wglext.c | 13 +++++++++++++ make/stub_includes/win32/windows.h | 1 + make/stub_includes/win32/wingdi.h | 34 +++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100755 make/stub_includes/win32/wglext.c (limited to 'make/stub_includes/win32') diff --git a/make/stub_includes/win32/wglext.c b/make/stub_includes/win32/wglext.c new file mode 100755 index 000000000..9c6120411 --- /dev/null +++ b/make/stub_includes/win32/wglext.c @@ -0,0 +1,13 @@ +#define GLAPI + +// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +// "glext.h" are parsed. +#define GL_GLEXT_PROTOTYPES + +#include + +// Bring in the wgl extensions +#define WGL_WGLEXT_PROTOTYPES +#define SKIP_WGL_HANDLE_DEFINITIONS +#include +#include diff --git a/make/stub_includes/win32/windows.h b/make/stub_includes/win32/windows.h index fa4ae1c95..e2d78deef 100644 --- a/make/stub_includes/win32/windows.h +++ b/make/stub_includes/win32/windows.h @@ -4,6 +4,7 @@ #define FAR #define WINBASEAPI #define WINGDIAPI +#define WINUSERAPI #define WINAPI #define APIENTRY #define CONST const diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h index 2141135e7..35f754178 100644 --- a/make/stub_includes/win32/wingdi.h +++ b/make/stub_includes/win32/wingdi.h @@ -144,6 +144,25 @@ typedef struct tagPIXELFORMATDESCRIPTOR #define ERROR_PROC_NOT_FOUND 127 #define ERROR_INVALID_WINDOW_HANDLE 1400 +/* + * ShowWindow() Commands + */ +#define SW_HIDE 0 +#define SW_SHOWNORMAL 1 +#define SW_NORMAL 1 +#define SW_SHOWMINIMIZED 2 +#define SW_SHOWMAXIMIZED 3 +#define SW_MAXIMIZE 3 +#define SW_SHOWNOACTIVATE 4 +#define SW_SHOW 5 +#define SW_MINIMIZE 6 +#define SW_SHOWMINNOACTIVE 7 +#define SW_SHOWNA 8 +#define SW_RESTORE 9 +#define SW_SHOWDEFAULT 10 +#define SW_FORCEMINIMIZE 11 +#define SW_MAX 11 + // Windows routines WINBASEAPI DWORD WINAPI GetLastError(VOID); WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR lpLibFileName); @@ -183,10 +202,11 @@ WINGDIAPI BOOL WINAPI DeleteDC(HDC); WINGDIAPI BOOL WINAPI DeleteObject(HGDIOBJ); WINGDIAPI HGDIOBJ WINAPI SelectObject(HDC, HGDIOBJ); -// Routines for creation of a dummy device context and OpenGL context -// for the purposes of getting wglChoosePixelFormatARB and associated -// routines -WINGDIAPI HDC WINAPI GetDC(HDC); -WINGDIAPI HDC WINAPI CreateDummyWindow(int,int,int,int); -WINGDIAPI VOID WINAPI DestroyDummyWindow(HWND,HDC); -WINGDIAPI VOID WINAPI NativeEventLoop(); +// Routines for creation of a dummy window, device context and OpenGL +// context for the purposes of getting wglChoosePixelFormatARB and +// associated routines +HDC CreateDummyWindow(int,int,int,int); +WINUSERAPI BOOL WINAPI ShowWindow(HWND hWnd, int nCmdShow); +WINUSERAPI HDC WINAPI GetDC(HWND); +WINUSERAPI int WINAPI ReleaseDC(HWND hWnd, HDC hDC); +WINUSERAPI BOOL WINAPI DestroyWindow(HWND hWnd); -- cgit v1.2.3