From d4ea142f89e1afd53587cd4b21000f38e5f90d20 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 22 Dec 2006 10:45:39 +0000 Subject: [PATCH] Windows: Make window visible after pixel format selection and move code from native WindowsDisplay.nCreate to java side. --- src/java/org/lwjgl/opengl/WindowsDisplay.java | 4 ++++ src/native/windows/org_lwjgl_opengl_Display.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/lwjgl/opengl/WindowsDisplay.java b/src/java/org/lwjgl/opengl/WindowsDisplay.java index aa06a776..e067575e 100644 --- a/src/java/org/lwjgl/opengl/WindowsDisplay.java +++ b/src/java/org/lwjgl/opengl/WindowsDisplay.java @@ -96,6 +96,7 @@ final class WindowsDisplay implements DisplayImplementation { private final static int WA_ACTIVE = 1; private final static int WA_CLICKACTIVE = 2; private final static int SW_SHOWMINNOACTIVE = 7; + private final static int SW_SHOWDEFAULT = 10; private final static int SW_RESTORE = 9; private static WindowsDisplay current_display; @@ -132,6 +133,9 @@ final class WindowsDisplay implements DisplayImplementation { did_maximize = false; nCreateWindow(mode, fullscreen, x, y); peer_info.initDC(); + showWindow(getHwnd(), SW_SHOWDEFAULT); + setForegroundWindow(getHwnd()); + setFocus(getHwnd()); } private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException; diff --git a/src/native/windows/org_lwjgl_opengl_Display.c b/src/native/windows/org_lwjgl_opengl_Display.c index 8662b712..f36f2d42 100644 --- a/src/native/windows/org_lwjgl_opengl_Display.c +++ b/src/native/windows/org_lwjgl_opengl_Display.c @@ -199,10 +199,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateWindow(JNIEnv return; } display_hdc = GetDC(display_hwnd); - ShowWindow(display_hwnd, SW_SHOWDEFAULT); - UpdateWindow(display_hwnd); - SetForegroundWindow(display_hwnd); - SetFocus(display_hwnd); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nDestroyWindow(JNIEnv *env, jclass clazz) {