Changed name to wxFIXED_MINSIZE since that is more descriptive of what

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 8023ca58c8dc2147b2e7bdfbdb110e94c9b559a5..517053a9155ed3e5f432b5636608b87a32ff20b9 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -28,12 +28,14 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/font.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/font.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"

+#include "wx/encinfo.h"

 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 


@@ -108,8 +110,13 @@ public:
     //
     inline int GetPointSize(void) const
     {
     //
     inline int GetPointSize(void) const
     {

-        return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetPointSize()
-                                   : m_nPointSize;
+        //
+        // We don't use the actual native font point size since it is
+        // the chosen physical font, which is usually only and approximation
+        // of the desired outline font.  The actual displayable point size
+        // is the one stored in the refData
+        //
+        return m_nPointSize;

     }
 
     inline int GetFamily(void) const
     }
 
     inline int GetFamily(void) const


@@ -343,14 +350,19 @@ void wxFontRefData::Init(
     m_bNativeFontInfoOk = TRUE;
     m_vNativeFontInfo = rInfo;
 
     m_bNativeFontInfoOk = TRUE;
     m_vNativeFontInfo = rInfo;
 

-    if (m_hPS == NULLHANDLE)
+    if (hPS == NULLHANDLE)

     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);
     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);

-        m_bInternalPS;
+        m_bInternalPS = TRUE;

     }
     else
         m_hPS = (HPS)hPS;
     }
     else
         m_hPS = (HPS)hPS;

-}
+
+    m_nFontId     = 0;
+    m_bTemporary  = FALSE;
+    m_pFM         = (PFONTMETRICS)NULL;
+    m_nNumFonts   = 0;
+} // end of wxFontRefData::Init

 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {


@@ -364,8 +376,8 @@ bool wxFontRefData::Alloc(
     wxString                        sFaceName;
     long                            flId = m_hFont;
     long                            lRc;
     wxString                        sFaceName;
     long                            flId = m_hFont;
     long                            lRc;

-    short                           nIndex = 0;
-    PFONTMETRICS                    pFM = NULL;
+    ERRORID                         vError;
+    wxString                        sError;

 
     if (!m_bNativeFontInfoOk)
     {
 
     if (!m_bNativeFontInfoOk)
     {


@@ -379,7 +391,15 @@ bool wxFontRefData::Alloc(
                      );
         m_bNativeFontInfoOk = TRUE;
     }
                      );
         m_bNativeFontInfoOk = TRUE;
     }

-
+    else
+    {
+        if (flId == 0L)
+            flId = 1L;
+        else
+            flId++;
+        if (flId > 254)
+            flId = 1L;
+    }

     if((lRc = ::GpiCreateLogFont( m_hPS
                                  ,NULL
                                  ,flId
     if((lRc = ::GpiCreateLogFont( m_hPS
                                  ,NULL
                                  ,flId


@@ -391,6 +411,8 @@ bool wxFontRefData::Alloc(
     }
     if (!m_hFont)
     {
     }
     if (!m_hFont)
     {

+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);

         wxLogLastError("CreateFont");
     }
 
         wxLogLastError("CreateFont");
     }
 


@@ -402,25 +424,43 @@ bool wxFontRefData::Alloc(
     //
     memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs));
     memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname));
     //
     memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs));
     memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname));

-    m_nPointSize  = m_vNativeFontInfo.fm.lEmHeight;
-    if (strcmp(m_vNativeFontInfo.fa.szFacename, "Times New Roman") == 0)
+    //
+    // Going to leave the point size alone.  Mostly we use outline fonts
+    // that can be set to any point size inside of Presentation Parameters,
+    // regardless of whether or not the actual font is registered in the system.
+    // The GpiCreateLogFont will do enough by selecting the right family,
+    // and face name.
+    //
+    if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)

         m_nFamily = wxROMAN;
         m_nFamily = wxROMAN;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Tms Rmn") == 0)
-        m_nFamily = wxSWISS;
-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "WarpSans") == 0)
-        m_nFamily = wxSWISS;
-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Helvitica") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
+        m_nFamily = wxROMAN;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
+        m_nFamily = wxROMAN;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
+        m_nFamily = wxROMAN;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
+        m_nFamily = wxDECORATIVE;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)

         m_nFamily = wxSWISS;
         m_nFamily = wxSWISS;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Helv") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)

         m_nFamily = wxSWISS;
         m_nFamily = wxSWISS;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Script") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)

         m_nFamily = wxSCRIPT;
         m_nFamily = wxSCRIPT;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Courier New") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
+        m_nFamily = wxTELETYPE;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)

         m_nFamily = wxTELETYPE;
         m_nFamily = wxTELETYPE;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Courier") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)

         m_nFamily = wxTELETYPE;
         m_nFamily = wxTELETYPE;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "System VIO") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)

         m_nFamily = wxMODERN;
         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;
 
     else
         m_nFamily = wxSWISS;
 


@@ -485,10 +525,6 @@ void wxFontRefData::Free()
 
     if ( m_hFont )
     {
 
     if ( m_hFont )
     {

-        if (!::GpiSetCharSet(m_hPS, LCID_DEFAULT))
-        {
-            wxLogLastError(wxT("DeleteObject(font)"));
-        }

         ::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font          */
         m_nFontId = 0;
         m_hFont   = 0;
         ::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font          */
         m_nFontId = 0;
         m_hFont   = 0;


@@ -556,14 +592,36 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     //
     // Extract family from facename
     //
     //
     // Extract family from facename
     //

-    if (strcmp(fa.szFacename, "Times New Roman") == 0)
+    if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
+        nFamily = wxROMAN;
+    else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)

         nFamily = wxROMAN;
         nFamily = wxROMAN;

-    else if (strcmp(fa.szFacename, "WarpSans") == 0)
+    else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
+        nFamily = wxROMAN;
+    else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
+        nFamily = wxROMAN;
+    else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
+        nFamily = wxDECORATIVE;
+    else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
+        nFamily = wxSWISS;
+    else if (strcmp(fm.szFamilyname, "Helv") == 0)

         nFamily = wxSWISS;
         nFamily = wxSWISS;

-    else if (strcmp(fa.szFacename, "Script") == 0)
+    else if (strcmp(fm.szFamilyname, "Script") == 0)

         nFamily = wxSCRIPT;
         nFamily = wxSCRIPT;

-    else if (strcmp(fa.szFacename, "Courier New") == 0)
+    else if (strcmp(fm.szFamilyname, "Courier New") == 0)
+        nFamily = wxTELETYPE;
+    else if (strcmp(fm.szFamilyname, "Courier") == 0)
+        nFamily = wxTELETYPE;
+    else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
+        nFamily = wxTELETYPE;
+    else if (strcmp(fm.szFamilyname, "System VIO") == 0)

         nFamily = wxMODERN;
         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;
     else
         nFamily = wxSWISS;
     return (wxFontFamily)nFamily;


@@ -649,29 +707,32 @@ void wxNativeFontInfo::SetFamily(
     switch (eFamily)
     {
         case wxSCRIPT:
     switch (eFamily)
     {
         case wxSCRIPT:

-            sFacename = _T("Script");
+            sFacename = wxT("Tms Rmn");

             break;
 
         case wxDECORATIVE:
             break;
 
         case wxDECORATIVE:

-            sFacename = _T("Times New Roman");
+            sFacename = wxT("WarpSans");

             break;
 
         case wxROMAN:
             break;
 
         case wxROMAN:

-            sFacename = _T("Times New Roman");
+            sFacename = wxT("Tms Rmn");

             break;
 
         case wxTELETYPE:
             break;
 
         case wxTELETYPE:

+            sFacename = wxT("Courier") ;
+            break;
+

         case wxMODERN:
         case wxMODERN:

-            sFacename = _T("Courier New");
+            sFacename = wxT("System VIO") ;

             break;
 
         case wxSWISS:
             break;
 
         case wxSWISS:

-            sFacename = _T("WarpSans");
+            sFacename = wxT("Helv") ;

             break;
 
         case wxDEFAULT:
         default:
             break;
 
         case wxDEFAULT:
         default:

-            sFacename = _T("Helv");
+            sFacename = wxT("System VIO") ;

     }
 
     if (!wxStrlen(fa.szFacename) )
     }
 
     if (!wxStrlen(fa.szFacename) )


@@ -690,8 +751,7 @@ void wxNativeFontInfo::SetEncoding(
                                   ,&vInfo
                                  ))
     {
                                   ,&vInfo
                                  ))
     {

-#if wxUSE_FONTMAP
-        if (wxTheFontMapper->GetAltForEncoding( eEncoding
+        if (wxFontMapper::Get()->GetAltForEncoding( eEncoding

                                                ,&vInfo
                                               ))
         {
                                                ,&vInfo
                                               ))
         {


@@ -706,7 +766,6 @@ void wxNativeFontInfo::SetEncoding(
             }
         }
         else
             }
         }
         else

-#endif // wxUSE_FONTMAP

         {
             // unsupported encoding, replace with the default
             vInfo.charset = 850;
         {
             // unsupported encoding, replace with the default
             vInfo.charset = 850;


@@ -1013,7 +1072,7 @@ void wxFont::SetEncoding(
     RealizeResource();
 } // end of wxFont::SetEncoding
 
     RealizeResource();
 } // end of wxFont::SetEncoding
 

-void wxFont::SetNativeFontInfo(
+void wxFont::DoSetNativeFontInfo(

   const wxNativeFontInfo&           rInfo
 )
 {
   const wxNativeFontInfo&           rInfo
 )
 {


@@ -1079,11 +1138,10 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->GetEncoding();
 } // end of wxFont::GetEncoding
 
     return M_FONTDATA->GetEncoding();
 } // end of wxFont::GetEncoding
 

-wxNativeFontInfo* wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo* wxFont::GetNativeFontInfo() const

 {
 {

-    if (M_FONTDATA->HasNativeFontInfo())
-        return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo());
-    return 0;
+    return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
+                                           : NULL;

 } // end of wxFont::GetNativeFontInfo
 
 //
 } // end of wxFont::GetNativeFontInfo
 
 //


@@ -1108,5 +1166,5 @@ void wxFont::SetPS(
     M_FONTDATA->SetPS(hPS);
 
     RealizeResource();
     M_FONTDATA->SetPS(hPS);
 
     RealizeResource();

-} // end of wxFont::SetUnderlined
+} // end of wxFont::SetPS