AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No changes, just avoid overriding GetNativeFontInfoDesc() in wxMSW wxFont.

Browse Source 
wxFont::GetNativeFontInfoDesc() and GetNativeFontInfoUserDesc() were
overridden just to ensure that the font is realized but it makes sense to do
it in wxFontRefData::GetNativeFontInfo() itself as detecting the face name
won't work if the font is not realized anyhow. And then we don't need these
functions at all as the only thing they do is checking that the font is valid
when they are called but this can be done in the base class itself as this
should happen in all ports (document that this is the case).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-11-26 02:34:01 +00:00
parent a77c05ea22
commit 64932e4105
4 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/font.h
View File

@ -110,10 +110,6 @@ public:
virtual ~wxFont();
// wxFontBase overridden functions
virtual wxString GetNativeFontInfoDesc() const;
virtual wxString GetNativeFontInfoUserDesc() const;
// implement base class pure virtuals
virtual int GetPointSize() const;
virtual wxSize GetPixelSize() const;

8
interface/wx/font.h
View File

@ -442,7 +442,9 @@ public:
/**
Returns the platform-dependent string completely describing this font.
Returned string is always non-empty.
Returned string is always non-empty unless the font is invalid (in
which case an assert is triggered).
Note that the returned string is not meant to be shown or edited by the user: a
typical use of this function is for serializing in string-form a wxFont object.
@ -453,7 +455,9 @@ public:
/**
Returns a user-friendly string for this font object.
Returned string is always non-empty.
Returned string is always non-empty unless the font is invalid (in
which case an assert is triggered).
The string does not encode all wxFont infos under all platforms;
e.g. under wxMSW the font family is not present in the returned string.

4
src/common/fontcmn.cpp
View File

@ -284,6 +284,8 @@ void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
wxString wxFontBase::GetNativeFontInfoDesc() const
{
wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
wxString fontDesc;
const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
if ( fontInfo )
@ -301,6 +303,8 @@ wxString wxFontBase::GetNativeFontInfoDesc() const
wxString wxFontBase::GetNativeFontInfoUserDesc() const
{
wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
wxString fontDesc;
const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
if ( fontInfo )

31
src/msw/font.cpp
View File

@ -213,8 +213,7 @@ public:
WXHFONT GetHFONT() const
{
if ( !m_hFont )
const_cast<wxFontRefData *>(this)->Alloc();
AllocIfNeeded();
return (WXHFONT)m_hFont;
}
@ -290,6 +289,10 @@ public:
const wxNativeFontInfo& GetNativeFontInfo() const
{
// 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
@ -319,6 +322,12 @@ protected:
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)
@ -1055,24 +1064,6 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
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") );