Changeset 290 for branches/branch-1-0/src/helpers/winh.c

Timestamp:

Sep 5, 2005, 8:20:43 PM (20 years ago)

Author:

pr

Message:

Bart's fix for bug 655

File:

• branches/branch-1-0/src/helpers/winh.c (modified) (4 diffs)

branches/branch-1-0/src/helpers/winh.c

@@ -2914 +2914 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V1.0.4 (2005-09-02) [bvl]: Return 'Combined' fonts on DBCS systems to show DBCS characters properly @@fixes 655
  */
 
@@ -2924 +2925 @@
     {
         if (doshIsWarp4())
-            strhncpy0(szFont, "9.WarpSans", sizeof(szFont));
+            if(nlsDBCS())
+                strhncpy0(szFont, "9.WarpSans Combined", sizeof(szFont));
+            else
+                strhncpy0(szFont, "9.WarpSans", sizeof(szFont));
         else
-            strhncpy0(szFont, "8.Helv", sizeof(szFont));
+            if(nlsDBCS())
+                strhncpy0(szFont, "8.Helv Combined", sizeof(szFont));
+            else
+                strhncpy0(szFont, "8.Helv", sizeof(szFont));
     }
     else
@@ -2949 +2956 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V1.0.4 (2005-09-02) [bvl]: Return 'Combined' fonts on DBCS systems to show DBCS characters properly @@fixes 655
  */
 
@@ -2965 +2973 @@
     {
         if (doshIsWarp4())
-            strhncpy0(szFont, "9.WarpSans", sizeof(szFont));
+            if(nlsDBCS())
+                strhncpy0(szFont, "9.WarpSans Combined", sizeof(szFont));
+            else
+                strhncpy0(szFont, "9.WarpSans", sizeof(szFont));
         else
-            strhncpy0(szFont, "8.Helv", sizeof(szFont));
+            if(nlsDBCS())
+                strhncpy0(szFont, "8.Helv Combined", sizeof(szFont));
+            else
+                strhncpy0(szFont, "8.Helv", sizeof(szFont));
     }
     else