X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bff67a6a811bd0f8ec2315242ad2eb0324d9939d..3f4a2351e4c677c88c18ea812b609477adee7380:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 7a55510e19..bac473af42 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "font.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,13 +24,14 @@ #pragma hdrstop #endif +#include "wx/font.h" + #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/font.h" #include "wx/log.h" + #include "wx/encinfo.h" #endif // WX_PRECOMP #include "wx/msw/private.h" @@ -44,12 +41,59 @@ #include "wx/tokenzr.h" -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +#if wxUSE_EXTENDED_RTTI + +wxBEGIN_ENUM( wxFontFamily ) + wxENUM_MEMBER( wxDEFAULT ) + wxENUM_MEMBER( wxDECORATIVE ) + wxENUM_MEMBER( wxROMAN ) + wxENUM_MEMBER( wxSCRIPT ) + wxENUM_MEMBER( wxSWISS ) + wxENUM_MEMBER( wxMODERN ) + wxENUM_MEMBER( wxTELETYPE ) +wxEND_ENUM( wxFontFamily ) + +wxBEGIN_ENUM( wxFontStyle ) + wxENUM_MEMBER( wxNORMAL ) + wxENUM_MEMBER( wxITALIC ) + wxENUM_MEMBER( wxSLANT ) +wxEND_ENUM( wxFontStyle ) + +wxBEGIN_ENUM( wxFontWeight ) + wxENUM_MEMBER( wxNORMAL ) + wxENUM_MEMBER( wxLIGHT ) + wxENUM_MEMBER( wxBOLD ) +wxEND_ENUM( wxFontWeight ) + +IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h") + +wxBEGIN_PROPERTIES_TABLE(wxFont) + wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily + wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle + wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight + wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face ) + +wxBEGIN_HANDLERS_TABLE(wxFont) +wxEND_HANDLERS_TABLE() + +#else + IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- +// the mask used to extract the pitch from LOGFONT::lfPitchAndFamily field +static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH; + // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font // ---------------------------------------------------------------------------- @@ -60,11 +104,14 @@ public: // constructors wxFontRefData() { - Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, - FALSE, _T(""), wxFONTENCODING_DEFAULT); + Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, false, wxEmptyString, + wxFONTENCODING_DEFAULT); } wxFontRefData(int size, + const wxSize& pixelSize, + bool sizeUsingPixels, int family, int style, int weight, @@ -72,7 +119,8 @@ public: const wxString& faceName, wxFontEncoding encoding) { - Init(size, family, style, weight, underlined, faceName, encoding); + Init(size, pixelSize, sizeUsingPixels, family, style, weight, + underlined, faceName, encoding); } wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0) @@ -80,7 +128,7 @@ public: Init(info, hFont); } - wxFontRefData(const wxFontRefData& data) + wxFontRefData(const wxFontRefData& data) : wxGDIRefData() { if ( data.m_nativeFontInfoOk ) { @@ -88,7 +136,8 @@ public: } else { - Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight, + Init(data.m_pointSize, data.m_pixelSize, data.m_sizeUsingPixels, + data.m_family, data.m_style, data.m_weight, data.m_underlined, data.m_faceName, data.m_encoding); } } @@ -107,6 +156,17 @@ public: : m_pointSize; } + wxSize GetPixelSize() const + { + return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize() + : m_pixelSize; + } + + bool IsUsingSizeInPixels() const + { + return m_nativeFontInfoOk ? true : m_sizeUsingPixels; + } + int GetFamily() const { return m_family; @@ -153,9 +213,27 @@ public: void SetPointSize(int pointSize) { if ( m_nativeFontInfoOk ) + { m_nativeFontInfo.SetPointSize(pointSize); + } else + { m_pointSize = pointSize; + m_sizeUsingPixels = false; + } + } + + void SetPixelSize(const wxSize& pixelSize) + { + if ( m_nativeFontInfoOk ) + { + m_nativeFontInfo.SetPixelSize(pixelSize); + } + else + { + m_pixelSize = pixelSize; + m_sizeUsingPixels = true; + } } void SetFamily(int family) @@ -179,12 +257,13 @@ public: m_weight = weight; } - void SetFaceName(const wxString& faceName) + bool SetFaceName(const wxString& faceName) { if ( m_nativeFontInfoOk ) - m_nativeFontInfo.SetFaceName(faceName); - else + return m_nativeFontInfo.SetFaceName(faceName); + m_faceName = faceName; + return true; } void SetUnderlined(bool underlined) @@ -212,6 +291,8 @@ public: protected: // common part of all ctors void Init(int size, + const wxSize& pixelSize, + bool sizeUsingPixels, int family, int style, int weight, @@ -223,6 +304,8 @@ protected: // font characterstics int m_pointSize; + wxSize m_pixelSize; + bool m_sizeUsingPixels; int m_family; int m_style; int m_weight; @@ -247,6 +330,8 @@ protected: // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, + const wxSize& pixelSize, + bool sizeUsingPixels, int family, int style, int weight, @@ -256,6 +341,8 @@ void wxFontRefData::Init(int pointSize, { m_style = style; m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize; + m_pixelSize = pixelSize; + m_sizeUsingPixels = sizeUsingPixels; m_family = family; m_style = style; m_weight = weight; @@ -265,55 +352,22 @@ void wxFontRefData::Init(int pointSize, m_hFont = 0; - m_nativeFontInfoOk = FALSE; + m_nativeFontInfoOk = false; } void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont) { - // we don't really need the family, what for? -#if 0 - // extract family from pitch-and-family - int lfFamily = info.lf.lfPitchAndFamily; - if ( lfFamily & FIXED_PITCH ) - lfFamily -= FIXED_PITCH; - if ( lfFamily & VARIABLE_PITCH ) - lfFamily -= VARIABLE_PITCH; - - switch ( lfFamily ) - { - case FF_ROMAN: - m_family = wxROMAN; - break; - - case FF_SWISS: - m_family = wxSWISS; - break; - - case FF_SCRIPT: - m_family = wxSCRIPT; - break; - - case FF_MODERN: - m_family = wxMODERN; - break; - - case FF_DECORATIVE: - m_family = wxDECORATIVE; - break; - - default: - m_family = wxSWISS; - } -#endif // 0 - // hFont may be zero, or it be passed in case we really want to // use the exact font created in the underlying system // (for example where we can't guarantee conversion from HFONT // to LOGFONT back to HFONT) m_hFont = hFont; - m_nativeFontInfoOk = TRUE; + m_nativeFontInfoOk = true; m_nativeFontInfo = info; + // This is the best we can do since we don't have the + // correct information at this point. + m_family = wxSWISS; } wxFontRefData::~wxFontRefData() @@ -326,20 +380,18 @@ bool wxFontRefData::Alloc(wxFont *font) if ( !m_nativeFontInfoOk ) { wxFillLogFont(&m_nativeFontInfo.lf, font); - m_nativeFontInfoOk = TRUE; + m_nativeFontInfoOk = true; } HFONT hfont = ::CreateFontIndirect(&m_nativeFontInfo.lf); if ( !hfont ) { wxLogLastError(wxT("CreateFont")); - - return FALSE; + return false; } m_hFont = (WXHFONT)hfont; - - return TRUE; + return true; } void wxFontRefData::Free() @@ -362,15 +414,33 @@ void wxFontRefData::Free() void wxNativeFontInfo::Init() { wxZeroMemory(lf); + + // we get better font quality if we use this instead of DEFAULT_QUALITY + // apparently without any drawbacks +#ifdef __WXWINCE__ + lf.lfQuality = CLEARTYPE_QUALITY; +#else + lf.lfQuality = PROOF_QUALITY; +#endif } int wxNativeFontInfo::GetPointSize() const { + // FIXME: using the screen here results in incorrect font size calculation + // for printing! const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5); } +wxSize wxNativeFontInfo::GetPixelSize() const +{ + wxSize ret; + ret.SetHeight(lf.lfHeight); + ret.SetWidth(lf.lfWidth); + return ret; +} + wxFontStyle wxNativeFontInfo::GetStyle() const { return lf.lfItalic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL; @@ -397,6 +467,41 @@ wxString wxNativeFontInfo::GetFaceName() const return lf.lfFaceName; } +wxFontFamily wxNativeFontInfo::GetFamily() const +{ + wxFontFamily family; + + // extract family from pitch-and-family + switch ( lf.lfPitchAndFamily & ~PITCH_MASK ) + { + case FF_ROMAN: + family = wxFONTFAMILY_ROMAN; + break; + + default: + wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") ); + // fall through + + case FF_SWISS: + family = wxFONTFAMILY_SWISS; + break; + + case FF_SCRIPT: + family = wxFONTFAMILY_SCRIPT; + break; + + case FF_MODERN: + family = wxFONTFAMILY_MODERN; + break; + + case FF_DECORATIVE: + family = wxFONTFAMILY_DECORATIVE; + break; + } + + return family; +} + wxFontEncoding wxNativeFontInfo::GetEncoding() const { return wxGetFontEncFromCharSet(lf.lfCharSet); @@ -404,11 +509,20 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const void wxNativeFontInfo::SetPointSize(int pointsize) { + // FIXME: using the screen here results in incorrect font size calculation + // for printing! const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5); } +void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize) +{ + lf.lfHeight = pixelSize.GetHeight(); + lf.lfWidth = pixelSize.GetWidth(); +} + + void wxNativeFontInfo::SetStyle(wxFontStyle style) { switch ( style ) @@ -418,6 +532,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style) // fall through case wxFONTSTYLE_NORMAL: + lf.lfItalic = FALSE; break; case wxFONTSTYLE_ITALIC: @@ -454,9 +569,94 @@ void wxNativeFontInfo::SetUnderlined(bool underlined) lf.lfUnderline = underlined; } -void wxNativeFontInfo::SetFaceName(wxString facename) +bool wxNativeFontInfo::SetFaceName(const wxString& facename) +{ + size_t len = WXSIZEOF(lf.lfFaceName); + wxStrncpy(lf.lfFaceName, facename, len); + lf.lfFaceName[len - 1] = '\0'; // truncate the face name + return true; +} + +void wxNativeFontInfo::SetFamily(wxFontFamily family) { - wxStrncpy(lf.lfFaceName, facename, sizeof(lf.lfFaceName)); + BYTE ff_family; + wxArrayString facename; + + // the list of fonts associated with a family was partially + // taken from http://www.codestyle.org/css/font-family + + switch ( family ) + { + case wxSCRIPT: + ff_family = FF_SCRIPT; + facename.Add(_T("Script")); + facename.Add(_T("Brush Script MT")); + facename.Add(_T("Comic Sans MS")); + facename.Add(_T("Lucida Handwriting")); + break; + + case wxDECORATIVE: + ff_family = FF_DECORATIVE; + facename.Add(_T("Old English Text MT")); + facename.Add(_T("Comic Sans MS")); + facename.Add(_T("Lucida Handwriting")); + break; + + case wxROMAN: + ff_family = FF_ROMAN; + facename.Add(_T("Times New Roman")); + facename.Add(_T("Georgia")); + facename.Add(_T("Garamond")); + facename.Add(_T("Bookman Old Style")); + facename.Add(_T("Book Antiqua")); + break; + + case wxTELETYPE: + case wxMODERN: + ff_family = FF_MODERN; + facename.Add(_T("Courier New")); + facename.Add(_T("Lucida Console")); + facename.Add(_T("Andale Mono")); + facename.Add(_T("OCR A Extended")); + facename.Add(_T("Terminal")); + break; + + case wxSWISS: + ff_family = FF_SWISS; + facename.Add(_T("Arial")); + facename.Add(_T("Century Gothic")); + facename.Add(_T("Lucida Sans Unicode")); + facename.Add(_T("Tahoma")); + facename.Add(_T("Trebuchet MS")); + facename.Add(_T("Verdana")); + break; + + case wxDEFAULT: + default: + { + // We want Windows 2000 or later to have new fonts even MS Shell Dlg + // is returned as default GUI font for compatibility + int verMaj; + ff_family = FF_SWISS; + if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5) + facename.Add(_T("MS Shell Dlg 2")); + else + facename.Add(_T("MS Shell Dlg")); + + // Quoting the MSDN: + // "MS Shell Dlg is a mapping mechanism that enables + // U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to + // support locales that have characters that are not contained in code + // page 1252. It is not a font but a face name for a nonexistent font." + } + } + + lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family; + + if ( !wxStrlen(lf.lfFaceName) ) + { + SetFaceName(facename); + } } void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) @@ -465,22 +665,25 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) if ( !wxGetNativeFontEncoding(encoding, &info) ) { #if wxUSE_FONTMAP - if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) -#endif // wxUSE_FONTMAP + if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) ) { - // unsupported encoding, replace with the default - info.charset = ANSI_CHARSET; + if ( !info.facename.empty() ) + { + // if we have this encoding only in some particular facename, use + // the facename - it is better to show the correct characters in a + // wrong facename than unreadable text in a correct one + SetFaceName(info.facename); + } } - else if ( !info.facename.empty() ) + else +#endif // wxUSE_FONTMAP { - // if we have this encoding only in some particular facename, use - // the facename - it is better to show the correct characters in a - // wrong facename than unreadable text in a correct one - SetFaceName(info.facename); + // unsupported encoding, replace with the default + info.charset = DEFAULT_CHARSET; } } - lf.lfCharSet = info.charset; + lf.lfCharSet = (BYTE)info.charset; } bool wxNativeFontInfo::FromString(const wxString& s) @@ -492,86 +695,86 @@ bool wxNativeFontInfo::FromString(const wxString& s) // first the version wxString token = tokenizer.GetNextToken(); if ( token != _T('0') ) - return FALSE; + return false; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfHeight = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfWidth = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfEscapement = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfOrientation = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfWeight = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfItalic = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfUnderline = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfStrikeOut = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfCharSet = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfOutPrecision = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfClipPrecision = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfQuality = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfPitchAndFamily = (BYTE)l; token = tokenizer.GetNextToken(); if(!token) - return FALSE; + return false; wxStrcpy(lf.lfFaceName, token.c_str()); - return TRUE; + return true; } wxString wxNativeFontInfo::ToString() const { wxString s; - s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"), + s.Printf(_T("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"), 0, // version, in case we want to change the format later lf.lfHeight, lf.lfWidth, @@ -595,10 +798,6 @@ wxString wxNativeFontInfo::ToString() const // wxFont // ---------------------------------------------------------------------------- -void wxFont::Init() -{ -} - bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) { UnRef(); @@ -607,7 +806,7 @@ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) RealizeResource(); - return TRUE; + return true; } wxFont::wxFont(const wxString& fontdesc) @@ -620,13 +819,15 @@ wxFont::wxFont(const wxString& fontdesc) /* 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 pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString& faceName, - wxFontEncoding encoding) +bool wxFont::DoCreate(int pointSize, + const wxSize& pixelSize, + bool sizeUsingPixels, + int family, + int style, + int weight, + bool underlined, + const wxString& faceName, + wxFontEncoding encoding) { UnRef(); @@ -637,12 +838,13 @@ bool wxFont::Create(int pointSize, pointSize = wxNORMAL_FONT->GetPointSize(); } - m_refData = new wxFontRefData(pointSize, family, style, weight, + m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels, + family, style, weight, underlined, faceName, encoding); RealizeResource(); - return TRUE; + return true; } wxFont::~wxFont() @@ -657,9 +859,9 @@ bool wxFont::RealizeResource() { if ( GetResourceHandle() ) { - // VZ: the old code returned FALSE in this case, but it doesn't seem + // VZ: the old code returned false in this case, but it doesn't seem // to make sense because the font _was_ created - return TRUE; + return true; } return M_FONTDATA->Alloc(this); @@ -671,15 +873,15 @@ bool wxFont::FreeResource(bool WXUNUSED(force)) { M_FONTDATA->Free(); - return TRUE; + return true; } - return FALSE; + return false; } -WXHANDLE wxFont::GetResourceHandle() +WXHANDLE wxFont::GetResourceHandle() const { - return GetHFONT(); + return (WXHANDLE)GetHFONT(); } WXHFONT wxFont::GetHFONT() const @@ -720,6 +922,15 @@ void wxFont::SetPointSize(int pointSize) RealizeResource(); } +void wxFont::SetPixelSize(const wxSize& pixelSize) +{ + Unshare(); + + M_FONTDATA->SetPixelSize(pixelSize); + + RealizeResource(); +} + void wxFont::SetFamily(int family) { Unshare(); @@ -747,13 +958,22 @@ void wxFont::SetWeight(int weight) RealizeResource(); } -void wxFont::SetFaceName(const wxString& faceName) +bool wxFont::SetFaceName(const wxString& faceName) { Unshare(); - M_FONTDATA->SetFaceName(faceName); + bool refdataok = M_FONTDATA->SetFaceName(faceName); RealizeResource(); + + // NB: using win32's GetObject() API on M_FONTDATA->GetHFONT() + // to retrieve a LOGFONT and then compare lf.lfFaceName + // with given facename is not reliable at all: + // Windows copies the facename given to ::CreateFontIndirect() + // without any validity check. + // Thus we use wxFontBase::SetFaceName to check if facename + // is valid... + return refdataok && wxFontBase::SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined) @@ -774,7 +994,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding) RealizeResource(); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { Unshare(); @@ -796,6 +1016,18 @@ int wxFont::GetPointSize() const return M_FONTDATA->GetPointSize(); } +wxSize wxFont::GetPixelSize() const +{ + return M_FONTDATA->GetPixelSize(); +} + +bool wxFont::IsUsingSizeInPixels() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + + return M_FONTDATA->IsUsingSizeInPixels(); +} + int wxFont::GetFamily() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); @@ -819,14 +1051,14 @@ int wxFont::GetWeight() const bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); return M_FONTDATA->GetUnderlined(); } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } @@ -838,11 +1070,37 @@ wxFontEncoding wxFont::GetEncoding() const return M_FONTDATA->GetEncoding(); } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - if ( M_FONTDATA->HasNativeFontInfo() ) - return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo()); + return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) + : NULL; +} + +wxString wxFont::GetNativeFontInfoDesc() const +{ + // be sure we have an HFONT associated... + wxConstCast(this, wxFont)->RealizeResource(); + return wxFontBase::GetNativeFontInfoDesc(); +} - return 0; +wxString wxFont::GetNativeFontInfoUserDesc() const +{ + // be sure we have an HFONT associated... + wxConstCast(this, wxFont)->RealizeResource(); + return wxFontBase::GetNativeFontInfoUserDesc(); } +bool wxFont::IsFixedWidth() const +{ + if ( M_FONTDATA->HasNativeFontInfo() ) + { + // the two low-order bits specify the pitch of the font, the rest is + // family + BYTE pitch = + (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK); + + return pitch == FIXED_PITCH; + } + + return wxFontBase::IsFixedWidth(); +}