< prev index next >

src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp

Print this page

        

*** 246,263 **** else { pd.lpfnPrintHook = (LPPRINTHOOKPROC)PrintDialogHookProc; pd.lpfnSetupHook = (LPSETUPHOOKPROC)PrintDialogHookProc; pd.Flags |= PD_ENABLESETUPHOOK | PD_ENABLEPRINTHOOK; /* Fix for 6488834. To disable Win32 native parent modality we have to set hwndOwner field to either NULL or some hidden window. For parentless dialogs we use NULL to show them in the taskbar, and for all other dialogs AwtToolkit's HWND is used. */ ! if (awtParent != NULL) { pd.hwndOwner = AwtToolkit::GetInstance().GetHWnd(); } else { --- 246,268 ---- else { pd.lpfnPrintHook = (LPPRINTHOOKPROC)PrintDialogHookProc; pd.lpfnSetupHook = (LPSETUPHOOKPROC)PrintDialogHookProc; pd.Flags |= PD_ENABLESETUPHOOK | PD_ENABLEPRINTHOOK; + HWND parent = AwtPrintControl::getParentID(env, control); + if (parent != NULL) { + // Windows native modality is requested (used by JavaFX). + pd.hwndOwner = parent; + } /* Fix for 6488834. To disable Win32 native parent modality we have to set hwndOwner field to either NULL or some hidden window. For parentless dialogs we use NULL to show them in the taskbar, and for all other dialogs AwtToolkit's HWND is used. */ ! else if (awtParent != NULL) { pd.hwndOwner = AwtToolkit::GetInstance().GetHWnd(); } else {
< prev index next >