changeset 3994:44c31bdf4d72

6984540: closed/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html test fails Reviewed-by: uta, art
author dav
date Fri, 01 Apr 2011 12:56:56 +0400
parents ddf1f385bf4b
children 346b4438a7d6
files src/windows/native/sun/windows/awt_Toolkit.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Toolkit.cpp	Mon Mar 28 15:25:24 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Toolkit.cpp	Fri Apr 01 12:56:56 2011 +0400
@@ -528,9 +528,6 @@
 
     tk.m_isActive = FALSE;
 
-    awt_dnd_uninitialize();
-    awt_clipboard_uninitialize((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2));
-
     // dispose Direct3D-related resources. This should be done
     // before AwtObjectList::Cleanup() as the d3d will attempt to
     // shutdown when the last of its windows is disposed of
@@ -539,6 +536,9 @@
     AwtObjectList::Cleanup();
     AwtFont::Cleanup();
 
+    awt_dnd_uninitialize();
+    awt_clipboard_uninitialize((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2));
+
     if (tk.m_inputMethodHWnd != NULL) {
         ::SendMessage(tk.m_inputMethodHWnd, WM_IME_CONTROL, IMC_OPENSTATUSWINDOW, 0);
     }