From 63ed7b268e8b3cead844ff3a525ac8dbee55a746 Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Wed, 2 Dec 2009 23:11:14 +0000 Subject: [PATCH] call InitCommonControls if no display has been created prior to Alert --- src/java/org/lwjgl/WindowsSysImplementation.java | 4 ++++ src/native/windows/org_lwjgl_Sys.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/java/org/lwjgl/WindowsSysImplementation.java b/src/java/org/lwjgl/WindowsSysImplementation.java index 51605fa2..716a41c3 100644 --- a/src/java/org/lwjgl/WindowsSysImplementation.java +++ b/src/java/org/lwjgl/WindowsSysImplementation.java @@ -94,9 +94,13 @@ final class WindowsSysImplementation extends DefaultSysImplementation { } public void alert(String title, String message) { + if(!Display.isCreated()) { + initCommonControls(); + } nAlert(getHwnd(), title, message); } private static native void nAlert(long parent_hwnd, String title, String message); + private static native void initCommonControls(); public boolean openURL(final String url) { try { diff --git a/src/native/windows/org_lwjgl_Sys.c b/src/native/windows/org_lwjgl_Sys.c index 78cc85d3..58de21c4 100644 --- a/src/native/windows/org_lwjgl_Sys.c +++ b/src/native/windows/org_lwjgl_Sys.c @@ -44,6 +44,7 @@ #include "org_lwjgl_WindowsSysImplementation.h" #include "common_tools.h" #include +#include JNIEXPORT jlong JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetTime(JNIEnv * env, jclass unused) { DWORD time; @@ -67,6 +68,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_WindowsSysImplementation_nAlert(JNIEnv * e free(cTitleBarText); } +JNIEXPORT void JNICALL Java_org_lwjgl_WindowsSysImplementation_initCommonControls(JNIEnv * env, jclass unused) { + InitCommonControls(); +} + JNIEXPORT jstring JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetClipboard (JNIEnv * env, jclass unused) {