X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4244c20bf5347a453568adca86876a210bb68256..3d104ec3570c714e770784003d6eafe9f9226d9a:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index c1d032c476..c3ed95c514 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,7 +45,51 @@ #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 @@ -63,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, @@ -75,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) @@ -83,7 +132,7 @@ public: Init(info, hFont); } - wxFontRefData(const wxFontRefData& data) + wxFontRefData(const wxFontRefData& data) : wxGDIRefData() { if ( data.m_nativeFontInfoOk ) { @@ -91,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); } } @@ -110,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; @@ -156,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) @@ -215,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, @@ -226,6 +307,8 @@ protected: // font characterstics int m_pointSize; + wxSize m_pixelSize; + bool m_sizeUsingPixels; int m_family; int m_style; int m_weight; @@ -250,6 +333,8 @@ protected: // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, + const wxSize& pixelSize, + bool sizeUsingPixels, int family, int style, int weight, @@ -259,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; @@ -268,7 +355,7 @@ void wxFontRefData::Init(int pointSize, m_hFont = 0; - m_nativeFontInfoOk = FALSE; + m_nativeFontInfoOk = false; } void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont) @@ -279,7 +366,7 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT 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. @@ -296,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); @@ -304,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() @@ -343,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; @@ -411,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 ) @@ -432,6 +529,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style) // fall through case wxFONTSTYLE_NORMAL: + lf.lfItalic = FALSE; break; case wxFONTSTYLE_ITALIC: @@ -475,7 +573,7 @@ void wxNativeFontInfo::SetFaceName(wxString facename) void wxNativeFontInfo::SetFamily(wxFontFamily family) { - int ff_family; + BYTE ff_family; wxString facename; switch ( family ) @@ -512,7 +610,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family) facename = _T("MS Sans Serif"); } - lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family; + lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family; if ( !wxStrlen(lf.lfFaceName) ) { @@ -544,7 +642,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) } } - lf.lfCharSet = info.charset; + lf.lfCharSet = (BYTE)info.charset; } bool wxNativeFontInfo::FromString(const wxString& s) @@ -556,79 +654,79 @@ 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 @@ -671,7 +769,7 @@ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) RealizeResource(); - return TRUE; + return true; } wxFont::wxFont(const wxString& fontdesc) @@ -684,13 +782,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(); @@ -701,12 +801,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() @@ -721,9 +822,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); @@ -735,15 +836,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 @@ -784,6 +885,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(); @@ -838,7 +948,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding) RealizeResource(); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { Unshare(); @@ -860,6 +970,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") ); @@ -883,14 +1005,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(); } @@ -902,12 +1024,10 @@ 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 0; + return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) + : NULL; } bool wxFont::IsFixedWidth() const @@ -916,8 +1036,8 @@ bool wxFont::IsFixedWidth() const { // the two low-order bits specify the pitch of the font, the rest is // family - BYTE pitch = M_FONTDATA->GetNativeFontInfo(). - lf.lfPitchAndFamily & PITCH_MASK; + BYTE pitch = + (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK); return pitch == FIXED_PITCH; }