Changeset 290

Timestamp:

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

Author:

pr

Message:

Bart's fix for bug 655

Files:

• branches/branch-1-0/src/helpers/winh.c (modified) (4 diffs)
• trunk/src/helpers/winh.c (modified) (5 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

trunk/src/helpers/winh.c

@@ -3080 +3080 @@
  *
  *@@added V1.0.1 (2002-11-30) [umoeller]
+ *@@changed V1.0.4 (2005-09-02) [bvl]: Return 'Combined' fonts on DBCS systems to show DBCS characters properly @@fixes 655
  */
 
@@ -3085 +3086 @@
 {
     if (doshIsWarp4())
-        return "9.WarpSans";
-
-    return "8.Helv";
+        if(nlsDBCS())
+            return "9.WarpSans Combined";
+        else
+            return "9.WarpSans";
+    else
+        if(nlsDBCS())
+            return "8.Helv Combined";
+        else
+            return "8.Helv";
 }
 
@@ -3153 +3160 @@
  *
  *@@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
  */
 
@@ -3163 +3171 @@
     HENUM   henum;
     HWND    hwndItem;
-    CHAR    szFont[256];
     ULONG   cbFont;
 
-    if (pcszFont == NULL)
-    {
-        if (doshIsWarp4())
-            strhncpy0(szFont, "9.WarpSans", sizeof(szFont));
-        else
-            strhncpy0(szFont, "8.Helv", sizeof(szFont));
-    }
-    else
-        strhncpy0(szFont, pcszFont, sizeof(szFont));
-
-    cbFont = strlen(szFont) + 1;
-
+    if (!pcszFont)
+        pcszFont = winhQueryDefaultFont();
+
+    cbFont = strlen(pcszFont) + 1;
     // set font for all the dialog controls
     henum = WinBeginEnumWindows(hwndDlg);
@@ -3189 +3188 @@
                                 PP_FONTNAMESIZE,
                                 cbFont,
-                                szFont))
+                                (PSZ)pcszFont))
                 // successful:
                 ulrc++;