X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/804250acc385078b8a2ca0fba5d45062999a2e9d..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index fde6b86faf..060139df72 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -31,11 +31,10 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/log.h" - #include "wx/encinfo.h" + #include "wx/msw/private.h" #endif // WX_PRECOMP -#include "wx/msw/private.h" - +#include "wx/encinfo.h" #include "wx/fontutil.h" #include "wx/fontmap.h" @@ -46,52 +45,6 @@ #include "wx/scopeguard.h" #include "wx/tokenzr.h" -#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 // ---------------------------------------------------------------------------- @@ -110,7 +63,7 @@ public: wxFontRefData() { Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL, false, wxEmptyString, + wxFONTWEIGHT_NORMAL, false, false, wxEmptyString, wxFONTENCODING_DEFAULT); } @@ -121,11 +74,12 @@ public: wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding encoding) { Init(size, pixelSize, sizeUsingPixels, family, style, weight, - underlined, faceName, encoding); + underlined, strikethrough, faceName, encoding); } wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0) @@ -181,6 +135,11 @@ public: return m_nativeFontInfo.GetUnderlined(); } + bool GetStrikethrough() const + { + return m_nativeFontInfo.GetStrikethrough(); + } + wxString GetFaceName() const { wxString facename = m_nativeFontInfo.GetFaceName(); @@ -189,14 +148,6 @@ public: facename = GetMSWFaceName(); if ( !facename.empty() ) { - // the face name returned by GetOutlineTextMetrics() may have - // these suffixes which we don't count as part of face name - // because we have separate fields for them so remove them - wxString basename; - if ( facename.EndsWith(wxS(" Italic"), &basename) || - facename.EndsWith(wxS(" Bold"), &basename) ) - facename = basename; - // cache the face name, it shouldn't change unless the family // does and wxNativeFontInfo::SetFamily() resets the face name const_cast(this)->SetFaceName(facename); @@ -213,8 +164,7 @@ public: WXHFONT GetHFONT() const { - if ( !m_hFont ) - const_cast(this)->Alloc(); + AllocIfNeeded(); return (WXHFONT)m_hFont; } @@ -281,6 +231,13 @@ public: m_nativeFontInfo.SetUnderlined(underlined); } + void SetStrikethrough(bool strikethrough) + { + Free(); + + m_nativeFontInfo.SetStrikethrough(strikethrough); + } + void SetEncoding(wxFontEncoding encoding) { Free(); @@ -289,7 +246,18 @@ public: } const wxNativeFontInfo& GetNativeFontInfo() const - { return m_nativeFontInfo; } + { + // we need to create the font now to get the corresponding LOGFONT if + // it hadn't been done yet + AllocIfNeeded(); + + // ensure that we have a valid face name in our font information: + // GetFaceName() will try to retrieve it from our HFONT and save it if + // it was successful + (void)GetFaceName(); + + return m_nativeFontInfo; + } void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo) { @@ -307,18 +275,25 @@ protected: wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding encoding); void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0); + void AllocIfNeeded() const + { + if ( !m_hFont ) + const_cast(this)->Alloc(); + } + // retrieve the face name really being used by the font: this is used to // get the face name selected by the system when we don't specify it (but // use just the family for example) wxString GetMSWFaceName() const { ScreenHDC hdc; - SelectInHDC selectFont(hdc, m_hFont); + SelectInHDC selectFont(hdc, (HFONT)GetHFONT()); UINT otmSize = GetOutlineTextMetrics(hdc, 0, NULL); if ( !otmSize ) @@ -338,11 +313,14 @@ protected: return wxString(); } - // in spite of its type, the otmpFaceName field of OUTLINETEXTMETRIC - // gives an offset in _bytes_ of the face name from the struct start - // while the name itself is an array of TCHARs + // in spite of its type, the otmpFamilyName field of OUTLINETEXTMETRIC + // gives an offset in _bytes_ of the face (not family!) name from the + // struct start while the name itself is an array of TCHARs + // + // FWIW otmpFaceName contains the same thing as otmpFamilyName followed + // by a possible " Italic" or " Bold" or something else suffix return reinterpret_cast(otm) + - wxPtrToUInt(otm->otmpFaceName)/sizeof(wxChar); + wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar); } // are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size? @@ -372,6 +350,7 @@ void wxFontRefData::Init(int pointSize, wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding encoding) { @@ -386,6 +365,7 @@ void wxFontRefData::Init(int pointSize, SetStyle(style); SetWeight(weight); SetUnderlined(underlined); + SetStrikethrough(strikethrough); // set the family/facename SetFamily(family); @@ -499,6 +479,11 @@ bool wxNativeFontInfo::GetUnderlined() const return lf.lfUnderline != 0; } +bool wxNativeFontInfo::GetStrikethrough() const +{ + return lf.lfStrikeOut != 0; +} + wxString wxNativeFontInfo::GetFaceName() const { return lf.lfFaceName; @@ -619,6 +604,11 @@ void wxNativeFontInfo::SetUnderlined(bool underlined) lf.lfUnderline = underlined; } +void wxNativeFontInfo::SetStrikethrough(bool strikethrough) +{ + lf.lfStrikeOut = strikethrough; +} + bool wxNativeFontInfo::SetFaceName(const wxString& facename) { wxStrlcpy(lf.lfFaceName, facename.c_str(), WXSIZEOF(lf.lfFaceName)); @@ -652,6 +642,10 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family) case wxFONTFAMILY_DEFAULT: ff_family = FF_SWISS; break; + + case wxFONTFAMILY_UNKNOWN: + wxFAIL_MSG( "invalid font family" ); + return; } wxCHECK_RET( ff_family != FF_DONTCARE, "unknown wxFontFamily" ); @@ -770,7 +764,7 @@ bool wxNativeFontInfo::FromString(const wxString& s) return false; // the face name may be empty - wxStrcpy(lf.lfFaceName, tokenizer.GetNextToken()); + SetFaceName(tokenizer.GetNextToken()); return true; } @@ -810,6 +804,20 @@ wxFont::wxFont(const wxString& fontdesc) (void)Create(info); } +wxFont::wxFont(int pointSize, + wxFontFamily family, + int flags, + const wxString& face, + wxFontEncoding encoding) +{ + m_refData = new wxFontRefData(pointSize, wxDefaultSize, false, + family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + false, face, encoding); +} + bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) { UnRef(); @@ -833,14 +841,14 @@ bool wxFont::DoCreate(int pointSize, // wxDEFAULT is a valid value for the font size too so we must treat it // specially here (otherwise the size would be 70 == wxDEFAULT value) - if ( pointSize == wxDEFAULT ) + if ( pointSize == wxDEFAULT || pointSize == -1 ) { pointSize = wxNORMAL_FONT->GetPointSize(); } m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels, family, style, weight, - underlined, faceName, encoding); + underlined, false, faceName, encoding); return RealizeResource(); } @@ -962,6 +970,13 @@ void wxFont::SetUnderlined(bool underlined) M_FONTDATA->SetUnderlined(underlined); } +void wxFont::SetStrikethrough(bool strikethrough) +{ + AllocExclusive(); + + M_FONTDATA->SetStrikethrough(strikethrough); +} + void wxFont::SetEncoding(wxFontEncoding encoding) { AllocExclusive(); @@ -1001,10 +1016,8 @@ bool wxFont::IsUsingSizeInPixels() const return M_FONTDATA->IsUsingSizeInPixels(); } -wxFontFamily wxFont::GetFamily() const +wxFontFamily wxFont::DoGetFamily() const { - wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") ); - return M_FONTDATA->GetFamily(); } @@ -1029,6 +1042,13 @@ bool wxFont::GetUnderlined() const return M_FONTDATA->GetUnderlined(); } +bool wxFont::GetStrikethrough() const +{ + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); + + return M_FONTDATA->GetStrikethrough(); +} + wxString wxFont::GetFaceName() const { wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); @@ -1048,32 +1068,23 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL; } -wxString wxFont::GetNativeFontInfoDesc() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - // be sure we have an HFONT associated... - const_cast(this)->RealizeResource(); - return wxFontBase::GetNativeFontInfoDesc(); -} - -wxString wxFont::GetNativeFontInfoUserDesc() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - // be sure we have an HFONT associated... - const_cast(this)->RealizeResource(); - return wxFontBase::GetNativeFontInfoUserDesc(); -} - bool wxFont::IsFixedWidth() const { wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - // 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); + // LOGFONT doesn't contain the correct pitch information so we need to call + // GetTextMetrics() to get it + ScreenHDC hdc; + SelectInHDC selectFont(hdc, M_FONTDATA->GetHFONT()); + + TEXTMETRIC tm; + if ( !::GetTextMetrics(hdc, &tm) ) + { + wxLogLastError(wxT("GetTextMetrics")); + return false; + } - return pitch == FIXED_PITCH; + // Quoting MSDN description of TMPF_FIXED_PITCH: "Note very carefully that + // those meanings are the opposite of what the constant name implies." + return !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH); }