X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/142b3bc26a6e93f5857bc053c7748b2c845c4a8e..690201a250dcdd2a38aa4156df4375dd135209df:/src/os2/font.cpp diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 443ec80ee8..5588a0a013 100644 --- 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/log.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" @@ -348,14 +350,19 @@ void wxFontRefData::Init( m_bNativeFontInfoOk = TRUE; m_vNativeFontInfo = rInfo; - if (m_hPS == NULLHANDLE) + if (hPS == NULLHANDLE) { m_hPS = ::WinGetPS(HWND_DESKTOP); - m_bInternalPS; + m_bInternalPS = TRUE; } else m_hPS = (HPS)hPS; -} + + m_nFontId = 0; + m_bTemporary = FALSE; + m_pFM = (PFONTMETRICS)NULL; + m_nNumFonts = 0; +} // end of wxFontRefData::Init wxFontRefData::~wxFontRefData() { @@ -371,6 +378,8 @@ bool wxFontRefData::Alloc( long lRc; short nIndex = 0; PFONTMETRICS pFM = NULL; + ERRORID vError; + wxString sError; if (!m_bNativeFontInfoOk) { @@ -384,7 +393,15 @@ bool wxFontRefData::Alloc( ); m_bNativeFontInfoOk = TRUE; } - + else + { + if (flId == 0L) + flId = 1L; + else + flId++; + if (flId > 254) + flId = 1L; + } if((lRc = ::GpiCreateLogFont( m_hPS ,NULL ,flId @@ -396,6 +413,8 @@ bool wxFontRefData::Alloc( } if (!m_hFont) { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); wxLogLastError("CreateFont"); } @@ -414,24 +433,36 @@ bool wxFontRefData::Alloc( // The GpiCreateLogFont will do enough by selecting the right family, // and face name. // - if (strcmp(m_vNativeFontInfo.fa.szFacename, "Times New Roman") == 0) + if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0) 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; - else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Helv") == 0) + else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0) m_nFamily = wxSWISS; - else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Script") == 0) + else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0) 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.fa.szFacename, "Courier") == 0) + else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0) m_nFamily = wxTELETYPE; - else if (strcmp(m_vNativeFontInfo.fa.szFacename, "System VIO") == 0) + 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 = 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; @@ -496,10 +527,6 @@ void wxFontRefData::Free() 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; @@ -567,14 +594,36 @@ wxFontFamily wxNativeFontInfo::GetFamily() const // // 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; + else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0) nFamily = wxROMAN; - else if (strcmp(fa.szFacename, "WarpSans") == 0) + 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; - else if (strcmp(fa.szFacename, "Script") == 0) + else if (strcmp(fm.szFamilyname, "Script") == 0) 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; + 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; @@ -660,29 +709,32 @@ void wxNativeFontInfo::SetFamily( switch (eFamily) { case wxSCRIPT: - sFacename = _T("Script"); + sFacename = wxT("Tms Rmn"); break; case wxDECORATIVE: - sFacename = _T("Times New Roman"); + sFacename = wxT("WarpSans"); break; case wxROMAN: - sFacename = _T("Times New Roman"); + sFacename = wxT("Tms Rmn"); break; case wxTELETYPE: + sFacename = wxT("Courier") ; + break; + case wxMODERN: - sFacename = _T("Courier New"); + sFacename = wxT("System VIO") ; break; case wxSWISS: - sFacename = _T("WarpSans"); + sFacename = wxT("Helv") ; break; case wxDEFAULT: default: - sFacename = _T("Helv"); + sFacename = wxT("System VIO") ; } if (!wxStrlen(fa.szFacename) ) @@ -701,7 +753,6 @@ void wxNativeFontInfo::SetEncoding( ,&vInfo )) { -#if wxUSE_FONTMAP if (wxFontMapper::Get()->GetAltForEncoding( eEncoding ,&vInfo )) @@ -717,7 +768,6 @@ void wxNativeFontInfo::SetEncoding( } } else -#endif // wxUSE_FONTMAP { // unsupported encoding, replace with the default vInfo.charset = 850; @@ -1024,7 +1074,7 @@ void wxFont::SetEncoding( RealizeResource(); } // end of wxFont::SetEncoding -void wxFont::SetNativeFontInfo( +void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& rInfo ) { @@ -1090,11 +1140,10 @@ wxFontEncoding wxFont::GetEncoding() const 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 // @@ -1119,5 +1168,5 @@ void wxFont::SetPS( M_FONTDATA->SetPS(hPS); RealizeResource(); -} // end of wxFont::SetUnderlined +} // end of wxFont::SetPS