Changeset 411

Timestamp:

Jan 22, 2013, 11:43:26 PM (13 years ago)

Author:

dmik

Message:

jdk: Make sure RICHED32.DLL is used for java.awt.TextArea.

This makes this class actually work. See #202 for details.

Location:

trunk/openjdk/jdk/src/windows/native/sun/windows

Files:

• awt_TextArea.cpp (modified) (1 diff)
• awt_dlls.cpp (modified) (1 diff)

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_TextArea.cpp

@@ -55 +55 @@
 
 WNDPROC AwtTextArea::sm_pDefWindowProc = NULL;
+#ifdef __WIN32OS2__
+// Odin only has RICHED32.DLL (Wrapper for Rich Text 1.0)
+BOOL AwtTextArea::sm_RichEdit20 = FALSE;
+#else
 BOOL AwtTextArea::sm_RichEdit20 = (IS_WIN98 || IS_NT);
+#endif
 
 /************************************************************************

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_dlls.cpp

@@ -277 +277 @@
 load_rich_edit_library() {
     static int initialized = 0;
+#ifdef __WIN32OS2__
+    // Odin only has RICHED32.DLL (Wrapper for Rich Text 1.0)
+    BOOL isRichEdit32Needed = TRUE;
+#else
     BOOL isRichEdit32Needed = IS_WIN95 && !IS_WIN98;
+#endif
 
     if (initialized) {