No changes, just avoid overriding GetNativeFontInfoDesc() in wxMSW wxFont.
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:
@@ -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;
|
||||
|
Reference in New Issue
Block a user