#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"
#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
// ----------------------------------------------------------------------------
wxFontRefData()
{
Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
- wxFONTWEIGHT_NORMAL, false, wxEmptyString,
+ wxFONTWEIGHT_NORMAL, false, false, wxEmptyString,
wxFONTENCODING_DEFAULT);
}
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)
return m_nativeFontInfo.GetUnderlined();
}
+ bool GetStrikethrough() const
+ {
+ return m_nativeFontInfo.GetStrikethrough();
+ }
+
wxString GetFaceName() const
{
wxString facename = m_nativeFontInfo.GetFaceName();
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<wxFontRefData *>(this)->SetFaceName(facename);
WXHFONT GetHFONT() const
{
- if ( !m_hFont )
- const_cast<wxFontRefData *>(this)->Alloc();
+ AllocIfNeeded();
return (WXHFONT)m_hFont;
}
m_nativeFontInfo.SetUnderlined(underlined);
}
+ void SetStrikethrough(bool strikethrough)
+ {
+ Free();
+
+ m_nativeFontInfo.SetStrikethrough(strikethrough);
+ }
+
void SetEncoding(wxFontEncoding encoding)
{
Free();
}
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)
{
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<wxFontRefData *>(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 )
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<wxChar *>(otm) +
- wxPtrToUInt(otm->otmpFaceName)/sizeof(wxChar);
+ wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar);
}
// are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size?
wxFontStyle style,
wxFontWeight weight,
bool underlined,
+ bool strikethrough,
const wxString& faceName,
wxFontEncoding encoding)
{
SetStyle(style);
SetWeight(weight);
SetUnderlined(underlined);
+ SetStrikethrough(strikethrough);
// set the family/facename
SetFamily(family);
return lf.lfUnderline != 0;
}
+bool wxNativeFontInfo::GetStrikethrough() const
+{
+ return lf.lfStrikeOut != 0;
+}
+
wxString wxNativeFontInfo::GetFaceName() const
{
return lf.lfFaceName;
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));
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" );
return false;
// the face name may be empty
- wxStrcpy(lf.lfFaceName, tokenizer.GetNextToken());
+ SetFaceName(tokenizer.GetNextToken());
return true;
}
(void)Create(info);
}
+wxFont::wxFont(const wxFontInfo& info)
+{
+ m_refData = new wxFontRefData(info.GetPointSize(),
+ info.GetPixelSize(),
+ info.IsUsingSizeInPixels(),
+ info.GetFamily(),
+ info.GetStyle(),
+ info.GetWeight(),
+ info.IsUnderlined(),
+ info.IsStrikethrough(),
+ info.GetFaceName(),
+ info.GetEncoding());
+}
+
bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
{
UnRef();
// 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();
}
M_FONTDATA->SetUnderlined(underlined);
}
+void wxFont::SetStrikethrough(bool strikethrough)
+{
+ AllocExclusive();
+
+ M_FONTDATA->SetStrikethrough(strikethrough);
+}
+
void wxFont::SetEncoding(wxFontEncoding encoding)
{
AllocExclusive();
return M_FONTDATA->IsUsingSizeInPixels();
}
-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const
{
- wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") );
-
return M_FONTDATA->GetFamily();
}
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") );
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<wxFont*>(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<wxFont*>(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);
}
projects / wxWidgets.git / blobdiff