X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1146627e2bf16a48554e1c224f427dbd6247c5d..2365e5cbcf5bffc6d1ffb363b187455e8f093445:/src/os2/fontutil.cpp

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 805b4eeb9e..d8560ba678 100644
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -323,27 +323,12 @@ void wxFillLogFont(
                  ,(int)lNumFonts
                 );
 
-    wxString                        sVals;
-
-    //
-    // For debugging, delete later
-    //
-    for (int i = 0; i < lNumFonts; i++)
-    {
-         sVals << "Face: " << pFM[i].szFacename
-               << "Family: " << pFM[i].szFamilyname
-               << " PointSize: " << pFM[i].lEmHeight
-               << " Height: " << pFM[i].lXHeight
-               ;
-         sVals = "";
-    }
-
     //
     // Initialize FATTR and FACENAMEDESC
     //
     pFattrs->usRecordLength = sizeof(FATTRS);
     pFattrs->fsFontUse = FATTR_FONTUSE_OUTLINE |       // only outline fonts allowed
-                          FATTR_FONTUSE_TRANSFORMABLE;  // may be transformed
+                         FATTR_FONTUSE_TRANSFORMABLE;  // may be transformed
     pFattrs->fsType = 0;
     pFattrs->lMaxBaselineExt = pFattrs->lAveCharWidth = 0;
     pFattrs->idRegistry = 0;
@@ -376,6 +361,7 @@ void wxFillLogFont(
         STR8                        azNames[255];
         long                        alIds[255];
 
+        memset(alIds, 0, sizeof(long) * 255);
         if(!::GpiQuerySetIds( *phPS
                              ,lNumLids
                              ,alTypes
@@ -387,7 +373,8 @@ void wxFillLogFont(
                 ::WinReleasePS(*phPS);
             return;
         }
-
+        if (*pflId == 0L)
+            *pflId = 1L;
         for(unsigned long LCNum = 0; LCNum < lNumLids; LCNum++)
             if(alIds[LCNum] == *pflId)
                ++*pflId;
@@ -466,16 +453,19 @@ void wxOS2SelectMatchingFontByName(
             break;
 
         case wxDECORATIVE:
+            sFaceName = wxT("WarpSans");
+            break;
+
         case wxROMAN:
-            sFaceName = wxT("Tms Rmn");
+            sFaceName = wxT("Times New Roman");
             break;
 
         case wxTELETYPE:
-            sFaceName = wxT("Courier") ;
+            sFaceName = wxT("Courier New") ;
             break;
 
         case wxMODERN:
-            sFaceName = wxT("System VIO") ;
+            sFaceName = wxT("Arial") ;
             break;
 
         case wxSWISS:
@@ -484,7 +474,7 @@ void wxOS2SelectMatchingFontByName(
 
         case wxDEFAULT:
         default:
-            sFaceName = wxT("System VIO") ;
+            sFaceName = wxT("System Proportional") ;
     }
 
     switch (pFont->GetWeight())
@@ -639,110 +629,12 @@ wxFont wxCreateFontFromLogFont(
 , PFACENAMEDESC                     pFaceName
 )
 {
-    //
-    // Extract family from facename
-    //
-    int                             nFontFamily;
-
-    if (strcmp(pLogFont->szFacename, "Times New Roman") == 0)
-        nFontFamily = wxROMAN;
-    else if (strcmp(pLogFont->szFacename, "WarpSans") == 0)
-        nFontFamily = wxSWISS;
-    else if (strcmp(pLogFont->szFacename, "Script") == 0)
-        nFontFamily = wxSCRIPT;
-    else if (strcmp(pLogFont->szFacename, "Courier New") == 0)
-        nFontFamily = wxMODERN;
-    else
-        nFontFamily = wxSWISS;
-
-    //
-    // Weight and Style
-    //
-    int                             nFontWeight = wxNORMAL;
-
-    switch (pFaceName->usWeightClass)
-    {
-        case FWEIGHT_LIGHT:
-            nFontWeight = wxLIGHT;
-            break;
-
-        default:
-        case FWEIGHT_NORMAL:
-            nFontWeight = wxNORMAL;
-            break;
-
-        case FWEIGHT_BOLD:
-            nFontWeight = wxBOLD;
-            break;
-    }
-
-    int                             nFontStyle;
-
-    if(pLogFont->fsSelection & FATTR_SEL_ITALIC)
-        nFontStyle = wxITALIC;
-    else
-        nFontStyle = wxNORMAL;
-
-    bool                            bFontUnderline = (pLogFont->fsSelection & FATTR_SEL_UNDERSCORE);
-    wxString                        sFontFace = pLogFont->szFacename;
-    int                             nFontPoints = pFM->lEmHeight;
-    wxFontEncoding                  vFontEncoding;
-
-    switch (pLogFont->usCodePage)
-    {
-        default:
-            wxFAIL_MSG(wxT("unsupported charset"));
-            // fall through
-
-        case 850:
-            vFontEncoding = wxFONTENCODING_CP1252;
-            break;
-
-        case 1250:
-            vFontEncoding = wxFONTENCODING_CP1250;
-            break;
-
-        case 921:
-            vFontEncoding = wxFONTENCODING_CP1257;
-            break;
-
-        case 866:
-            vFontEncoding = wxFONTENCODING_CP1251;
-            break;
-
-        case 864:
-            vFontEncoding = wxFONTENCODING_CP1256;
-            break;
-
-        case 869:
-            vFontEncoding = wxFONTENCODING_CP1253;
-            break;
-
-        case 862:
-            vFontEncoding = wxFONTENCODING_CP1255;
-            break;
-
-        case 857:
-            vFontEncoding = wxFONTENCODING_CP1254;
-            break;
-
-        case 874:
-            vFontEncoding = wxFONTENCODING_CP437;
-            break;
-
-        case 437:
-            vFontEncoding = wxFONTENCODING_CP437;
-            break;
-    }
+    wxNativeFontInfo                vInfo;
 
-    return wxFont( nFontPoints
-                  ,nFontFamily
-                  ,nFontStyle
-                  ,nFontWeight
-                  ,bFontUnderline
-                  ,sFontFace
-                  ,vFontEncoding
-                 );
+    vInfo.fa = *pLogFont;
+    vInfo.fm = *pFM;
+    vInfo.fn = *pFaceName;
+    return wxFont(vInfo);
 } // end of wxCreateFontFromLogFont
 
 int wxGpiStrcmp(