Display the Linux help text for the jvm install, not the Windows one.

This commit is contained in:
Martin Blapp 2002-07-21 23:14:03 +00:00
parent 2aede6e576
commit 5e863577e7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=63346
23 changed files with 253 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );

View File

@ -0,0 +1,11 @@
--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002
+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002
@@ -154,7 +154,7 @@
#if defined (OS2)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
-#elif defined (LINUX)
+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
#elif defined (SOLARIS)
maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );