X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36e2bb4eed57bc36ba9880f1bb20a9555bcd21f8..3bf93e1e9ac6b61e5220967d2ada2d4faec4dd9c:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index a8fb8be541..c9f7b35890 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,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "font.h" #endif @@ -35,6 +35,7 @@ #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 +45,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 +108,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 +123,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 +132,7 @@ public: Init(info, hFont); } - wxFontRefData(const wxFontRefData& data) + wxFontRefData(const wxFontRefData& data) : wxGDIRefData() { if ( data.m_nativeFontInfoOk ) { @@ -88,7 +140,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 +160,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 +217,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) @@ -212,6 +294,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 +307,8 @@ protected: // font characterstics int m_pointSize; + wxSize m_pixelSize; + bool m_sizeUsingPixels; int m_family; int m_style; int m_weight; @@ -247,6 +333,8 @@ protected: // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, + const wxSize& pixelSize, + bool sizeUsingPixels, int family, int style, int weight, @@ -256,6 +344,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 +355,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,7 +383,7 @@ 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); @@ -334,12 +391,12 @@ bool wxFontRefData::Alloc(wxFont *font) { wxLogLastError(wxT("CreateFont")); - return FALSE; + return false; } m_hFont = (WXHFONT)hfont; - return TRUE; + return true; } void wxFontRefData::Free() @@ -373,6 +430,14 @@ int wxNativeFontInfo::GetPointSize() const 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; @@ -401,41 +466,37 @@ wxString wxNativeFontInfo::GetFaceName() const wxFontFamily wxNativeFontInfo::GetFamily() const { - // extract family from pitch-and-family - int lfFamily = lf.lfPitchAndFamily; - int family; + wxFontFamily family; - if ( lfFamily & FIXED_PITCH ) - lfFamily -= FIXED_PITCH; - if ( lfFamily & VARIABLE_PITCH ) - lfFamily -= VARIABLE_PITCH; - - switch ( lfFamily ) + // extract family from pitch-and-family + switch ( lf.lfPitchAndFamily & ~PITCH_MASK ) { case FF_ROMAN: - family = wxROMAN; + family = wxFONTFAMILY_ROMAN; break; + default: + wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") ); + // fall through + case FF_SWISS: - family = wxSWISS; + family = wxFONTFAMILY_SWISS; break; case FF_SCRIPT: - family = wxSCRIPT; + family = wxFONTFAMILY_SCRIPT; break; case FF_MODERN: - family = wxMODERN; + family = wxFONTFAMILY_MODERN; break; case FF_DECORATIVE: - family = wxDECORATIVE; + family = wxFONTFAMILY_DECORATIVE; break; - - default: - family = wxSWISS; } - return (wxFontFamily)family; + + return family; } wxFontEncoding wxNativeFontInfo::GetEncoding() const @@ -445,18 +506,20 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const void wxNativeFontInfo::SetPointSize(int pointsize) { -#if wxFONT_SIZE_COMPATIBILITY - // Incorrect, but compatible with old wxWindows behaviour - lf.lfHeight = (pointSize*ppInch)/72; -#else // wxFONT_SIZE_COMPATIBILITY // 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); -#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY } +void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize) +{ + lf.lfHeight = pixelSize.GetHeight(); + lf.lfWidth = pixelSize.GetWidth(); +} + + void wxNativeFontInfo::SetStyle(wxFontStyle style) { switch ( style ) @@ -466,6 +529,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style) // fall through case wxFONTSTYLE_NORMAL: + lf.lfItalic = FALSE; break; case wxFONTSTYLE_ITALIC: @@ -509,7 +573,7 @@ void wxNativeFontInfo::SetFaceName(wxString facename) void wxNativeFontInfo::SetFamily(wxFontFamily family) { - int ff_family; + BYTE ff_family; wxString facename; switch ( family ) @@ -542,11 +606,19 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family) 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; - facename = _T("MS Sans Serif"); + if(wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5) + facename = _T("MS Shell Dlg 2"); + else + facename = _T("MS Shell Dlg"); + } } - lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family; + lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family; if ( !wxStrlen(lf.lfFaceName) ) { @@ -560,7 +632,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) if ( !wxGetNativeFontEncoding(encoding, &info) ) { #if wxUSE_FONTMAP - if ( wxTheFontMapper->GetAltForEncoding(encoding, &info) ) + if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) ) { if ( !info.facename.empty() ) { @@ -574,11 +646,11 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) #endif // wxUSE_FONTMAP { // unsupported encoding, replace with the default - info.charset = ANSI_CHARSET; + info.charset = DEFAULT_CHARSET; } } - lf.lfCharSet = info.charset; + lf.lfCharSet = (BYTE)info.charset; } bool wxNativeFontInfo::FromString(const wxString& s) @@ -590,86 +662,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, @@ -705,7 +777,7 @@ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) RealizeResource(); - return TRUE; + return true; } wxFont::wxFont(const wxString& fontdesc) @@ -718,13 +790,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(); @@ -735,12 +809,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() @@ -755,9 +830,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); @@ -769,15 +844,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 @@ -818,6 +893,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(); @@ -872,7 +956,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding) RealizeResource(); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { Unshare(); @@ -894,6 +978,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") ); @@ -917,14 +1013,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(); } @@ -936,11 +1032,24 @@ wxFontEncoding wxFont::GetEncoding() const return M_FONTDATA->GetEncoding(); } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const +{ + return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) + : NULL; +} + +bool wxFont::IsFixedWidth() const { if ( M_FONTDATA->HasNativeFontInfo() ) - return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo()); + { + // 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 0; + return wxFontBase::IsFixedWidth(); }