Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

[wxWidgets.git] / src / os2 / fontutil.cpp

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 8b4d684739783bde704d76efb366f53785d6f0b7..d0e497a31b064517f12c741613c1fe41d52ef076 100644 (file)
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     01.03.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #define DEBUG_PRINTF(NAME)   { static int raz=0; \
   printf( #NAME " %i\n",raz); fflush(stdout);       \
@@ -39,6 +39,7 @@
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
+#include "wx/encinfo.h"
 
 #include "wx/tokenzr.h"
 
@@ -487,7 +488,7 @@ void wxOS2SelectMatchingFontByName(
     switch (pFont->GetFamily())
     {
         case wxSCRIPT:
-            sFaceName = wxT("Script");
+            sFaceName = wxT("Tms Rmn");
             break;
 
         case wxDECORATIVE:
@@ -495,15 +496,15 @@ void wxOS2SelectMatchingFontByName(
             break;
 
         case wxROMAN:
-            sFaceName = wxT("Times New Roman");
+            sFaceName = wxT("Tms Rmn");
             break;
 
         case wxTELETYPE:
-            sFaceName = wxT("Courier New") ;
+            sFaceName = wxT("Courier") ;
             break;
 
         case wxMODERN:
-            sFaceName = wxT("Courier New") ;
+            sFaceName = wxT("System VIO") ;
             break;
 
         case wxSWISS:
@@ -640,12 +641,12 @@ void wxOS2SelectMatchingFontByName(
     //
     pFattrs->usRecordLength  = sizeof(FATTRS);              // Sets size of structure
     pFattrs->lMatch          = pFM[nIndex].lMatch;          // Force match
-    pFattrs->idRegistry      = 0;                           // Registry
-    pFattrs->usCodePage      = 0;                           // Match proper CodePage
-    pFattrs->fsFontUse       = 0;                           // Use only outline fonts
-    pFattrs->fsType          = 0;                           // Use only outline fonts
-    pFattrs->lMaxBaselineExt = 0;                           // Use only outline fonts
-    pFattrs->lAveCharWidth   = 0;                           // Use only outline fonts
+    pFattrs->idRegistry      = 0;
+    pFattrs->usCodePage      = 0;
+    pFattrs->fsFontUse       = 0;
+    pFattrs->fsType          = 0;
+    pFattrs->lMaxBaselineExt = 0;
+    pFattrs->lAveCharWidth   = 0;
     wxStrcpy(pFattrs->szFacename, pFM[nIndex].szFacename);
     if (pFont->GetWeight() == wxNORMAL)
         pFattrs->fsSelection = 0;