X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..ef70f0ecdbc4268923e132b257c95e8a2525f4ca:/src/os2/font.cpp?ds=sidebyside diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 493a6a25ba..0b60d98378 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -1,244 +1,794 @@ ///////////////////////////////////////////////////////////////////////////// // Name: font.cpp // Purpose: wxFont class -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/06/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "font.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + + #include +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/font.h" -#include "wx/gdicmn.h" +#ifndef WX_PRECOMP + #include + #include "wx/setup.h" + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/font.h" +#endif // WX_PRECOMP + +#include "wx/os2/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) + +#if wxUSE_PORTABLE_FONTS_IN_MSW + IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject) #endif -wxFontRefData::wxFontRefData() -{ - m_style = 0; - m_pointSize = 0; - m_family = 0; - m_style = 0; - m_weight = 0; - m_underlined = 0; - m_faceName = ""; -/* TODO - m_hFont = 0; -*/ -} +// ---------------------------------------------------------------------------- +// wxFontRefData - the internal description of the font +// ---------------------------------------------------------------------------- -wxFontRefData::wxFontRefData(const wxFontRefData& data) -{ - m_style = data.m_style; - m_pointSize = data.m_pointSize; - m_family = data.m_family; - m_style = data.m_style; - m_weight = data.m_weight; - m_underlined = data.m_underlined; - m_faceName = data.m_faceName; -/* TODO - m_hFont = 0; -*/ -} +class WXDLLEXPORT wxFontRefData: public wxGDIRefData +{ +friend class WXDLLEXPORT wxFont; -wxFontRefData::~wxFontRefData() +public: + wxFontRefData() + { + Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, + "", wxFONTENCODING_DEFAULT); + } + + wxFontRefData(const wxFontRefData& data) + { + Init(data.m_nPointSize, data.m_nFamily, data.m_nStyle, data.m_nWeight, + data.m_bUnderlined, data.m_sFaceName, data.m_vEncoding); + + m_nFontId = data.m_nFontId; + } + + wxFontRefData( int nSize + ,int nFamily + ,int nStyle + ,int nWeight + ,bool bUnderlined + ,const wxString& sFaceName + ,wxFontEncoding vEncoding + ) + { + Init(nSize, nFamily, nStyle, nWeight, bUnderlined, sFaceName, vEncoding); + } + + virtual ~wxFontRefData(); + +protected: + // common part of all ctors + void Init( int nSize + ,int nFamily + ,int nStyle + ,int nWeight + ,bool bUnderlined + ,const wxString& rsFaceName + ,wxFontEncoding vEncoding + ); + + // + // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE + // DELETED by destructor + // + bool m_bTemporary; + int m_nFontId; + + // + // Font characterstics + // + int m_nPointSize; + int m_nFamily; + int m_nStyle; + int m_nWeight; + bool m_bUnderlined; + wxString m_sFaceName; + wxFontEncoding m_vEncoding; + + // + // Some PM specific stuff + // + WXHFONT m_hFont; + PFONTMETRICS m_pFM; // array of FONTMETRICS structs + int m_nNumFonts; // number of fonts in array + HPS m_hPS; // PS handle this font belongs to + FATTRS m_vFattrs; // Current fattrs struct + FACENAMEDESC m_vFname; // Current facename struct +}; // end of CLASS wxFontRefData + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxFontRefData +// ---------------------------------------------------------------------------- + +void wxFontRefData::Init( + int nPointSize +, int nFamily +, int nStyle +, int nWeight +, bool bUnderlined +, const wxString& rsFaceName +, wxFontEncoding vEncoding +) { - // TODO: delete font data -} + m_nStyle = nStyle; + m_nPointSize = nPointSize; + m_nFamily = nFamily; + m_nStyle = nStyle; + m_nWeight = nWeight; + m_bUnderlined = bUnderlined; + m_sFaceName = rsFaceName; + m_vEncoding = vEncoding; + m_nFontId = 0; + m_bTemporary = FALSE; + + m_hFont = 0; + m_pFM = (PFONTMETRICS)NULL; + m_hPS = NULLHANDLE; + m_nNumFonts = 0; +} // end of wxFontRefData::Init -wxFont::wxFont() +wxFontRefData::~wxFontRefData() { - if ( wxTheFontList ) - wxTheFontList->Append(this); + if (m_pFM) + delete [] m_pFM; + m_pFM = (PFONTMETRICS)NULL; } -wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName) -{ - Create(pointSize, family, style, weight, underlined, faceName); +// ---------------------------------------------------------------------------- +// wxFont +// ---------------------------------------------------------------------------- +void wxFont::Init() +{ if ( wxTheFontList ) wxTheFontList->Append(this); } -bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName) +// ---------------------------------------------------------------------------- +// Constructor for a font. Note that the real construction is done +// in wxDC::SetFont, when information is available about scaling etc. +// ---------------------------------------------------------------------------- +bool wxFont::Create( + int nPointSize +, int nFamily +, int nStyle +, int nWeight +, bool bUnderlined +, const wxString& rsFaceName +, wxFontEncoding vEncoding +) { UnRef(); - m_refData = new wxFontRefData; - - M_FONTDATA->m_family = family; - M_FONTDATA->m_style = style; - M_FONTDATA->m_weight = weight; - M_FONTDATA->m_pointSize = pointSize; - M_FONTDATA->m_underlined = underlined; - M_FONTDATA->m_faceName = faceName; - + m_refData = new wxFontRefData( nPointSize + ,nFamily + ,nStyle + ,nWeight + ,bUnderlined + ,rsFaceName + ,vEncoding + ); RealizeResource(); - return TRUE; -} +} // end of wxFont::Create wxFont::~wxFont() { if (wxTheFontList) wxTheFontList->DeleteObject(this); -} +} // end of wxFont::~wxFont + +// ---------------------------------------------------------------------------- +// real implementation +// Boris' Kovalenko comments: +// Because OS/2 fonts are associated with PS we can not create the font +// here, but we may check that font definition is true +// ---------------------------------------------------------------------------- bool wxFont::RealizeResource() { - // TODO: create the font (if there is a native font object) + LONG lNumFonts = 0L; + LONG lTemp = 0L; + PFONTMETRICS pFM = NULL; + ERRORID vError; + + if ( GetResourceHandle() ) + { + // VZ: the old code returned FALSE in this case, but it doesn't seem + // to make sense because the font _was_ created + wxLogDebug(wxT("Calling wxFont::RealizeResource() twice")); + + return TRUE; + } + + LONG flId; + bool bInternalPS = FALSE; // if we have to create one + + // + // Now cheking + // + flId = 1L; + if (!M_FONTDATA->m_hPS) + { + M_FONTDATA->m_hPS = ::WinGetPS(HWND_DESKTOP); + bInternalPS = TRUE; + } + + if (M_FONTDATA->m_pFM) + { + delete [] M_FONTDATA->m_pFM; + M_FONTDATA->m_pFM = NULL; + } + // + // Determine the number of fonts. + // + lNumFonts = ::GpiQueryFonts( M_FONTDATA->m_hPS + ,QF_PUBLIC + ,NULL + ,&lTemp + ,(LONG) sizeof(FONTMETRICS) + ,NULL + ); + + // + // Allocate space for the font metrics. + // + pFM = new FONTMETRICS[lNumFonts + 1]; + + // + // Retrieve the font metrics. + // + lTemp = lNumFonts; + lTemp = ::GpiQueryFonts( M_FONTDATA->m_hPS + ,QF_PUBLIC + ,NULL + ,&lTemp + ,(LONG) sizeof(FONTMETRICS) + ,pFM + ); + SetFM( pFM + ,(int)lNumFonts + ); + + wxString sVals; + + for (int i = 0; i < lNumFonts; i++) + { + sVals << "Face: " <m_pFM[i].szFacename + << "Family: " <m_pFM[i].szFamilyname + << " PointSize: " << M_FONTDATA->m_pFM[i].lEmHeight + << " Height: " << M_FONTDATA->m_pFM[i].lXHeight + ; + sVals = ""; + } + M_FONTDATA->m_vFattrs.usRecordLength = sizeof(FATTRS); + M_FONTDATA->m_vFattrs.fsFontUse = FATTR_FONTUSE_OUTLINE | // only outline fonts allowed + FATTR_FONTUSE_TRANSFORMABLE; // may be transformed + M_FONTDATA->m_vFattrs.fsType = 0; + M_FONTDATA->m_vFattrs.lMaxBaselineExt = M_FONTDATA->m_vFattrs.lAveCharWidth = 0; + M_FONTDATA->m_vFattrs.idRegistry = 0; + M_FONTDATA->m_vFattrs.lMatch = 0; + + M_FONTDATA->m_vFname.usSize = sizeof(FACENAMEDESC); + M_FONTDATA->m_vFname.usWidthClass = FWIDTH_NORMAL; + M_FONTDATA->m_vFname.usReserved = 0; + M_FONTDATA->m_vFname.flOptions = 0; + + OS2SelectMatchingFontByName(); + + long lNumLids = ::GpiQueryNumberSetIds(M_FONTDATA->m_hPS); + long lGpiError; + + // + // First we should generate unique id + // + if(lNumLids ) + { + long alTypes[255]; + STR8 azNames[255]; + long alIds[255]; + + if(!::GpiQuerySetIds( M_FONTDATA->m_hPS + ,lNumLids + ,alTypes + ,azNames + ,alIds + )) + { + if (bInternalPS) + ::WinReleasePS(M_FONTDATA->m_hPS); + return 0; + } + + for(unsigned long LCNum = 0; LCNum < lNumLids; LCNum++) + if(alIds[LCNum] == flId) + ++flId; + if(flId > 254) // wow, no id available! + { + if (bInternalPS) + ::WinReleasePS(M_FONTDATA->m_hPS); + return 0; + } + } + + // + // Release and delete the current font + // + ::GpiSetCharSet(M_FONTDATA->m_hPS, LCID_DEFAULT);/* release the font before deleting */ + ::GpiDeleteSetId(M_FONTDATA->m_hPS, 1L); /* delete the logical font */ + + // + // Now build a facestring + // + char zFacename[128]; + strcpy(zFacename, M_FONTDATA->m_vFattrs.szFacename); + + if(::GpiQueryFaceString( M_FONTDATA->m_hPS + ,zFacename + ,&M_FONTDATA->m_vFname + ,FACESIZE + ,M_FONTDATA->m_vFattrs.szFacename + ) == GPI_ERROR) + { + vError = ::WinGetLastError(vHabmain); + } + + strcpy(zFacename, M_FONTDATA->m_vFattrs.szFacename); + + if(::GpiCreateLogFont( M_FONTDATA->m_hPS + ,NULL + ,flId + ,&M_FONTDATA->m_vFattrs + ) != GPI_ERROR) + M_FONTDATA->m_hFont = (WXHFONT)1; + + + if (bInternalPS) + { + if(M_FONTDATA->m_hFont) + ::GpiDeleteSetId( M_FONTDATA->m_hPS + ,flId + ); + + ::WinReleasePS(M_FONTDATA->m_hPS); + } + else + ::GpiSetCharSet(M_FONTDATA->m_hPS, flId); // sets font for presentation space + if (!M_FONTDATA->m_hFont) + { + wxLogLastError("CreateFont"); + } + M_FONTDATA->m_nFontId = flId; + return(M_FONTDATA->m_hFont != 0); +} // end of wxFont::RealizeResource + +bool wxFont::FreeResource( + bool bForce +) +{ + if (GetResourceHandle()) + { + M_FONTDATA->m_hFont = 0; + ::GpiDeleteSetId( M_FONTDATA->m_hPS + ,M_FONTDATA->m_nFontId + ); + return TRUE; + } return FALSE; -} +} // end of wxFont::FreeResource + +WXHANDLE wxFont::GetHFONT() const +{ + if (!M_FONTDATA) + return 0; + else + return (WXHANDLE)M_FONTDATA->m_hFont; +} // end of wxFont::GetHFONT + +WXHANDLE wxFont::GetResourceHandle() +{ + return GetHFONT(); +} // end of wxFont::GetResourceHandle + +bool wxFont::IsFree() const +{ + return (M_FONTDATA && (M_FONTDATA->m_hFont == 0)); +} // end of wxFont::IsFree void wxFont::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if ( !m_refData ) { - m_refData = new wxFontRefData(); - } + m_refData = new wxFontRefData(); + } else { - wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); - UnRef(); - m_refData = ref; - } -} + wxFontRefData* ref = new wxFontRefData(*M_FONTDATA); + UnRef(); + m_refData = ref; + } +} // end of wxFont::Unshare -void wxFont::SetPointSize(int pointSize) +// ---------------------------------------------------------------------------- +// change font attribute: we recreate font when doing it +// ---------------------------------------------------------------------------- + +void wxFont::SetPointSize( + int nPointSize +) { Unshare(); - M_FONTDATA->m_pointSize = pointSize; + M_FONTDATA->m_nPointSize = nPointSize; RealizeResource(); -} +} // end of wxFont::SetPointSize -void wxFont::SetFamily(int family) +void wxFont::SetFamily( + int nFamily +) { Unshare(); - M_FONTDATA->m_family = family; + M_FONTDATA->m_nFamily = nFamily; RealizeResource(); -} +} // end of wxFont::SetFamily -void wxFont::SetStyle(int style) +void wxFont::SetStyle( + int nStyle +) { Unshare(); - M_FONTDATA->m_style = style; + M_FONTDATA->m_nStyle = nStyle; RealizeResource(); -} +} // end of wxFont::SetStyle -void wxFont::SetWeight(int weight) +void wxFont::SetWeight( + int nWeight +) { Unshare(); - M_FONTDATA->m_weight = weight; + M_FONTDATA->m_nWeight = nWeight; RealizeResource(); -} +} // end of wxFont::SetWeight -void wxFont::SetFaceName(const wxString& faceName) +void wxFont::SetFaceName( + const wxString& rsFaceName +) { Unshare(); - M_FONTDATA->m_faceName = faceName; + M_FONTDATA->m_sFaceName = rsFaceName; RealizeResource(); -} +} // end of wxFont::SetFaceName -void wxFont::SetUnderlined(bool underlined) +void wxFont::SetUnderlined( + bool bUnderlined +) { Unshare(); - M_FONTDATA->m_underlined = underlined; + M_FONTDATA->m_bUnderlined = bUnderlined; RealizeResource(); -} +} // end of wxFont::SetUnderlined + +void wxFont::SetEncoding( + wxFontEncoding vEncoding +) +{ + Unshare(); + + M_FONTDATA->m_vEncoding = vEncoding; + + RealizeResource(); +} // end of wxFont::SetEncoding + +void wxFont::SetPS( + HPS hPS +) +{ + Unshare(); + + M_FONTDATA->m_hPS = hPS; + + RealizeResource(); +} // end of wxFont::SetPS + +void wxFont::SetFM( + PFONTMETRICS pFM +, int nNumFonts +) +{ + // + // Don't realize the font with this one + // + M_FONTDATA->m_pFM = pFM; + M_FONTDATA->m_nNumFonts = nNumFonts; +} // end of wxFont::SetFM + +// ---------------------------------------------------------------------------- +// accessors +// ---------------------------------------------------------------------------- + +int wxFont::GetPointSize() const +{ + wxFontRefData* pTmp; + + pTmp = M_FONTDATA; + if(pTmp) + return pTmp->m_nPointSize; + else + return 10; +} // end of wxFont::GetPointSize -wxString wxFont::GetFamilyString() const -{ - wxString fam(""); - switch (GetFamily()) - { - case wxDECORATIVE: - fam = "wxDECORATIVE"; - break; - case wxROMAN: - fam = "wxROMAN"; - break; - case wxSCRIPT: - fam = "wxSCRIPT"; - break; - case wxSWISS: - fam = "wxSWISS"; - break; - case wxMODERN: - fam = "wxMODERN"; - break; - case wxTELETYPE: - fam = "wxTELETYPE"; - break; - default: - fam = "wxDEFAULT"; - break; - } - return fam; +int wxFont::GetFamily() const +{ + return M_FONTDATA->m_nFamily; +} // end of wxFont::GetFamily + +int wxFont::GetFontId() const +{ + return M_FONTDATA->m_nFontId; +} // end of wxFont::GetFontId + +int wxFont::GetStyle() const +{ + return M_FONTDATA->m_nStyle; +} // end of wxFont::GetStyle + +int wxFont::GetWeight() const +{ + return M_FONTDATA->m_nWeight; } -/* New font system */ +bool wxFont::GetUnderlined() const +{ + return M_FONTDATA->m_bUnderlined; +} // end of wxFont::GetUnderlined + wxString wxFont::GetFaceName() const { - wxString str(""); - if (M_FONTDATA) - str = M_FONTDATA->m_faceName ; - return str; -} + wxString sStr; -wxString wxFont::GetStyleString() const + if ( M_FONTDATA ) + sStr = M_FONTDATA->m_sFaceName ; + return sStr; +} // end of wxFont::GetFaceName + +wxFontEncoding wxFont::GetEncoding() const { - wxString styl(""); - switch (GetStyle()) + return M_FONTDATA->m_vEncoding; +} // end of wxFont::GetEncoding + +HPS wxFont::GetPS() const +{ + return M_FONTDATA->m_hPS; +} // end of wxFont::GetPS + +void wxFont::OS2SelectMatchingFontByName() +{ + int i; + int nDiff0; + int nDiff; + int nIs; + int nIndex; + int nMinDiff; + int nMinDiff0; + int nApirc; + int anDiff[16]; + int anMinDiff[16]; + STR8 zFn; + char zFontFaceName[FACESIZE]; + wxString sFaceName; + USHORT usWeightClass; + int fsSelection = 0; + + nMinDiff0 = 0xf000; + for(i = 0;i < 16; i++) + anMinDiff[i] = nMinDiff0; + + switch (GetFamily()) { - case wxITALIC: - styl = "wxITALIC"; + case wxSCRIPT: + sFaceName = wxT("Script"); break; - case wxSLANT: - styl = "wxSLANT"; + + case wxDECORATIVE: + case wxROMAN: + sFaceName = wxT("Times New Roman"); break; - default: - styl = "wxNORMAL"; + + case wxTELETYPE: + case wxMODERN: + sFaceName = wxT("Courier") ; break; + + case wxSWISS: + sFaceName = wxT("WarpSans") ; + break; + + case wxDEFAULT: + default: + sFaceName = wxT("Helv") ; } - return styl; -} -wxString wxFont::GetWeightString() const -{ - wxString w(""); switch (GetWeight()) { - case wxBOLD: - w = "wxBOLD"; + default: + wxFAIL_MSG(_T("unknown font weight")); + // fall through + usWeightClass = FWEIGHT_DONT_CARE; break; + + case wxNORMAL: + usWeightClass = FWEIGHT_NORMAL; + break; + case wxLIGHT: - w = "wxLIGHT"; + usWeightClass = FWEIGHT_LIGHT; + break; + + case wxBOLD: + usWeightClass = FWEIGHT_BOLD; + break; + + case wxFONTWEIGHT_MAX: + usWeightClass = FWEIGHT_ULTRA_BOLD; + break; + } + M_FONTDATA->m_vFname.usWeightClass = usWeightClass; + + switch (GetStyle()) + { + case wxITALIC: + case wxSLANT: + fsSelection = FM_SEL_ITALIC; + M_FONTDATA->m_vFname.flOptions = FTYPE_ITALIC; break; + default: - w = "wxNORMAL"; + wxFAIL_MSG(wxT("unknown font slant")); + // fall through + + case wxNORMAL: + fsSelection = 0; break; } - return w; + + wxStrncpy(zFontFaceName, sFaceName.c_str(), WXSIZEOF(zFontFaceName)); + M_FONTDATA->m_nPointSize = GetPointSize(); + nIndex = 0; + for(i = 0, nIs = 0; i < M_FONTDATA->m_nNumFonts; i++) + { + // Debug code + int nPointSize = M_FONTDATA->m_nPointSize; + int nEmHeight = 0; + int nXHeight = 0; + anDiff[0] = wxGpiStrcmp(M_FONTDATA->m_pFM[i].szFamilyname, zFontFaceName); + anDiff[1] = abs(M_FONTDATA->m_pFM[i].lEmHeight - M_FONTDATA->m_nPointSize); + anDiff[2] = abs(M_FONTDATA->m_pFM[i].usWeightClass - usWeightClass); + anDiff[3] = abs((M_FONTDATA->m_pFM[i].fsSelection & 0x2f) - fsSelection); + if(anDiff[0] == 0) + { + nEmHeight = (int)M_FONTDATA->m_pFM[i].lEmHeight; + nXHeight =(int)M_FONTDATA->m_pFM[i].lXHeight; + if( (nIs & 0x01) == 0) + { + nIs = 1; + nIndex = i; + anMinDiff[1] = anDiff[1]; + anMinDiff[2] = anDiff[2]; + anMinDiff[3] = anDiff[3]; + } + else if(anDiff[3] < anMinDiff[3]) + { + nIndex = i; + anMinDiff[3] = anDiff[3]; + } + else if(anDiff[2] < anMinDiff[2]) + { + nIndex = i; + anMinDiff[2] = anDiff[2]; + } + else if(anDiff[1] < anMinDiff[1]) + { + nIndex = i; + anMinDiff[1] = anDiff[1]; + } + anMinDiff[0] = 0; + } + else if(anDiff[0] < anMinDiff[0]) + { + nIs = 2; + nIndex = i; + anMinDiff[3] = anDiff[3]; + anMinDiff[2] = anDiff[2]; + anMinDiff[1] = anDiff[1]; + anMinDiff[0] = anDiff[0]; + } + else if(anDiff[0] == anMinDiff[0]) + { + if(anDiff[3] < anMinDiff[3]) + { + nIndex = i; + anMinDiff[3] = anDiff[3]; + nIs = 2; + } + else if(anDiff[2] < anMinDiff[2]) + { + nIndex = i; + anMinDiff[2] = anDiff[2]; + nIs = 2; + } + else if(anDiff[1] < anMinDiff[1]) + { + nIndex = i; + anMinDiff[1] = anDiff[1]; + nIs = 2; + } + } + } + + M_FONTDATA->m_vFattrs.usRecordLength = sizeof(FATTRS); // sets size of structure + M_FONTDATA->m_vFattrs.fsSelection = M_FONTDATA->m_pFM[nIndex].fsSelection; // uses default selection + M_FONTDATA->m_vFattrs.lMatch = M_FONTDATA->m_pFM[nIndex].lMatch; // force match + M_FONTDATA->m_vFattrs.idRegistry = M_FONTDATA->m_pFM[nIndex].idRegistry; // uses default registry + M_FONTDATA->m_vFattrs.usCodePage = M_FONTDATA->m_pFM[nIndex].usCodePage; // code-page + if(M_FONTDATA->m_pFM[nIndex].lMatch) + { + M_FONTDATA->m_vFattrs.lMaxBaselineExt = M_FONTDATA->m_pFM[nIndex].lMaxBaselineExt; // requested font height + M_FONTDATA->m_vFattrs.lAveCharWidth = M_FONTDATA->m_pFM[nIndex].lAveCharWidth ; // requested font width + } + else + { + M_FONTDATA->m_vFattrs.lMaxBaselineExt = 0; + M_FONTDATA->m_vFattrs.lAveCharWidth = 0; + } + M_FONTDATA->m_vFattrs.fsType = 0;// pfm->fsType; /* uses default type */ + M_FONTDATA->m_vFattrs.fsFontUse = 0; + + wxStrcpy(M_FONTDATA->m_vFattrs.szFacename, M_FONTDATA->m_pFM[nIndex].szFacename); + // Debug + strcpy(zFontFaceName, M_FONTDATA->m_pFM[nIndex].szFacename); + strcpy(zFontFaceName, M_FONTDATA->m_vFattrs.szFacename); + + if(usWeightClass >= FWEIGHT_BOLD) + M_FONTDATA->m_vFattrs.fsSelection |= FATTR_SEL_BOLD; + if(GetUnderlined()) + M_FONTDATA->m_vFattrs.fsSelection |= FATTR_SEL_UNDERSCORE; + if(fsSelection & FM_SEL_ITALIC) + M_FONTDATA->m_vFattrs.fsSelection |= FATTR_SEL_ITALIC; } + +