From 49e9ce7e641cb6923d9907ad66f667b3d3490e49 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 5 Jan 2014 03:38:15 +0100 Subject: Bug 935: NEWT Windows Window-Icon: Use WNDCLASSEX w/ Small/Big Default Icons (NativeWindow GDI / NEWT ) .. this allows using the icon definition of WNDCLASSEX instead of setting them at CreateWindow0(..). - NativeWindow GDIUtil/RegisteredFactory uses WNDCLASSEX and Small/Big Defailt Icons --- src/newt/native/WindowsWindow.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/newt/native/WindowsWindow.c') diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c index 8671ee2e0..f193df2b6 100644 --- a/src/newt/native/WindowsWindow.c +++ b/src/newt/native/WindowsWindow.c @@ -2014,8 +2014,7 @@ static void NewtWindow_setVisiblePosSize(HWND hwnd, BOOL atop, BOOL visible, JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_windows_WindowDriver_CreateWindow0 (JNIEnv *env, jobject obj, jlong hInstance, jstring jWndClassName, jstring jWndName, jint winMajor, jint winMinor, - jlong parent, jint jx, jint jy, jint defaultWidth, jint defaultHeight, jboolean autoPosition, jint flags, - jlong iconSmallHandle, jlong iconBigHandle) + jlong parent, jint jx, jint jy, jint defaultWidth, jint defaultHeight, jboolean autoPosition, jint flags) { HWND parentWindow = (HWND) (intptr_t) parent; const TCHAR* wndClassName = NULL; @@ -2104,12 +2103,6 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_windows_WindowDriver_CreateWindo RECT rc; RECT * insets; - if( 0 != iconSmallHandle ) { - SendMessage(window, WM_SETICON, ICON_SMALL, (LPARAM) iconSmallHandle ); - } - if( 0 != iconBigHandle ) { - SendMessage(window, WM_SETICON, ICON_BIG, (LPARAM) iconBigHandle ); - } ShowWindow(window, SW_SHOW); // send insets before visibility, allowing java code a proper sync point! -- cgit v1.2.3