From 1b75810c8d1099abc9692d81e059a3a90afcbdcc Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Thu, 22 Aug 2002 01:02:37 +0000
Subject: [PATCH] Font updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/os2/private.h |  4 ++++
 src/common/gdicmn.cpp    |  4 ++--
 src/os2/font.cpp         | 16 ++++++++++------
 src/os2/fontutil.cpp     |  8 ++++----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 77c409132e..b6ce09db99 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -267,6 +267,10 @@ WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
+
+WXDLLEXPORT void   wxConvertVectorFontSize( FIXED   fxPointSize
+                                           ,PFATTRS pFattrs
+                                          );
 WXDLLEXPORT void   wxFillLogFont( LOGFONT*      pLogFont
                                  ,PFACENAMEDESC pFaceName
                                  ,HPS*          phPS
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index c2e6de24c2..d0deba6056 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -466,7 +466,7 @@ void wxInitializeStockObjects ()
     p2cstrcpy( (char*) fontName , fontName ) ;
     wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
 #elif defined(__WXPM__)
-  static const int sizeFont = 10;
+  static const int sizeFont = 12;
 #else
   wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
   static const int sizeFont = wxNORMAL_FONT->GetPointSize();
@@ -478,7 +478,7 @@ void wxInitializeStockObjects ()
   // as I can do to get something that looks halfway "wx" normal
   */
   wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
-  wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
+  wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)
diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 29b418ae3c..5ada2e0801 100644
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -454,11 +454,13 @@ bool wxFontRefData::Alloc(
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
         m_nFamily = wxTELETYPE;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
-        m_nFamily = wxDEFAULT;
+        m_nFamily = wxMODERN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
         m_nFamily = wxMODERN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
         m_nFamily = wxSWISS;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
+        m_nFamily = wxSWISS;
     else
         m_nFamily = wxSWISS;
 
@@ -613,11 +615,13 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
         nFamily = wxTELETYPE;
     else if (strcmp(fm.szFamilyname, "System VIO") == 0)
-        nFamily = wxDEFAULT;
+        nFamily = wxMODERN;
     else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
         nFamily = wxMODERN;
     else if (strcmp(fm.szFamilyname, "Arial") == 0)
         nFamily = wxSWISS;
+    else if (strcmp(fm.szFamilyname, "Swiss") == 0)
+        nFamily = wxSWISS;
     else
         nFamily = wxSWISS;
     return (wxFontFamily)nFamily;
@@ -703,7 +707,7 @@ void wxNativeFontInfo::SetFamily(
     switch (eFamily)
     {
         case wxSCRIPT:
-            sFacename = wxT("Script");
+            sFacename = wxT("Tms Rmn");
             break;
 
         case wxDECORATIVE:
@@ -711,15 +715,15 @@ void wxNativeFontInfo::SetFamily(
             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:
diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 8b4d684739..01b7d7b4ff 100644
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -487,7 +487,7 @@ void wxOS2SelectMatchingFontByName(
     switch (pFont->GetFamily())
     {
         case wxSCRIPT:
-            sFaceName = wxT("Script");
+            sFaceName = wxT("Tms Rmn");
             break;
 
         case wxDECORATIVE:
@@ -495,15 +495,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:
-- 
2.47.2