// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) wxWindows team
+// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "font.h"
#endif
#include "wx/app.h"
#include "wx/font.h"
#include "wx/log.h"
+ #include "wx/encinfo.h"
#endif // WX_PRECOMP
#include "wx/msw/private.h"
#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
// ----------------------------------------------------------------------------
+// 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
// ----------------------------------------------------------------------------
wxFontRefData()
{
Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
- FALSE, _T(""), wxFONTENCODING_DEFAULT);
+ FALSE, wxEmptyString, wxFONTENCODING_DEFAULT);
}
wxFontRefData(int size,
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
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()
return lf.lfFaceName;
}
+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+ wxFontFamily family;
+
+ // extract family from pitch-and-family
+ switch ( lf.lfPitchAndFamily & ~PITCH_MASK )
+ {
+ case FF_ROMAN:
+ family = wxFONTFAMILY_ROMAN;
+ break;
+
+ default:
+ wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") );
+ // fall through
+
+ case FF_SWISS:
+ family = wxFONTFAMILY_SWISS;
+ break;
+
+ case FF_SCRIPT:
+ family = wxFONTFAMILY_SCRIPT;
+ break;
+
+ case FF_MODERN:
+ family = wxFONTFAMILY_MODERN;
+ break;
+
+ case FF_DECORATIVE:
+ family = wxFONTFAMILY_DECORATIVE;
+ break;
+ }
+
+ return family;
+}
+
wxFontEncoding wxNativeFontInfo::GetEncoding() const
{
return wxGetFontEncFromCharSet(lf.lfCharSet);
void wxNativeFontInfo::SetPointSize(int pointsize)
{
#if wxFONT_SIZE_COMPATIBILITY
- // Incorrect, but compatible with old wxWindows behaviour
+ // 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
// fall through
case wxFONTSTYLE_NORMAL:
+ lf.lfItalic = FALSE;
break;
case wxFONTSTYLE_ITALIC:
void wxNativeFontInfo::SetFaceName(wxString facename)
{
- wxStrncpy(lf.lfFaceName, facename, sizeof(lf.lfFaceName));
+ wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
}
void wxNativeFontInfo::SetFamily(wxFontFamily family)
case wxDECORATIVE:
ff_family = FF_DECORATIVE;
- facename = _T("Wingdings");
+ facename = _T("Old English Text MT");
break;
case wxROMAN:
if ( !wxGetNativeFontEncoding(encoding, &info) )
{
#if wxUSE_FONTMAP
- if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
-#endif // wxUSE_FONTMAP
+ if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
{
- // unsupported encoding, replace with the default
- info.charset = ANSI_CHARSET;
+ if ( !info.facename.empty() )
+ {
+ // if we have this encoding only in some particular facename, use
+ // the facename - it is better to show the correct characters in a
+ // wrong facename than unreadable text in a correct one
+ SetFaceName(info.facename);
+ }
}
- else if ( !info.facename.empty() )
+ else
+#endif // wxUSE_FONTMAP
{
- // if we have this encoding only in some particular facename, use
- // the facename - it is better to show the correct characters in a
- // wrong facename than unreadable text in a correct one
- SetFaceName(info.facename);
+ // unsupported encoding, replace with the default
+ info.charset = DEFAULT_CHARSET;
}
}
{
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,
return FALSE;
}
-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const
{
- return GetHFONT();
+ return (WXHANDLE)GetHFONT();
}
WXHFONT wxFont::GetHFONT() const
RealizeResource();
}
-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
Unshare();
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->GetFaceName();
}
return M_FONTDATA->GetEncoding();
}
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+ return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
+ : NULL;
+}
+
+bool wxFont::IsFixedWidth() const
{
if ( M_FONTDATA->HasNativeFontInfo() )
- return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo());
+ {
+ // 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 0;
+ return wxFontBase::IsFixedWidth();
}
projects / wxWidgets.git / blobdiff