X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36e2bb4eed57bc36ba9880f1bb20a9555bcd21f8..1e52188741389278cd99abf79218162c87024ba3:/src/msw/font.cpp?ds=inline diff --git a/src/msw/font.cpp b/src/msw/font.cpp index a8fb8be541..24ef9f2d33 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "font.h" #endif @@ -44,12 +44,59 @@ #include "wx/tokenzr.h" -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +#if wxUSE_EXTENDED_RTTI + +WX_BEGIN_ENUM( wxFontFamily ) + WX_ENUM_MEMBER( wxDEFAULT ) + WX_ENUM_MEMBER( wxDECORATIVE ) + WX_ENUM_MEMBER( wxROMAN ) + WX_ENUM_MEMBER( wxSCRIPT ) + WX_ENUM_MEMBER( wxSWISS ) + WX_ENUM_MEMBER( wxMODERN ) + WX_ENUM_MEMBER( wxTELETYPE ) +WX_END_ENUM( wxFontFamily ) + +WX_BEGIN_ENUM( wxFontStyle ) + WX_ENUM_MEMBER( wxNORMAL ) + WX_ENUM_MEMBER( wxITALIC ) + WX_ENUM_MEMBER( wxSLANT ) +WX_END_ENUM( wxFontStyle ) + +WX_BEGIN_ENUM( wxFontWeight ) + WX_ENUM_MEMBER( wxNORMAL ) + WX_ENUM_MEMBER( wxLIGHT ) + WX_ENUM_MEMBER( wxBOLD ) +WX_END_ENUM( wxFontWeight ) + +IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h") + +WX_BEGIN_PROPERTIES_TABLE(wxFont) + WX_PROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + WX_PROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily + WX_PROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle + WX_PROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight + WX_PROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + WX_PROPERTY( Face, wxString , SetFaceName, GetFaceName, , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + WX_PROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +WX_END_PROPERTIES_TABLE() + +WX_CONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face ) + +WX_BEGIN_HANDLERS_TABLE(wxFont) +WX_END_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 // ---------------------------------------------------------------------------- @@ -61,7 +108,7 @@ public: wxFontRefData() { Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, - FALSE, _T(""), wxFONTENCODING_DEFAULT); + FALSE, wxEmptyString, wxFONTENCODING_DEFAULT); } wxFontRefData(int size, @@ -270,42 +317,6 @@ void wxFontRefData::Init(int pointSize, 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 @@ -314,6 +325,9 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont) 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() @@ -401,41 +415,37 @@ wxString wxNativeFontInfo::GetFaceName() const wxFontFamily wxNativeFontInfo::GetFamily() const { - // extract family from pitch-and-family - int lfFamily = lf.lfPitchAndFamily; - int family; - - if ( lfFamily & FIXED_PITCH ) - lfFamily -= FIXED_PITCH; - if ( lfFamily & VARIABLE_PITCH ) - lfFamily -= VARIABLE_PITCH; + wxFontFamily family; - 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 @@ -466,6 +476,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style) // fall through case wxFONTSTYLE_NORMAL: + lf.lfItalic = FALSE; break; case wxFONTSTYLE_ITALIC: @@ -560,7 +571,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,7 +585,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) #endif // wxUSE_FONTMAP { // unsupported encoding, replace with the default - info.charset = ANSI_CHARSET; + info.charset = DEFAULT_CHARSET; } } @@ -669,7 +680,7 @@ 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, @@ -775,9 +786,9 @@ bool wxFont::FreeResource(bool WXUNUSED(force)) return FALSE; } -WXHANDLE wxFont::GetResourceHandle() +WXHANDLE wxFont::GetResourceHandle() const { - return GetHFONT(); + return (WXHANDLE)GetHFONT(); } WXHFONT wxFont::GetHFONT() const @@ -872,7 +883,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding) RealizeResource(); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { Unshare(); @@ -924,7 +935,7 @@ bool wxFont::GetUnderlined() const wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } @@ -944,3 +955,18 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const return 0; } +bool wxFont::IsFixedWidth() const +{ + if ( M_FONTDATA->HasNativeFontInfo() ) + { + // the two low-order bits specify the pitch of the font, the rest is + // family + BYTE pitch = M_FONTDATA->GetNativeFontInfo(). + lf.lfPitchAndFamily & PITCH_MASK; + + return pitch == FIXED_PITCH; + } + + return wxFontBase::IsFixedWidth(); +} +