X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/907173e51df6d2a91d65463ddf6ce810d3fd921a..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index d79b4b74a6..5fcc96ffc8 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "font.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,12 +24,12 @@ #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 @@ -108,8 +104,8 @@ public: // constructors wxFontRefData() { - Init(-1, wxSize(0, 0), FALSE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL, FALSE, wxEmptyString, + Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, false, wxEmptyString, wxFONTENCODING_DEFAULT); } @@ -132,7 +128,7 @@ public: Init(info, hFont); } - wxFontRefData(const wxFontRefData& data) + wxFontRefData(const wxFontRefData& data) : wxGDIRefData() { if ( data.m_nativeFontInfoOk ) { @@ -223,7 +219,7 @@ public: else { m_pointSize = pointSize; - m_sizeUsingPixels = FALSE; + m_sizeUsingPixels = false; } } @@ -236,7 +232,7 @@ public: else { m_pixelSize = pixelSize; - m_sizeUsingPixels = TRUE; + m_sizeUsingPixels = true; } } @@ -261,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) @@ -390,12 +387,10 @@ bool wxFontRefData::Alloc(wxFont *font) if ( !hfont ) { wxLogLastError(wxT("CreateFont")); - return false; } m_hFont = (WXHFONT)hfont; - return true; } @@ -506,16 +501,11 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const void wxNativeFontInfo::SetPointSize(int pointsize) { -#if wxFONT_SIZE_COMPATIBILITY - // Incorrect, but compatible with old wxWidgets 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) @@ -571,51 +561,89 @@ void wxNativeFontInfo::SetUnderlined(bool underlined) lf.lfUnderline = underlined; } -void wxNativeFontInfo::SetFaceName(wxString facename) +bool wxNativeFontInfo::SetFaceName(const wxString& facename) { - wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName)); + 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) { - int ff_family; - wxString facename; + 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 = _T("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 = _T("Old English Text MT"); + 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 = _T("Times New 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 = _T("Courier New"); + 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 = _T("Arial"); + 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; - facename = _T("MS Sans Serif"); + if(wxGetOsVersion(&verMaj) == wxWINDOWS_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 = DEFAULT_PITCH | ff_family; + lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family; if ( !wxStrlen(lf.lfFaceName) ) { @@ -647,7 +675,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) } } - lf.lfCharSet = info.charset; + lf.lfCharSet = (BYTE)info.charset; } bool wxNativeFontInfo::FromString(const wxString& s) @@ -762,10 +790,6 @@ wxString wxNativeFontInfo::ToString() const // wxFont // ---------------------------------------------------------------------------- -void wxFont::Init() -{ -} - bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) { UnRef(); @@ -926,13 +950,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) @@ -1035,6 +1068,20 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const : NULL; } +wxString wxFont::GetNativeFontInfoDesc() const +{ + // be sure we have an HFONT associated... + wxConstCast(this, wxFont)->RealizeResource(); + return wxFontBase::GetNativeFontInfoDesc(); +} + +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() ) @@ -1049,4 +1096,3 @@ bool wxFont::IsFixedWidth() const return wxFontBase::IsFixedWidth(); } -