call InitCommonControls if no display has been created prior to Alert
This commit is contained in:
parent
2e07a03a4e
commit
63ed7b268e
|
@ -94,9 +94,13 @@ final class WindowsSysImplementation extends DefaultSysImplementation {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void alert(String title, String message) {
|
public void alert(String title, String message) {
|
||||||
|
if(!Display.isCreated()) {
|
||||||
|
initCommonControls();
|
||||||
|
}
|
||||||
nAlert(getHwnd(), title, message);
|
nAlert(getHwnd(), title, message);
|
||||||
}
|
}
|
||||||
private static native void nAlert(long parent_hwnd, String title, String message);
|
private static native void nAlert(long parent_hwnd, String title, String message);
|
||||||
|
private static native void initCommonControls();
|
||||||
|
|
||||||
public boolean openURL(final String url) {
|
public boolean openURL(final String url) {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include "org_lwjgl_WindowsSysImplementation.h"
|
#include "org_lwjgl_WindowsSysImplementation.h"
|
||||||
#include "common_tools.h"
|
#include "common_tools.h"
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
#include <commctrl.h>
|
||||||
|
|
||||||
JNIEXPORT jlong JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetTime(JNIEnv * env, jclass unused) {
|
JNIEXPORT jlong JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetTime(JNIEnv * env, jclass unused) {
|
||||||
DWORD time;
|
DWORD time;
|
||||||
|
@ -67,6 +68,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_WindowsSysImplementation_nAlert(JNIEnv * e
|
||||||
free(cTitleBarText);
|
free(cTitleBarText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
JNIEXPORT void JNICALL Java_org_lwjgl_WindowsSysImplementation_initCommonControls(JNIEnv * env, jclass unused) {
|
||||||
|
InitCommonControls();
|
||||||
|
}
|
||||||
|
|
||||||
JNIEXPORT jstring JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetClipboard
|
JNIEXPORT jstring JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetClipboard
|
||||||
(JNIEnv * env, jclass unused)
|
(JNIEnv * env, jclass unused)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue