X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7936354da7452fa9923bdd374742d64af9f86934..4b26b60fac70f89cf33935f78469e27536d8b614:/src/common/fontcmn.cpp?ds=inline diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index fcbe26c07b..d448cd6238 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -6,7 +6,7 @@ // Created: 20.09.99 // RCS-ID: $Id$ // Copyright: (c) wxWindows team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -49,6 +49,22 @@ wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM; +/* static */ +void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding) +{ + // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT + // and, besides, using this value here doesn't make any sense + wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT, + _T("can't set default encoding to wxFONTENCODING_DEFAULT") ); + + ms_encodingDefault = encoding; +} + +wxFontBase::~wxFontBase() +{ + // this destructor is required for Darwin +} + /* static */ wxFont *wxFontBase::New(int size, int family, @@ -61,6 +77,33 @@ wxFont *wxFontBase::New(int size, return new wxFont(size, family, style, weight, underlined, face, encoding); } +/* static */ +wxFont *wxFontBase::New(int pointSize, + wxFontFamily family, + int flags, + const wxString& face, + wxFontEncoding encoding) +{ + return New + ( + pointSize, + family, + flags & wxFONTFLAG_ITALIC + ? wxFONTSTYLE_ITALIC + : flags & wxFONTFLAG_SLANT + ? wxFONTSTYLE_SLANT + : wxFONTSTYLE_NORMAL, + flags & wxFONTFLAG_LIGHT + ? wxFONTWEIGHT_LIGHT + : flags & wxFONTFLAG_BOLD + ? wxFONTWEIGHT_BOLD + : wxFONTWEIGHT_NORMAL, + (flags & wxFONTFLAG_UNDERLINED) != 0, + face, + encoding + ); +} + /* static */ wxFont *wxFontBase::New(const wxNativeFontInfo& info) { @@ -77,13 +120,18 @@ wxFont *wxFontBase::New(const wxString& strNativeFontDesc) return New(fontInfo); } +bool wxFontBase::IsFixedWidth() const +{ + return GetFamily() == wxFONTFAMILY_TELETYPE; +} + wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const { #ifdef wxNO_NATIVE_FONTINFO wxNativeFontInfo *fontInfo = new wxNativeFontInfo(); fontInfo->SetPointSize(GetPointSize()); - fontInfo->SetFamily(GetFamily()); + fontInfo->SetFamily((wxFontFamily)GetFamily()); fontInfo->SetStyle((wxFontStyle)GetStyle()); fontInfo->SetWeight((wxFontWeight)GetWeight()); fontInfo->SetUnderlined(GetUnderlined()); @@ -96,7 +144,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const #endif } -void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info) { #ifdef wxNO_NATIVE_FONTINFO SetPointSize(info.pointSize); @@ -257,7 +305,7 @@ bool wxNativeFontInfo::FromString(const wxString& s) token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) return FALSE; - family = (int)l; + family = (wxFontFamily)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) @@ -275,8 +323,11 @@ bool wxNativeFontInfo::FromString(const wxString& s) underlined = l != 0; faceName = tokenizer.GetNextToken(); + +#ifndef __WXMAC__ if( !faceName ) return FALSE; +#endif token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) @@ -371,10 +422,10 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_) void wxNativeFontInfo::SetFaceName(wxString facename_) { - facename = facename_; + faceName = facename_; } -void wxNativeFontInfo::SetFamily(wxFontFamily family) +void wxNativeFontInfo::SetFamily(wxFontFamily family_) { family = family_; } @@ -391,7 +442,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_) // format there anyhow (but there is a well-defined standard for X11 fonts used // by wxGTK and wxMotif) -#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) +#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined (__WXPM__) wxString wxNativeFontInfo::ToUserString() const { @@ -450,11 +501,13 @@ wxString wxNativeFontInfo::ToUserString() const desc << _T(' ') << size; } +#if wxUSE_FONTMAP wxFontEncoding enc = GetEncoding(); if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM ) { - desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc); + desc << _T(' ') << wxFontMapper::Get()->GetEncodingName(enc); } +#endif // wxUSE_FONTMAP return desc; } @@ -471,7 +524,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) wxString face; unsigned long size; + +#if wxUSE_FONTMAP wxFontEncoding encoding; +#endif // wxUSE_FONTMAP while ( tokenizer.HasMoreTokens() ) { @@ -501,11 +557,13 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) { SetPointSize(size); } - else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE)) +#if wxUSE_FONTMAP + else if ( (encoding = wxFontMapper::Get()->CharsetToEncoding(token, FALSE)) != wxFONTENCODING_DEFAULT ) { SetEncoding(encoding); } +#endif // wxUSE_FONTMAP else // assume it is the face name { if ( !face.empty() ) @@ -538,5 +596,5 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) return TRUE; } -#endif // generic or wxMSW +#endif // generic or wxMSW or wxOS2